diff --git a/icons/24x24/edit-flag.svg b/icons/24x24/edit-flag.svg
deleted file mode 100644
index ace0b3e1..00000000
--- a/icons/24x24/edit-flag.svg
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   id="svg4114"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="edit-flag.svg">
-  <defs
-     id="defs4116">
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3875"
-       id="linearGradient3167"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46662086,0,0,0.4720986,0.80193311,1.4356834)"
-       x1="24.001757"
-       y1="9.2952671"
-       x2="22.875973"
-       y2="37.167572" />
-    <linearGradient
-       id="linearGradient3875">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;"
-         id="stop3877" />
-      <stop
-         id="stop3879"
-         style="stop-color:#ffffff;stop-opacity:0.23529412;"
-         offset="0.13099068" />
-      <stop
-         offset="0.90155029"
-         style="stop-color:#ffffff;stop-opacity:0.15686275;"
-         id="stop3881" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687;"
-         id="stop3883" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-4"
-       id="linearGradient3160"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.50100354,0,0.12917999,0.48210629,-1.3703677,6.3724142)"
-       spreadMethod="reflect"
-       x1="0.36465192"
-       y1="19.599176"
-       x2="28.05953"
-       y2="19.599176" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-4">
-      <stop
-         id="stop3750-1-0-7"
-         style="stop-color:#ffcd7d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-7-6"
-         style="stop-color:#fc8f36;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-1-8-5"
-         style="stop-color:#e23a0e;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4039"
-       id="linearGradient3162"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37774073,0,0.09673411,0.36101661,1.5655367,7.1569019)"
-       spreadMethod="reflect"
-       x1="30"
-       y1="30"
-       x2="-11"
-       y2="30" />
-    <linearGradient
-       id="linearGradient4039">
-      <stop
-         id="stop4041"
-         style="stop-color:#ba3d12;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4043"
-         style="stop-color:#db6737;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4034">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4036" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4038" />
-    </linearGradient>
-    <linearGradient
-       y2="14.232251"
-       x2="10.824209"
-       y1="31.999737"
-       x1="10.824209"
-       gradientTransform="translate(1.4827512e-8,7.0001866)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4112"
-       xlink:href="#linearGradient4034"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="16"
-     inkscape:cy="16"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="453"
-     inkscape:window-height="408"
-     inkscape:window-x="0"
-     inkscape:window-y="50"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4119">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,-8)">
-    <path
-       style="opacity:0.25;color:#000000;fill:url(#linearGradient4112);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 6.9375,23.352889 c -1.816586,0.0229 -3.33718,0.167264 -3.75,0.311978 l -0.21875,-0.268947 -1.99999999,0 5.62499999,7.229283 2,0 -2.28125,-2.426762 c 0.67712,0.08647 2.47026,-0.261216 4.78125,-0.24743 2.802792,0.01672 3.629056,0.373633 6.59375,0.376525 2.964689,0.0029 5.447313,-0.177755 5.21875,-0.441072 l -3,-4.36145 c -0.138362,-0.199212 -2.664576,0.242419 -5.4375,0.2044 -2.993706,-0.04105 -3.924517,-0.345501 -6.5625,-0.376525 -0.32976,-0.0038 -0.651969,-0.0039 -0.96875,0 z"
-       id="rect3941-5-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccssccscc" />
-    <rect
-       style="color:#000000;fill:#ffffff;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941-5"
-       width="1"
-       height="20.705524"
-       x="-1.1077294"
-       y="10.493559"
-       transform="matrix(1,0,0.25881905,0.96592583,0,0)" />
-    <rect
-       style="opacity:0.36600001;color:#000000;fill:none;stroke:#000000;stroke-width:1.01748526;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3941"
-       width="2"
-       height="21.740799"
-       x="-1.6077296"
-       y="9.9759216"
-       transform="matrix(1,0,0.25881905,0.96592583,0,0)" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3160);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3162);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4319-6"
-       d="m 3.0775309,10.685117 c -0.1688792,-0.567968 2.195043,-1.2671406 4.8331238,-1.1770154 2.6379833,0.090121 3.5687063,0.9592264 6.5624123,1.0784574 2.772924,0.110439 5.28354,-1.1552248 5.421902,-0.576543 l 3.001466,11.201623 c 0.228563,0.764894 -2.237412,1.296793 -5.202101,1.288468 -2.964694,-0.0084 -3.789892,-1.034481 -6.592684,-1.083048 -2.8012002,-0.04854 -4.8384405,1.421502 -5.0539949,0.352713 L 3.0775309,10.685117 z" />
-    <path
-       transform="matrix(0.78947358,0,0.19887544,0.74221326,0.94239271,6.3561425)"
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-0.54541004"
-       inkscape:original="M 8.09375 4.96875 C 5.00882 4.83256 1.94329 5.6716596 1.96875 6.1875 L 1.96875 20.21875 C 1.96875 21.30539 4.815014 19.46054 8.09375 19.53125 C 11.374108 19.601995 12.016365 21.01842 15.5 21.03125 C 18.986828 21.044083 22.02335 20.30829 22.03125 19.875 L 22.03125 5.625 C 22.046334 5.2184953 18.991067 6.5309355 15.46875 6.40625 C 11.984993 6.2829293 11.166497 5.1044024 8.09375 4.96875 z "
-       style="opacity:0.5;fill:none;stroke:url(#linearGradient3167);stroke-width:1.30637455px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path3112"
-       d="M 8.0625,5.5 C 6.5772935,5.4344328 5.0679908,5.6288692 3.96875,5.875 3.4191296,5.9980654 2.9964896,6.1252925 2.71875,6.25 2.6100123,6.2988242 2.5427285,6.346341 2.5,6.375 L 2.5,20 c 0.2183632,-0.021 0.6244002,-0.131123 1.15625,-0.28125 C 4.774391,19.403128 6.3487566,18.962367 8.09375,19 c 1.717858,0.03705 2.811377,0.418487 3.8125,0.78125 1.001123,0.362763 1.925728,0.712607 3.59375,0.71875 1.704468,0.0063 3.313468,-0.177791 4.46875,-0.40625 0.577641,-0.11423 1.050839,-0.263341 1.34375,-0.375 0.09965,-0.03799 0.136806,-0.06688 0.1875,-0.09375 l 0,-13.46875 c -0.311673,0.062247 -0.744384,0.1575769 -1.3125,0.28125 -1.219441,0.2654598 -2.915656,0.5649334 -4.75,0.5 C 13.635744,6.87372 12.498445,6.5475118 11.46875,6.21875 10.439055,5.8899882 9.5314794,5.564851 8.0625,5.5 z" />
-  </g>
-</svg>
diff --git a/icons/24x24/edit-mark.svg b/icons/24x24/edit-mark.svg
new file mode 100644
index 00000000..af8b3c26
--- /dev/null
+++ b/icons/24x24/edit-mark.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2841"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   version="1.0"
+   sodipodi:docname="dialog-apply.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2843">
+    <linearGradient
+       id="linearGradient5105-262-943-861"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#0d0d0d;stop-opacity:1;"
+         id="stop2487"
+         offset="0" />
+      <stop
+         style="stop-color:#0d0d0d;stop-opacity:0;"
+         id="stop2489"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5105-262-943-861"
+       id="radialGradient4811"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.282946,0,13.64644)"
+       cx="11.25"
+       cy="19.03125"
+       fx="11.25"
+       fy="19.03125"
+       r="8.0625" />
+    <linearGradient
+       id="linearGradient2264">
+      <stop
+         id="stop2266"
+         offset="0"
+         style="stop-color:#d7e866;stop-opacity:1;" />
+      <stop
+         id="stop2268"
+         offset="1"
+         style="stop-color:#8cab2a;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2264"
+       id="linearGradient4813"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5112838,-0.1216744,0.12241,0.5082113,56.783012,-3.2077143)"
+       x1="-86.12886"
+       y1="2.0690987"
+       x2="-93.088425"
+       y2="31.137911" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3400">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3402" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3404" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3400"
+       id="linearGradient3597"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5025885,0,0,0.4995683,1.1940063,0.7665261)"
+       x1="20.494444"
+       y1="6.0097799"
+       x2="20.494444"
+       y2="47.760197" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.197802"
+     inkscape:cx="16"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="640"
+     inkscape:window-height="720"
+     inkscape:window-x="638"
+     inkscape:window-y="28"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2846">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       id="path4346"
+       sodipodi:cx="11.25"
+       sodipodi:cy="19.03125"
+       transform="matrix(1.4883719,0,0,1.4465766,-4.7441839,-6.8301638)"
+       d="M 19.3125,19.03125 A 8.0625,2.28125 0 1 1 3.1875,19.03125 A 8.0625,2.28125 0 1 1 19.3125,19.03125 z"
+       sodipodi:type="arc"
+       style="opacity:0.16292138000000000;fill:url(#radialGradient4811);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       sodipodi:ry="2.28125"
+       sodipodi:rx="8.0625" />
+    <path
+       style="fill:url(#linearGradient4813);fill-opacity:1;fill-rule:nonzero;stroke:#699536;stroke-width:1.00278974000000010;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 18.175045,3.5050734 C 17.893728,3.4766952 17.614045,3.6136485 17.469505,3.8765759 L 11.311125,15.076693 L 7.3516838,11.94736 C 6.9989939,11.755797 6.5589582,11.879032 6.3662377,12.229603 L 4.5906573,14.495517 C 4.3979411,14.846082 4.527588,15.283344 4.8802754,15.474904 C 4.8802754,15.474904 12.109718,21.409916 12.118638,21.414306 C 12.201298,21.459205 12.28774,21.481796 12.375609,21.492832 C 12.662649,21.528883 12.956399,21.394835 13.103948,21.126432 L 21.409341,6.0216833 C 21.602059,5.6711143 21.472414,5.2338548 21.119725,5.0422946 L 18.454817,3.5886997 C 18.366643,3.540809 18.268818,3.5145329 18.175045,3.5050734 z"
+       id="path1542"
+       sodipodi:nodetypes="cccccccssccccc" />
+    <path
+       style="opacity:0.6;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3597);stroke-width:1.00278974000000010;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 18.214219,4.6150802 L 11.621039,16.59425 L 7.0429763,12.993376 C 6.5430041,13.593 6.1940911,14.084983 5.6268868,14.793063 C 5.6268868,14.793063 12.308087,20.243713 12.388561,20.327429 C 12.639581,19.922831 20.280248,5.9994113 20.392067,5.786567 C 20.224636,5.6712228 18.271997,4.6613945 18.214219,4.6150802 z"
+       id="path1544"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 41132dfb..4b62f580 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -19,7 +19,7 @@ set(ICON_FILES_16
 
 set(ICON_FILES_24
     24x24/format-text-none.svg
-    24x24/edit-flag.svg
+    24x24/edit-mark.svg
     24x24/mail-archive.svg
     24x24/mail-move.svg
     24x24/tag.svg
diff --git a/src/client/ui/main-toolbar.vala b/src/client/ui/main-toolbar.vala
index 383cbad9..75b2d703 100644
--- a/src/client/ui/main-toolbar.vala
+++ b/src/client/ui/main-toolbar.vala
@@ -42,7 +42,7 @@ public class MainToolbar : Gtk.Box {
             GearyController.ACTION_MARK_AS_MENU) as Gtk.ToggleToolButton;
         attach_menu(mark_menu, mark_menu_button);
         make_menu_dropdown_button(mark_menu_button,
-            IconFactory.instance.get_custom_icon("edit-flag", IconFactory.ICON_TOOLBAR), null);
+            IconFactory.instance.get_custom_icon("edit-mark", IconFactory.ICON_TOOLBAR), null);
         Gtk.Menu mark_proxy_menu = (Gtk.Menu) GearyApplication.instance.ui_manager
             .get_widget("/ui/ToolbarMarkMenuProxy");
         add_proxy_menu(mark_menu_button, _("Mark"), mark_proxy_menu);