diff --git a/COPYING.icons b/COPYING.icons
index 12044d99..ed57852c 100644
--- a/COPYING.icons
+++ b/COPYING.icons
@@ -40,6 +40,14 @@ sent-symbolic.svg
     Designed for Geary by Sam Hewitt, 2013
 
 
+The following work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+For more information, see: http://creativecommons.org/licenses/by-sa/3.0/
+
+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
+
+
 The following work is public domain.
 
 tag-symbolic.svg
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 2b5f3a77..55030eab 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -3,6 +3,7 @@ set(ICONS_DEST share/geary/icons)
 set(ICON_FILES
     archive-symbolic.svg
     close-symbolic.svg
+    detach-symbolic.svg
     document-symbolic.svg
     edit-symbolic.svg
     format-text-remove-symbolic.svg
diff --git a/icons/detach-symbolic.svg b/icons/detach-symbolic.svg
new file mode 100644
index 00000000..0e2b68b1
--- /dev/null
+++ b/icons/detach-symbolic.svg
@@ -0,0 +1,88 @@
+<?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"
+   version="1.1"
+   width="16.084999"
+   height="16.024"
+   id="svg7384">
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs17" />
+  <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>
+  <g
+     transform="translate(-60.952,-646.98)"
+     id="layer12">
+    <path
+       d="M 61.906,653 A 1.0001,1.0001 0 0 0 61,654 v 8 a 1.0001,1.0001 0 0 0 1,1 h 8 a 1.0001,1.0001 0 0 0 1,-1 v -8 a 1.0001,1.0001 0 0 0 -1,-1 h -8 a 1.0001,1.0001 0 0 0 -0.09375,0 z M 63,655 h 6 v 6 h -6 v -6 z"
+       id="rect13039"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;enable-background:new" />
+    <path
+       d="M 61.906,655 A 1.0011039,1.0011039 0 1 0 62,657 h 8 a 1.0001,1.0001 0 1 0 0,-2 h -8 a 1.0001,1.0001 0 0 0 -0.09375,0 z"
+       id="path13041"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;fill-rule:evenodd;enable-background:new" />
+    <path
+       d="m 76.23537,652.9981 a 1.0001,1.0001 0 0 0 0.781,-1 v -4 a 1.0001,1.0001 0 0 0 -1,-1 h -4 a 1.0001,1.0001 0 1 0 0,2 h 3 v 3 a 1.0001,1.0001 0 0 0 1.2188,1 z"
+       id="path12113-8"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;enable-background:new" />
+    <path
+       d="m 72.14137,652.9981 a 1.0001,1.0001 0 0 0 0.59375,-0.28125 l 4,-4 a 1.0165,1.0165 0 1 0 -1.4375,-1.4375 l -4,4 a 1.0001,1.0001 0 0 0 0.843,1.72 z"
+       id="path12147-8"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;enable-background:new" />
+    <rect
+       width="1"
+       height="1"
+       x="-77.016373"
+       y="-647.99811"
+       transform="scale(-1,-1)"
+       id="rect12919-5"
+       style="color:#000000;fill:#bdbdbd;enable-background:new" />
+    <rect
+       width="1"
+       height="1"
+       x="-72.016373"
+       y="-647.99811"
+       transform="scale(-1,-1)"
+       id="rect4479-2-9-9-0-8-6"
+       style="color:#000000;fill:#bebebe" />
+    <rect
+       width="1"
+       height="1"
+       x="-77.016373"
+       y="-652.99811"
+       transform="scale(-1,-1)"
+       id="rect4479-2-9-9-0-8-6-6"
+       style="color:#000000;fill:#bebebe" />
+    <rect
+       width="1"
+       height="1"
+       x="70"
+       y="662"
+       id="rect4479-2-9-9-0-8-6-9"
+       style="color:#000000;fill:#bebebe" />
+    <rect
+       width="1"
+       height="1"
+       x="61"
+       y="662"
+       id="rect4479-2-9-9-0-8-6-4"
+       style="color:#000000;fill:#bebebe" />
+  </g>
+</svg>
diff --git a/ui/composer.glade b/ui/composer.glade
index 39f9df98..b5992fd0 100644
--- a/ui/composer.glade
+++ b/ui/composer.glade
@@ -187,7 +187,7 @@
         <property name="label" translatable="yes">Detach</property>
         <property name="short_label" translatable="yes">Detach</property>
         <property name="tooltip" translatable="yes">Detach</property>
-        <property name="icon_name">window-maximize-symbolic</property>
+        <property name="icon_name">detach-symbolic</property>
       </object>
     </child>
     <child>