diff --git a/icons/hicolor/scalable/apps/org.gnome.Geary.Devel.svg b/icons/hicolor/scalable/apps/org.gnome.Geary.Devel.svg
new file mode 100644
index 00000000..d11aa168
--- /dev/null
+++ b/icons/hicolor/scalable/apps/org.gnome.Geary.Devel.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <defs>
+        <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="12" x2="116" y1="24.231995" y2="24.231995">
+            <stop offset="0" stop-color="#e5a50a"/>
+            <stop offset="0.042" stop-color="#f9cf69" stop-opacity="0.965"/>
+            <stop offset="0.097" stop-color="#f6ba29" stop-opacity="0.965"/>
+            <stop offset="0.921" stop-color="#f6ba2b" stop-opacity="0.996"/>
+            <stop offset="0.974" stop-color="#f9cf69"/>
+            <stop offset="1" stop-color="#e5a50a" stop-opacity="0.828"/>
+        </linearGradient>
+        <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="18" x2="110.132004" y1="24.231995" y2="24.231995">
+            <stop offset="0" stop-color="#e5a50a"/>
+            <stop offset="0.035" stop-color="#f6ba29" stop-opacity="0.965"/>
+            <stop offset="0.962" stop-color="#f6bb2c"/>
+            <stop offset="1" stop-color="#e5a50a" stop-opacity="0.828"/>
+        </linearGradient>
+        <filter id="c" height="100%" width="100%" x="0%" y="0%">
+            <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+        </filter>
+        <mask id="d">
+            <g filter="url(#c)">
+                <rect fill-opacity="0.1" height="128" width="128"/>
+            </g>
+        </mask>
+        <mask id="e">
+            <g filter="url(#c)">
+                <rect fill-opacity="0.05" height="128" width="128"/>
+            </g>
+        </mask>
+        <mask id="f">
+            <g filter="url(#c)">
+                <rect fill-opacity="0.12" height="128" width="128"/>
+            </g>
+        </mask>
+        <mask id="g">
+            <g filter="url(#c)">
+                <rect fill-opacity="0.1" height="128" width="128"/>
+            </g>
+        </mask>
+        <clipPath id="h">
+            <rect height="128" width="128"/>
+        </clipPath>
+        <g id="i" clip-path="url(#h)">
+            <path d="m 20.460938 28.675781 l 43.171874 34.886719 l 43.605469 -34.886719 l -43.605469 37.066407 z m 0 0"/>
+        </g>
+        <mask id="j">
+            <g filter="url(#c)">
+                <rect fill-opacity="0.05" height="128" width="128"/>
+            </g>
+        </mask>
+        <clipPath id="k">
+            <rect height="128" width="128"/>
+        </clipPath>
+        <g id="l" clip-path="url(#k)">
+            <path d="m 63.628906 52.839844 c -4 0 -8 1.429687 -11.0625 4.285156 l -32.542968 22.921875 l -0.023438 -0.046875 v 2 h 88 v -2 l -33.304688 -22.875 c -3.066406 -2.855469 -7.066406 -4.285156 -11.0625 -4.285156 z m 0 0"/>
+        </g>
+        <mask id="m">
+            <g filter="url(#c)">
+                <rect fill-opacity="0.12" height="128" width="128"/>
+            </g>
+        </mask>
+        <clipPath id="n">
+            <rect height="128" width="128"/>
+        </clipPath>
+        <g id="o" clip-path="url(#n)">
+            <path d="m 22.554688 28.675781 c -0.890626 0 -1.6875 0.539063 -2.023438 1.359375 l 33.132812 33.546875 c 2.714844 2.777344 6.433594 4.339844 10.316407 4.339844 c 3.882812 0 7.601562 -1.5625 10.316406 -4.339844 l 33.128906 -33.546875 c -0.335937 -0.820312 -1.132812 -1.359375 -2.019531 -1.359375 z m 0 0"/>
+        </g>
+        <clipPath id="p">
+            <rect height="128" width="128"/>
+        </clipPath>
+        <clipPath id="q">
+            <rect height="128" width="128"/>
+        </clipPath>
+        <mask id="r">
+            <g clip-path="url(#q)" filter="url(#c)">
+                <g clip-path="url(#p)">
+                    <path d="m 20.722656 12 h 86.554688 c 4.816406 0 8.722656 3.90625 8.722656 8.722656 v 86.554688 c 0 4.816406 -3.90625 8.722656 -8.722656 8.722656 h -86.554688 c -4.816406 0 -8.722656 -3.90625 -8.722656 -8.722656 v -86.554688 c 0 -4.816406 3.90625 -8.722656 8.722656 -8.722656 z m 0 0" fill="url(#a)"/>
+                    <path d="m 20 12 h 88 c 4.417969 0 8 3.582031 8 8 v 60 c 0 4.417969 -3.582031 8 -8 8 h -88 c -4.417969 0 -8 -3.582031 -8 -8 v -60 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#f9f06b"/>
+                    <path d="m 20 18 h 88 c 1.105469 0 2 0.894531 2 2 v 60 c 0 1.105469 -0.894531 2 -2 2 h -88 c -1.105469 0 -2 -0.894531 -2 -2 v -60 c 0 -1.105469 0.894531 -2 2 -2 z m 0 0" fill="url(#b)"/>
+                    <path d="m 20 42 h 88 c 1.105469 0 2 0.894531 2 2 v 36 c 0 1.105469 -0.894531 2 -2 2 h -88 c -1.105469 0 -2 -0.894531 -2 -2 v -36 c 0 -1.105469 0.894531 -2 2 -2 z m 0 0" fill="#e5a50a"/>
+                    <path d="m 22.203125 28.058594 c -1.203125 0 -2.179687 0.972656 -2.179687 2.179687 l -0.023438 51.761719 h 18 v 8 h 52 v -8 h 18 l -0.054688 -51.761719 c 0 -1.203125 -0.976562 -2.179687 -2.179687 -2.179687 z m 0 0" fill="#f6f5f4"/>
+                    <use mask="url(#g)" xlink:href="#i"/>
+                    <path d="m 22.203125 28.675781 c -0.464844 0 -0.894531 0.148438 -1.25 0.398438 l 42.679687 34.488281 l 42.890626 -34.316406 c -0.398438 -0.367188 -0.921876 -0.570313 -1.464844 -0.570313 z m 0 0" fill="#f7f8f9"/>
+                    <use mask="url(#j)" xlink:href="#l"/>
+                    <path d="m 63.628906 54.839844 c -4 0 -8 1.429687 -11.0625 4.285156 l -32.542968 22.921875 l 17.976562 -0.046875 v 10 h 52 v -10 h 18 l -33.304688 -22.875 c -3.066406 -2.855469 -7.066406 -4.285156 -11.0625 -4.285156 z m 0 0" fill="#f0f0ee"/>
+                    <use mask="url(#m)" xlink:href="#o"/>
+                    <path d="m 22.554688 28.675781 c -0.472657 0 -0.910157 0.152344 -1.265626 0.40625 l 32.375 32.375 c 2.730469 2.742188 6.445313 4.285157 10.316407 4.285157 c 3.871093 0 7.582031 -1.542969 10.316406 -4.285157 l 32.375 -32.375 c -0.371094 -0.265625 -0.8125 -0.40625 -1.265625 -0.40625 z m 0 0" fill="#f6f5f4"/>
+                    <path d="m 38 96 v 7 c 0 2.214844 1.785156 4 4 4 h 44 c 2.214844 0 4 -1.785156 4 -4 v -7 c 0 2.214844 -1.785156 4 -4 4 h -44 c -2.214844 0 -4 -1.785156 -4 -4 z m 0 0" fill="#f9f06b"/>
+                    <path d="m 90 92 v 4 c 0 2.214844 -1.785156 4 -4 4 h -44 c -2.214844 0 -4 -1.785156 -4 -4 v -4 z m 0 0" fill="#c0bfbc"/>
+                </g>
+            </g>
+        </mask>
+        <mask id="s">
+            <g filter="url(#c)">
+                <rect fill-opacity="0.8" height="128" width="128"/>
+            </g>
+        </mask>
+        <linearGradient id="t" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
+            <stop offset="0" stop-color="#f9f06b"/>
+            <stop offset="1" stop-color="#f5c211"/>
+        </linearGradient>
+        <clipPath id="u">
+            <rect height="128" width="128"/>
+        </clipPath>
+        <clipPath id="v">
+            <rect height="128" width="128"/>
+        </clipPath>
+    </defs>
+    <path d="m 20.722656 12 h 86.554688 c 4.816406 0 8.722656 3.90625 8.722656 8.722656 v 86.554688 c 0 4.816406 -3.90625 8.722656 -8.722656 8.722656 h -86.554688 c -4.816406 0 -8.722656 -3.90625 -8.722656 -8.722656 v -86.554688 c 0 -4.816406 3.90625 -8.722656 8.722656 -8.722656 z m 0 0" fill="url(#a)"/>
+    <path d="m 20 12 h 88 c 4.417969 0 8 3.582031 8 8 v 60 c 0 4.417969 -3.582031 8 -8 8 h -88 c -4.417969 0 -8 -3.582031 -8 -8 v -60 c 0 -4.417969 3.582031 -8 8 -8 z m 0 0" fill="#f9f06b"/>
+    <path d="m 20 18 h 88 c 1.105469 0 2 0.894531 2 2 v 60 c 0 1.105469 -0.894531 2 -2 2 h -88 c -1.105469 0 -2 -0.894531 -2 -2 v -60 c 0 -1.105469 0.894531 -2 2 -2 z m 0 0" fill="url(#b)"/>
+    <path d="m 20 42 h 88 c 1.105469 0 2 0.894531 2 2 v 36 c 0 1.105469 -0.894531 2 -2 2 h -88 c -1.105469 0 -2 -0.894531 -2 -2 v -36 c 0 -1.105469 0.894531 -2 2 -2 z m 0 0" fill="#e5a50a"/>
+    <path d="m 22.203125 28.058594 c -1.203125 0 -2.179687 0.972656 -2.179687 2.179687 l -0.023438 51.761719 h 18 v 8 h 52 v -8 h 18 l -0.054688 -51.761719 c 0 -1.203125 -0.976562 -2.179687 -2.179687 -2.179687 z m 0 0" fill="#f6f5f4"/>
+    <use mask="url(#d)" xlink:href="#i"/>
+    <path d="m 22.203125 28.675781 c -0.464844 0 -0.894531 0.148438 -1.25 0.398438 l 42.679687 34.488281 l 42.890626 -34.316406 c -0.398438 -0.367188 -0.921876 -0.570313 -1.464844 -0.570313 z m 0 0" fill="#f7f8f9"/>
+    <use mask="url(#e)" xlink:href="#l"/>
+    <path d="m 63.628906 54.839844 c -4 0 -8 1.429687 -11.0625 4.285156 l -32.542968 22.921875 l 17.976562 -0.046875 v 10 h 52 v -10 h 18 l -33.304688 -22.875 c -3.066406 -2.855469 -7.066406 -4.285156 -11.0625 -4.285156 z m 0 0" fill="#f0f0ee"/>
+    <use mask="url(#f)" xlink:href="#o"/>
+    <path d="m 22.554688 28.675781 c -0.472657 0 -0.910157 0.152344 -1.265626 0.40625 l 32.375 32.375 c 2.730469 2.742188 6.445313 4.285157 10.316407 4.285157 c 3.871093 0 7.582031 -1.542969 10.316406 -4.285157 l 32.375 -32.375 c -0.371094 -0.265625 -0.8125 -0.40625 -1.265625 -0.40625 z m 0 0" fill="#f6f5f4"/>
+    <path d="m 38 96 v 7 c 0 2.214844 1.785156 4 4 4 h 44 c 2.214844 0 4 -1.785156 4 -4 v -7 c 0 2.214844 -1.785156 4 -4 4 h -44 c -2.214844 0 -4 -1.785156 -4 -4 z m 0 0" fill="#f9f06b"/>
+    <path d="m 90 92 v 4 c 0 2.214844 -1.785156 4 -4 4 h -44 c -2.214844 0 -4 -1.785156 -4 -4 v -4 z m 0 0" fill="#c0bfbc"/>
+    <g clip-path="url(#v)" mask="url(#r)">
+        <g clip-path="url(#u)" mask="url(#s)">
+            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#t)"/>
+            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
+        </g>
+    </g>
+</svg>
diff --git a/icons/meson.build b/icons/meson.build
index 94a0b9a4..ecb26be3 100644
--- a/icons/meson.build
+++ b/icons/meson.build
@@ -47,9 +47,8 @@ install_data(icon_files,
 scalable_dir = join_paths('hicolor', 'scalable', 'apps')
 
 install_data(
-  join_paths(scalable_dir, 'org.gnome.Geary.svg'),
+  join_paths(scalable_dir, '@0@.svg'.format(geary_id)),
   install_dir: join_paths(data_dir, 'icons', scalable_dir),
-  rename: '@0@.svg'.format(geary_id)
 )
 
 symbolic_dir = join_paths('hicolor', 'symbolic', 'apps')