diff --git a/icons/menu-down.svg b/icons/menu-down.svg
new file mode 100644
index 00000000..d3bf78f2
--- /dev/null
+++ b/icons/menu-down.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16">
+<path fill="#797979" d="M2.5,6l5,5l5,-5z"/>
+</svg>
diff --git a/src/client/ui/main-toolbar.vala b/src/client/ui/main-toolbar.vala
index 6d78ecb9..86501d93 100644
--- a/src/client/ui/main-toolbar.vala
+++ b/src/client/ui/main-toolbar.vala
@@ -48,14 +48,21 @@ public class MainToolbar : Gtk.Box {
             as Gtk.ToolButton;
         archive_message.set_related_action(GearyApplication.instance.actions.get_action(
             GearyController.ACTION_DELETE_MESSAGE));
-        
+
         mark_menu_button = builder.get_object(GearyController.ACTION_MARK_AS_MENU) as Gtk.ToggleToolButton;
         mark_menu_button.set_related_action(GearyApplication.instance.actions.get_action(
             GearyController.ACTION_MARK_AS_MENU));
         mark_menu.attach_to_widget(mark_menu_button, null);
         mark_menu.deactivate.connect(on_deactivate_mark_menu);
         mark_menu_button.clicked.connect(on_show_mark_menu);
-        
+
+        Gtk.ToggleButton button = mark_menu_button.get_child() as Gtk.ToggleButton;
+        button.remove(button.get_child());
+        Gtk.Box box = new Gtk.HBox(false, 0);
+        button.add(box);
+        box.pack_start(new Gtk.Label(_("Mark")));
+        box.pack_start(new Gtk.Image.from_icon_name("menu-down", Gtk.IconSize.LARGE_TOOLBAR));
+
         menu_button = builder.get_object("menu_button") as Gtk.ToggleToolButton;
         menu.attach_to_widget(menu_button, null);
         menu.deactivate.connect(on_deactivate_menu);
diff --git a/ui/toolbar.glade b/ui/toolbar.glade
index a48cec65..ceb9f012 100644
--- a/ui/toolbar.glade
+++ b/ui/toolbar.glade
@@ -70,18 +70,11 @@
       </packing>
     </child>
     <child>
-      <object class="GtkToolItem" id="separatorContainer">
+      <object class="GtkSeparatorToolItem" id="separator">
         <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="use_action_appearance">False</property>
-        <child>
-          <object class="GtkSeparator" id="separator1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-          </object>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
@@ -103,6 +96,17 @@
         <property name="homogeneous">True</property>
       </packing>
     </child>
+    <child>
+      <object class="GtkSeparatorToolItem" id="separator2">
+        <property name="use_action_appearance">False</property>
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="use_action_appearance">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+      </packing>
+    </child>
     <child>
       <object class="GtkToggleToolButton" id="GearyMarkAsMenuButton">
         <property name="use_action_appearance">False</property>
@@ -110,13 +114,13 @@
         <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes" context="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 as...</property>
-        <property name="use_underline">True</property>
-        <property name="icon_name">mail-mark-notjunk</property>
+        <property name="label" translatable="yes">Mark</property>
+        <property name="use_underline">False</property>
+        <property name="icon_name">menu-down</property>
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="homogeneous">True</property>
+        <property name="homogeneous">False</property>
       </packing>
     </child>
     <child>