diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 4b62f580..2e977657 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -4,7 +4,6 @@ set(ICON_FILES
     application-menu.svg
     mail-inbox.png
     mail-sent.png
-    menu-down.svg
     non-starred-grey.png
     starred.png
 )
diff --git a/icons/menu-down.svg b/icons/menu-down.svg
deleted file mode 100644
index e65ad916..00000000
--- a/icons/menu-down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="8" height="16">
-    <path d="M 0.625,4.8813569 4.0317797,13 7.438559,4.8813569 z" style="fill:#999999" />
-</svg>
diff --git a/ui/toolbar.glade b/ui/toolbar.glade
index 7bff85cb..64a3fabf 100644
--- a/ui/toolbar.glade
+++ b/ui/toolbar.glade
@@ -18,6 +18,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="homogeneous">True</property>
       </packing>
     </child>
     <child>
@@ -45,6 +46,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="homogeneous">True</property>
       </packing>
     </child>
     <child>
@@ -61,6 +63,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="homogeneous">True</property>
       </packing>
     </child>
     <child>
@@ -77,6 +80,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="homogeneous">True</property>
       </packing>
     </child>
     <child>
@@ -98,10 +102,11 @@
         <property name="tooltip_text" translatable="yes" comments="Toggles menu for marking a message as read/unread or starred/unstarred">Mark email</property>
         <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Mark</property>
-        <property name="icon_name">menu-down</property>
+        <property name="icon_name">edit-mark</property>
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="homogeneous">True</property>
       </packing>
     </child>
     <child>
@@ -116,6 +121,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="homogeneous">True</property>
       </packing>
     </child>
     <child>
@@ -130,6 +136,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="homogeneous">True</property>
       </packing>
     </child>
     <child>
@@ -153,6 +160,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="homogeneous">True</property>
       </packing>
     </child>
     <child>
@@ -181,6 +189,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
+        <property name="homogeneous">True</property>
       </packing>
     </child>
   </object>