diff --git a/COPYING.icons b/COPYING.icons
index 6490fda5..e8172ca0 100644
--- a/COPYING.icons
+++ b/COPYING.icons
@@ -47,6 +47,10 @@ detach-symbolic.svg
     Modified from view-restore-symbolic by the GNOME Project
     https://git.gnome.org/browse/adwaita-icon-theme/plain/Adwaita/scalable/actions/view-restore-symbolic.svg
 
+mail-draft-symbolic.svg
+    Modified from accessories-text-editor-symbolic.svg by the GNOME Project
+    https://git.gnome.org/browse/adwaita-icon-theme/plain/Adwaita/scalable/apps/accessories-text-editor-symbolic.svg
+
 
 The following work is public domain.
 
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index b14903d4..c21504aa 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -7,10 +7,11 @@ set(ICON_FILES
     text-x-generic-symbolic.svg
     edit-symbolic.svg
     format-text-remove-symbolic.svg
+    mail-drafts-symbolic.svg
+    mail-drafts-rtl-symbolic.svg
     mail-forward-symbolic.svg
     mail-forward-rtl-symbolic.svg
     mail-inbox-symbolic.svg
-    marker-symbolic.svg
     mail-outbox-symbolic.svg
     mail-reply-all-symbolic.svg
     mail-reply-all-rtl-symbolic.svg
@@ -20,6 +21,7 @@ set(ICON_FILES
     mail-sent-rtl-symbolic.svg
     mail-spam-symbolic.svg
     mail-spam-rtl-symbolic.svg
+    marker-symbolic.svg
     tag-symbolic.svg
     tag-rtl-symbolic.svg
 )
diff --git a/icons/mail-drafts-rtl-symbolic.svg b/icons/mail-drafts-rtl-symbolic.svg
new file mode 100644
index 00000000..484ecc15
--- /dev/null
+++ b/icons/mail-drafts-rtl-symbolic.svg
@@ -0,0 +1,174 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="mail-drafts-rtl-symbolic.svg"
+   inkscape:version="0.91 r13725"
+   version="1.1"
+   id="svg7384"
+   width="16"
+   height="16.008873">
+  <metadata
+     id="metadata90">
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-paths="false"
+     inkscape:zoom="22.627416"
+     showborder="false"
+     showgrid="false"
+     inkscape:snap-global="true"
+     inkscape:current-layer="layer11"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:object-nodes="false"
+     bordercolor="#666666"
+     gridtolerance="10"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:window-height="1471"
+     pagecolor="#555753"
+     id="namedview88"
+     showguides="true"
+     inkscape:window-x="0"
+     inkscape:window-y="55"
+     inkscape:snap-bbox="true"
+     borderopacity="1"
+     inkscape:window-width="2560"
+     inkscape:cx="14.695382"
+     inkscape:cy="6.1432453"
+     inkscape:bbox-paths="false"
+     objecttolerance="10"
+     inkscape:guide-bbox="true"
+     inkscape:snap-to-guides="true"
+     guidetolerance="10"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       visible="true"
+       spacingx="1px"
+       spacingy="1px"
+       enabled="true"
+       empspacing="2"
+       snapvisiblegridlinesonly="true"
+       id="grid4866"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="status"
+     transform="translate(-163.0002,-508.99113)"
+     id="layer9"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="devices"
+     transform="translate(-163.0002,-508.99113)"
+     id="layer10" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="apps"
+     transform="translate(-163.0002,-508.99113)"
+     id="layer11">
+    <path
+       d="m 174.59415,515 a 0.50219246,0.50219246 0 1 1 -0.0937,1 l -6,0 a 0.50005,0.50005 0 1 1 0,-1 l 6,0 a 0.50005,0.50005 0 0 1 0.0937,0 z"
+       id="path3601-2"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 174.59415,517 a 0.50219246,0.50219246 0 1 1 -0.0937,1 l -5,0 a 0.50005,0.50005 0 1 1 0,-1 l 5,0 a 0.50005,0.50005 0 0 1 0.0937,0 z"
+       id="path3601-2-3"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 174.59415,519 a 0.50219246,0.50219246 0 1 1 -0.0937,1 l -6,0 a 0.50005,0.50005 0 1 1 0,-1 l 6,0 a 0.50005,0.50005 0 0 1 0.0937,0 z"
+       id="path3601-2-3-2"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 174.59415,521 a 0.50219246,0.50219246 0 1 1 -0.0937,1 l -3,0 a 0.50005,0.50005 0 1 1 0,-1 l 3,0 a 0.50005,0.50005 0 0 1 0.0937,0 z"
+       id="path3601-2-3-3"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 176.0002,510 c 1.0907,0 2,0.9093 2,2 l 0,11 c 0,1.0907 -0.9093,2 -2,2 l -9,0 c -1.0907,0 -2,-0.9093 -2,-2 l 0,-11 c 0,-1.0907 0.9093,-2 2,-2 0,4.33333 0,8.66667 0,13 l 9,0 c 0,-4.33333 0,-8.66667 0,-13 z"
+       sodipodi:nodetypes="csssssscccc"
+       id="rect10788"
+       inkscape:connector-curvature="0"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:new" />
+    <path
+       d="m 174.59415,509 a 0.50005,0.50005 0 0 1 0.40625,0.5 l 0,3 a 0.50005,0.50005 0 1 1 -1,0 l 0,-3 a 0.50005,0.50005 0 0 1 0.59375,-0.5 z"
+       id="path3601-2-3-3-9"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 172.59415,509 a 0.50005,0.50005 0 0 1 0.40625,0.5 l 0,3 a 0.50005,0.50005 0 1 1 -1,0 l 0,-3 a 0.50005,0.50005 0 0 1 0.59375,-0.5 z"
+       id="path3601-2-3-3-9-3"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 170.59415,509 a 0.50005,0.50005 0 0 1 0.40625,0.5 l 0,3 a 0.50005,0.50005 0 1 1 -1,0 l 0,-3 a 0.50005,0.50005 0 0 1 0.59375,-0.5 z"
+       id="path3601-2-3-3-9-3-3"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 168.59415,509 a 0.50005,0.50005 0 0 1 0.40625,0.5 l 0,3 a 0.50005,0.50005 0 1 1 -1,0 l 0,-3 a 0.50005,0.50005 0 0 1 0.59375,-0.5 z"
+       id="path3601-2-3-3-9-3-3-7"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="places"
+     transform="translate(-163.0002,-508.99113)"
+     id="layer13" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="mimetypes"
+     transform="translate(-163.0002,-508.99113)"
+     id="layer14" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="emblems"
+     transform="translate(-163.0002,-508.99113)"
+     id="layer15"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="emotes"
+     transform="translate(-163.0002,-508.99113)"
+     id="g71291"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="categories"
+     transform="translate(-163.0002,-508.99113)"
+     id="g4953"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="actions"
+     transform="translate(-163.0002,-508.99113)"
+     id="layer12"
+     style="display:inline" />
+</svg>
diff --git a/icons/mail-drafts-symbolic.svg b/icons/mail-drafts-symbolic.svg
new file mode 100644
index 00000000..b75c9509
--- /dev/null
+++ b/icons/mail-drafts-symbolic.svg
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg sodipodi:docname='accessories-text-editor-symbolic.svg' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' inkscape:version='0.48.1 r9760' version='1.1' id='svg7384' xmlns:svg='http://www.w3.org/2000/svg' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:cc='http://creativecommons.org/ns#' xmlns='http://www.w3.org/2000/svg' width='16' height='16.008873'>
+  <metadata id='metadata90'>
+    <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>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:window-maximized='0' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:object-paths='false' inkscape:zoom='11.313708' showborder='false' showgrid='false' inkscape:snap-global='true' inkscape:current-layer='layer11' inkscape:pageopacity='1' inkscape:pageshadow='2' inkscape:object-nodes='false' bordercolor='#666666' gridtolerance='10' inkscape:snap-bbox-midpoints='false' inkscape:window-height='967' pagecolor='#555753' id='namedview88' showguides='true' inkscape:window-x='2087' inkscape:window-y='282' inkscape:snap-bbox='true' borderopacity='1' inkscape:window-width='1226' inkscape:cx='-20.114158' inkscape:cy='266.82175' inkscape:bbox-paths='false' objecttolerance='10' inkscape:guide-bbox='true' inkscape:snap-to-guides='true' guidetolerance='10' inkscape:snap-grids='true'>
+    <inkscape:grid visible='true' spacingx='1px' spacingy='1px' enabled='true' empspacing='2' snapvisiblegridlinesonly='true' id='grid4866' type='xygrid'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' inkscape:label='status' transform='translate(-163.0002,-508.99113)' id='layer9' style='display:inline'/>
+  <g inkscape:groupmode='layer' inkscape:label='devices' transform='translate(-163.0002,-508.99113)' id='layer10'/>
+  <g inkscape:groupmode='layer' inkscape:label='apps' transform='translate(-163.0002,-508.99113)' id='layer11'>
+    <path d='m 168.40625,515 a 0.50219246,0.50219246 0 1 0 0.0937,1 l 6,0 a 0.50005,0.50005 0 1 0 0,-1 l -6,0 a 0.50005,0.50005 0 0 0 -0.0937,0 z' id='path3601-2' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
+    <path d='m 168.40625,517 a 0.50219246,0.50219246 0 1 0 0.0937,1 l 5,0 a 0.50005,0.50005 0 1 0 0,-1 l -5,0 a 0.50005,0.50005 0 0 0 -0.0937,0 z' id='path3601-2-3' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
+    <path d='m 168.40625,519 a 0.50219246,0.50219246 0 1 0 0.0937,1 l 6,0 a 0.50005,0.50005 0 1 0 0,-1 l -6,0 a 0.50005,0.50005 0 0 0 -0.0937,0 z' id='path3601-2-3-2' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
+    <path d='m 168.40625,521 a 0.50219246,0.50219246 0 1 0 0.0937,1 l 3,0 a 0.50005,0.50005 0 1 0 0,-1 l -3,0 a 0.50005,0.50005 0 0 0 -0.0937,0 z' id='path3601-2-3-3' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
+    <path d='m 167.0002,510 c -1.0907,0 -2,0.9093 -2,2 l 0,11 c 0,1.0907 0.9093,2 2,2 l 9,0 c 1.0907,0 2,-0.9093 2,-2 l 0,-11 c 0,-1.0907 -0.9093,-2 -2,-2 0,4.33333 0,8.66667 0,13 l -9,0 c 0,-4.33333 0,-8.66667 0,-13 z' sodipodi:nodetypes='csssssscccc' id='rect10788' inkscape:connector-curvature='0' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new;font-family:Sans;-inkscape-font-specification:Sans'/>
+    <path d='M 168.40625,509 A 0.50005,0.50005 0 0 0 168,509.5 l 0,3 a 0.50005,0.50005 0 1 0 1,0 l 0,-3 a 0.50005,0.50005 0 0 0 -0.59375,-0.5 z' id='path3601-2-3-3-9' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
+    <path d='M 170.40625,509 A 0.50005,0.50005 0 0 0 170,509.5 l 0,3 a 0.50005,0.50005 0 1 0 1,0 l 0,-3 a 0.50005,0.50005 0 0 0 -0.59375,-0.5 z' id='path3601-2-3-3-9-3' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
+    <path d='M 172.40625,509 A 0.50005,0.50005 0 0 0 172,509.5 l 0,3 a 0.50005,0.50005 0 1 0 1,0 l 0,-3 a 0.50005,0.50005 0 0 0 -0.59375,-0.5 z' id='path3601-2-3-3-9-3-3' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
+    <path d='M 174.40625,509 A 0.50005,0.50005 0 0 0 174,509.5 l 0,3 a 0.50005,0.50005 0 1 0 1,0 l 0,-3 a 0.50005,0.50005 0 0 0 -0.59375,-0.5 z' id='path3601-2-3-3-9-3-3-7' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans' inkscape:connector-curvature='0'/>
+    
+  </g>
+  <g inkscape:groupmode='layer' inkscape:label='places' transform='translate(-163.0002,-508.99113)' id='layer13'/>
+  <g inkscape:groupmode='layer' inkscape:label='mimetypes' transform='translate(-163.0002,-508.99113)' id='layer14'/>
+  <g inkscape:groupmode='layer' inkscape:label='emblems' transform='translate(-163.0002,-508.99113)' id='layer15' style='display:inline'/>
+  <g inkscape:groupmode='layer' inkscape:label='emotes' transform='translate(-163.0002,-508.99113)' id='g71291' style='display:inline'/>
+  <g inkscape:groupmode='layer' inkscape:label='categories' transform='translate(-163.0002,-508.99113)' id='g4953' style='display:inline'/>
+  <g inkscape:groupmode='layer' inkscape:label='actions' transform='translate(-163.0002,-508.99113)' id='layer12' style='display:inline'/>
+</svg>
diff --git a/src/client/folder-list/folder-list-folder-entry.vala b/src/client/folder-list/folder-list-folder-entry.vala
index bef1ab94..31199530 100644
--- a/src/client/folder-list/folder-list-folder-entry.vala
+++ b/src/client/folder-list/folder-list-folder-entry.vala
@@ -56,8 +56,8 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In
                 return "mail-inbox-symbolic";
             
             case Geary.SpecialFolderType.DRAFTS:
-                return "accessories-text-editor-symbolic";
-            
+                return rtl ? "mail-drafts-rtl-symbolic" : "mail-drafts-symbolic";
+
             case Geary.SpecialFolderType.SENT:
                 return rtl ? "mail-sent-rtl-symbolic" : "mail-sent-symbolic";