diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index e02f4cdc84b..d6f85b9efb1 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -212,10 +212,17 @@
         <div class="question-block">
             <div class="question-name">
                 <t t-if="question.post_type == 'link'">
-                    <a t-att-href="question.content_link" t-raw="question.name" target="_blank"/>
+                    <a t-att-href="question.content_link" target="_blank">
+                        <span class="fa fa-link" t-if="forum.default_post_type != 'link'"/>
+                        <t t-esc="question.name"/>
+                    </a>
                 </t>
                 <t t-if="question.post_type in ('question', 'discussion')">
-                    <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }" t-field="question.name"/>
+                    <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }">
+                        <span class="fa fa-info-circle" t-if="question.post_type=='question' and forum.default_post_type != 'question'"/>
+                        <span class="fa fa-comment" t-if="question.post_type=='discussion' and forum.default_post_type != 'discussion'"/>
+                        <t t-esc="question.name"/>
+                    </a>
                 </t>
                 <span t-if="not question.active"><b> [Deleted]</b></span>
                 <span t-if="question.state == 'close'"><b> [Closed]</b></span>
@@ -581,10 +588,14 @@
             <div t-attf-class="question-block #{not question.active and 'alert alert-danger' or ''}">
                 <h1 class="mt0 mb0">
                     <t t-if="question.post_type == 'link'">
-                        <a t-att-href="question.content_link" t-raw="question.name"/>
+                        <a t-att-href="question.content_link">
+                            <t t-esc="question.name"/>
+                        </a>
                     </t>
                     <t t-if="question.post_type in ('question', 'discussion')">
-                        <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }" t-field="question.name"/>
+                        <a t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }" >
+                            <t t-esc="question.name"/>
+                        </a>
                     </t>
                     <span t-if="not question.active"><b> [Deleted]</b></span>
                     <span t-if="question.state == 'close'"><b> [Closed]</b></span>