diff --git a/data/resources/style.css b/data/resources/style.css
index 2c452d83..34e8d98e 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -122,15 +122,9 @@ headerbar.flat {
   font-weight: bold;
 }
 
-.displayname {
-  font-size: 0.9em;
-  font-weight: bold;
-  color: @theme_selected_bg_color;
-}
-
 .timestamp {
-  font-size: 0.9em;
   min-width: 36px;
+  font-weight: normal;
 }
 
 .codeview {
diff --git a/data/resources/ui/content-message-row.ui b/data/resources/ui/content-message-row.ui
index bba2bfbf..2a639673 100644
--- a/data/resources/ui/content-message-row.ui
+++ b/data/resources/ui/content-message-row.ui
@@ -24,13 +24,15 @@
                     <property name="ellipsize">end</property>
                     <property name="selectable">True</property>
                     <style>
-                      <class name="displayname"/>
+                      <class name="heading"/>
+                      <class name="accent"/>
                     </style>
                   </object>
                 </child>
                 <child type="end">
                   <object class="GtkLabel" id="timestamp">
                     <style>
+                      <class name="heading"/>
                       <class name="timestamp"/>
                       <class name="dim-label"/>
                     </style>