diff --git a/main/data/conversation_list_titlebar_csd.ui b/main/data/conversation_list_titlebar_csd.ui
index c793c2cc..afe10926 100644
--- a/main/data/conversation_list_titlebar_csd.ui
+++ b/main/data/conversation_list_titlebar_csd.ui
@@ -9,6 +9,7 @@
         </style>
         <child>
             <object class="GtkMenuButton" id="add_button">
+                <property name="has-frame">False</property>
                 <child>
                     <object class="GtkImage">
                         <property name="icon-name">list-add-symbolic</property>
@@ -19,6 +20,7 @@
         </child>
         <child type="end">
             <object class="GtkMenuButton" id="menu_button">
+                <property name="has-frame">False</property>
                 <child>
                     <object class="GtkImage">
                         <property name="icon-name">open-menu-symbolic</property>
diff --git a/main/src/ui/conversation_selector/conversation_selector.vala b/main/src/ui/conversation_selector/conversation_selector.vala
index 8a4506f3..925a462a 100644
--- a/main/src/ui/conversation_selector/conversation_selector.vala
+++ b/main/src/ui/conversation_selector/conversation_selector.vala
@@ -38,7 +38,6 @@ public class ConversationSelector : Widget {
 
     construct {
         add_css_class("sidebar");
-        list_box.set_header_func(header);
         list_box.set_sort_func(sort);
 
         realize.connect(() => {
@@ -139,14 +138,6 @@ public class ConversationSelector : Widget {
         }
     }
 
-    private void header(ListBoxRow row, ListBoxRow? before_row) {
-        if (row.get_header() == null && before_row != null) {
-            row.set_header(new Separator(Orientation.HORIZONTAL));
-        } else if (row.get_header() != null && before_row == null) {
-            row.set_header(null);
-        }
-    }
-
     private int sort(ListBoxRow row1, ListBoxRow row2) {
         ConversationSelectorRow cr1 = row1 as ConversationSelectorRow;
         ConversationSelectorRow cr2 = row2 as ConversationSelectorRow;