diff --git a/app/assets/stylesheets/dark-mode.scss b/app/assets/stylesheets/dark-mode.scss
index f57b357c..86102167 100644
--- a/app/assets/stylesheets/dark-mode.scss
+++ b/app/assets/stylesheets/dark-mode.scss
@@ -277,4 +277,4 @@ body {
 			color: black;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/thredded-overrides.scss b/app/assets/stylesheets/thredded-overrides.scss
index 09599cc9..cf0fc5a8 100644
--- a/app/assets/stylesheets/thredded-overrides.scss
+++ b/app/assets/stylesheets/thredded-overrides.scss
@@ -32,6 +32,14 @@
     }
   }
 
+  .thredded--post--user {
+    color: black;
+
+    a {
+      color: #347a36;
+    }
+  }
+
   .thredded--currently-online {
     right: 100px;
     max-height: 80%;
diff --git a/app/views/thredded/posts_common/_header.html.erb b/app/views/thredded/posts_common/_header.html.erb
new file mode 100644
index 00000000..756e21aa
--- /dev/null
+++ b/app/views/thredded/posts_common/_header.html.erb
@@ -0,0 +1,7 @@
+<header>
+  <%= image_tag post.avatar_url, class: 'thredded--post--avatar' if post.user %>
+  <h2 class="thredded--post--user"><%= user_link post.user %></h2>
+  <a href="<%= post.permalink_path %>" rel="nofollow" class="thredded--link thredded--post--created-at right">
+    <%= time_ago post.created_at %>
+  </a>
+</header>
\ No newline at end of file
diff --git a/app/views/thredded/users/_link.html.erb b/app/views/thredded/users/_link.html.erb
index c5a1bb53..69c3593c 100644
--- a/app/views/thredded/users/_link.html.erb
+++ b/app/views/thredded/users/_link.html.erb
@@ -2,9 +2,16 @@
   <% if !user.thredded_anonymous? %>
     <% user_path = user_path(user) %>
     <% if user_path.blank? %>
-      <span class='thredded--username'><%= user.thredded_display_name %></span>
+      <span class='thredded--username'>
+        <%= user.thredded_display_name %>
+      </span>
     <% else %>
-      <a href="<%= user_path %>"><%= user.thredded_display_name %></a>
+      <a href="<%= user_path %>">
+        <%= user.thredded_display_name %>
+        <% if user.favorite_page_type? %>
+          <i class="material-icons tiny <%= content_class_from_name(user.favorite_page_type).try(:text_color) %>" style="position: relative; top: 2px"><%= content_class_from_name(user.favorite_page_type).try(:icon) %></i>
+        <% end %>
+      </a>
       <%= render partial: 'thredded/users/badge', locals: { user: user } %>
     <% end %>
   <% else %>