diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 2e977657..9b392824 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -3,6 +3,7 @@ set(ICONS_DEST share/geary/icons)
 set(ICON_FILES
     application-menu.svg
     mail-inbox.png
+    mail-outbox.png
     mail-sent.png
     non-starred-grey.png
     starred.png
diff --git a/icons/mail-outbox.svg b/icons/mail-outbox.svg
new file mode 100644
index 00000000..641f4fa4
--- /dev/null
+++ b/icons/mail-outbox.svg
@@ -0,0 +1,315 @@
+<?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="16px"
+   height="16px"
+   id="svg4068"
+   version="1.1"
+   inkscape:version="0.48.0 r9654"
+   sodipodi:docname="mail-outbox.svg">
+  <defs
+     id="defs4070">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4477-6"
+       id="linearGradient3212"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-0.31819829,-0.29783407,0,15.304285,12.181204)"
+       x1="33.268658"
+       y1="21.213675"
+       x2="9.6698303"
+       y2="21.213675" />
+    <linearGradient
+       id="linearGradient4477-6">
+      <stop
+         id="stop4479-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4481-6"
+         style="stop-color:#ffffff;stop-opacity:0.03921569"
+         offset="0.98274249" />
+      <stop
+         id="stop4487-2"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3839"
+       id="radialGradient3215"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.56444409,0,0,-0.51960273,-40.630876,25.77887)"
+       cx="85.851395"
+       cy="48.605404"
+       fx="85.851395"
+       fy="48.605404"
+       r="31.000002" />
+    <linearGradient
+       id="linearGradient3839">
+      <stop
+         offset="0"
+         style="stop-color:#ffed8c;stop-opacity:1"
+         id="stop3841" />
+      <stop
+         offset="0.26238"
+         style="stop-color:#fb9858;stop-opacity:1"
+         id="stop3843" />
+      <stop
+         offset="0.66093999"
+         style="stop-color:#dc572a;stop-opacity:1"
+         id="stop3845" />
+      <stop
+         offset="1"
+         style="stop-color:#9f3110;stop-opacity:1"
+         id="stop3847" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3707-662"
+       id="linearGradient3217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.11022341,0,0,-0.14030211,-1.8671796,18.604545)"
+       x1="60.919994"
+       y1="53.996292"
+       x2="60.919994"
+       y2="131.9617" />
+    <linearGradient
+       id="linearGradient3707-662">
+      <stop
+         id="stop4098"
+         style="stop-color:#ab460a;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop4100"
+         style="stop-color:#db7326;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3977"
+       id="linearGradient3220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.35135122,0,0,0.35135132,-0.43243,0.56758592)"
+       x1="23.99999"
+       y1="5.5641499"
+       x2="23.99999"
+       y2="43" />
+    <linearGradient
+       id="linearGradient3977">
+      <stop
+         id="stop3979"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3981"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.03626217" />
+      <stop
+         id="stop3983"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3985"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-3"
+       id="linearGradient3224"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.43333498,0,0,0.3259265,-2.40004,0.67779972)"
+       x1="25.132275"
+       y1="0.98520643"
+       x2="25.132275"
+       y2="47.013336" />
+    <linearGradient
+       id="linearGradient3600-3">
+      <stop
+         id="stop3602-38"
+         style="stop-color:#f4f4f4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3604-0"
+         style="stop-color:#dbdbdb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-0-454"
+       id="radialGradient3227"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.4954688e-8,0.7215665,-1.5731566,0,21.31585,-19.137096)"
+       cx="8.3269548"
+       cy="8.5530519"
+       fx="8.3269548"
+       fy="8.5530519"
+       r="19.99999" />
+    <linearGradient
+       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-0-454">
+      <stop
+         id="stop3298"
+         style="stop-color:#c7c7c7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3300"
+         style="stop-color:#a6a6a6;stop-opacity:1"
+         offset="0.26238" />
+      <stop
+         id="stop3302"
+         style="stop-color:#7b7b7b;stop-opacity:1"
+         offset="0.704952" />
+      <stop
+         id="stop3304"
+         style="stop-color:#595959;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3707-319-631-407-324-6-290"
+       id="linearGradient3229"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.28205128,0,0,0.25641026,1.23074,-14.653787)"
+       x1="24"
+       y1="59.601665"
+       x2="24"
+       y2="3.8990016" />
+    <linearGradient
+       id="linearGradient3707-319-631-407-324-6-290">
+      <stop
+         id="stop3308"
+         style="stop-color:#505050;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3310"
+         style="stop-color:#8e8e8e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         id="stop3602"
+         style="stop-color:#f4f4f4;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3604"
+         style="stop-color:#dbdbdb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3104">
+      <stop
+         id="stop3106"
+         style="stop-color:#a0a0a0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3108"
+         style="stop-color:#bebebe;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="47.013336"
+       x2="25.132275"
+       y1="0.98520643"
+       x1="25.132275"
+       gradientTransform="matrix(0.42857266,0,0,0.32592781,-2.28574,0.67776957)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4064"
+       xlink:href="#linearGradient3600"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="2.9062471"
+       x2="-51.786404"
+       y1="50.786446"
+       x1="-51.786404"
+       gradientTransform="matrix(0.34607105,0,0,0.30501987,23.17586,0.31453457)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4066"
+       xlink:href="#linearGradient3104"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="447"
+     inkscape:window-height="446"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata4073">
+    <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">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4064);fill-opacity:1;stroke:url(#linearGradient4066);stroke-width:0.99992186;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline"
+       id="path4160"
+       d="m 0.49996,1.4999903 c 3.43729,0 15.00007,9.333e-4 15.00007,9.333e-4 l 10e-6,13.9991264 c 0,0 -10.00005,0 -15.00008,0 0,-5.000039 0,-9.0000392 0,-14.0000784 z" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient3227);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3229);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5505-21"
+       transform="scale(1,-1)"
+       y="-13.500057"
+       x="2.5000033"
+       height="10"
+       width="11" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient3224);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99992192;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4160-0"
+       d="m 0.99999997,11.00004 0,4 14.00000003,0 0,-4 c 0,0 -2.28238,5e-5 -4,0 l 0,2 -6,0 0,-2 c -2.07408,-5e-5 -2.93063,0 -4.00000003,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path4015-6"
+       d="m 5,13.50004 6,0 M 10.9782,11.5 l 3.0436,0 m -12.0436,0 3.0436,0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:url(#linearGradient3220);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6741-1"
+       d="m 14.50001,14.50002 -13,0 0,-12.0000003 13,0 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#radialGradient3215);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3217);stroke-width:0.98542744;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5656"
+       d="m 2.91874,6.49998 5,-5.99998028 5.16251,5.99998028 -2.58125,0 0,4.00002 -5,0 0,-4.00002 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient3212);stroke-width:0.98542738;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3506"
+       d="m 7.91874,2 -2.87013,3.46873 0.87013,0 C 6.48808,5.46923 6.4995,5.93064 6.5,6.49998 l 0,3.00002 3,0 0,-3.00002 C 9.5005,5.93064 9.3494,5.46923 9.91874,5.46873 l 0.99718,0 z" />
+  </g>
+</svg>