From 335de99f9ce0efbdf4fbe51753ce8d35dd11efef Mon Sep 17 00:00:00 2001
From: Jim Nelson <jim@yorba.org>
Date: Mon, 10 Sep 2012 18:57:36 -0700
Subject: [PATCH] "mail-archive" icon: Closes #5787

---
 icons/16x16/mail-archive.svg       | 350 ++++++++++++++++
 icons/24x24/mail-archive.svg       | 446 ++++++++++++++++++++
 icons/CMakeLists.txt               |   2 +
 icons/archive-insert.svg           | 544 -------------------------
 icons/archive.svg                  | 631 -----------------------------
 src/client/geary-controller.vala   |   2 +-
 src/client/models/folder-list.vala |   2 +-
 7 files changed, 800 insertions(+), 1177 deletions(-)
 create mode 100644 icons/16x16/mail-archive.svg
 create mode 100644 icons/24x24/mail-archive.svg
 delete mode 100644 icons/archive-insert.svg
 delete mode 100644 icons/archive.svg

diff --git a/icons/16x16/mail-archive.svg b/icons/16x16/mail-archive.svg
new file mode 100644
index 00000000..79a9661b
--- /dev/null
+++ b/icons/16x16/mail-archive.svg
@@ -0,0 +1,350 @@
+<?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"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg4106">
+  <defs
+     id="defs4108">
+    <linearGradient
+       id="linearGradient3908-1">
+      <stop
+         id="stop3910-0"
+         style="stop-color:#000000;stop-opacity:0.2962963"
+         offset="0" />
+      <stop
+         id="stop3912-5"
+         style="stop-color:#000000;stop-opacity:0.16666667"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4414-3">
+      <stop
+         id="stop4416-89"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4418-69"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop4420-2"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop4422-2"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4720-4-2">
+      <stop
+         id="stop4722-3-5"
+         style="stop-color:#868688;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4724-0-1"
+         style="stop-color:#dddede;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3924-742-7">
+      <stop
+         id="stop3115-3"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3117-46"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop3119-5"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3121-5"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3924-742">
+      <stop
+         id="stop3115"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3117"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop3119"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3121"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3908">
+      <stop
+         id="stop3910"
+         style="stop-color:#000000;stop-opacity:0.62962961"
+         offset="0" />
+      <stop
+         id="stop3912"
+         style="stop-color:#000000;stop-opacity:0.2962963"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4720">
+      <stop
+         id="stop4722"
+         style="stop-color:#868688;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4724"
+         style="stop-color:#dddede;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-0.3790026"
+       y1="22.010834"
+       x2="-0.3790026"
+       y2="14.4129"
+       id="linearGradient3064"
+       xlink:href="#linearGradient3908-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69252666,0,0,0.71428326,12.193576,0.14325302)" />
+    <linearGradient
+       x1="23.99999"
+       y1="8.2377691"
+       x2="23.99999"
+       y2="40.224758"
+       id="linearGradient3079"
+       xlink:href="#linearGradient4414-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.18918921,0,0,0.0810811,3.4594601,11.054054)" />
+    <linearGradient
+       x1="169.07913"
+       y1="-4.4748607"
+       x2="169.07913"
+       y2="-26.459934"
+       id="linearGradient3082"
+       xlink:href="#linearGradient4720-4-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.23171921,0,0,0.20479227,-32.285639,16.168091)"
+       spreadMethod="pad" />
+    <linearGradient
+       x1="23.99999"
+       y1="11.962924"
+       x2="23.99999"
+       y2="32.555599"
+       id="linearGradient3086"
+       xlink:href="#linearGradient3924-742-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29729733,0,0,0.02702703,0.86486573,1.3513516)" />
+    <linearGradient
+       x1="23.99999"
+       y1="4.999989"
+       x2="23.99999"
+       y2="43"
+       id="linearGradient3089"
+       xlink:href="#linearGradient3924-742"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29729729,0,0,0.32432436,0.86486598,0.71621806)" />
+    <linearGradient
+       x1="-0.3790026"
+       y1="21.012358"
+       x2="-0.3790026"
+       y2="0.032915123"
+       id="linearGradient3092"
+       xlink:href="#linearGradient3908"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76329185,0,0,0.69656691,12.595322,0.15205361)" />
+    <linearGradient
+       x1="169.07913"
+       y1="-7.4346271"
+       x2="169.07913"
+       y2="-60.497246"
+       id="linearGradient3095"
+       xlink:href="#linearGradient4720"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.28090818,0,0,0.24425479,-40.836916,16.385591)"
+       spreadMethod="pad" />
+    <linearGradient
+       x1="-0.3790026"
+       y1="22.010834"
+       x2="-0.3790026"
+       y2="14.4129"
+       id="linearGradient3064-8"
+       xlink:href="#linearGradient3908-1-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69252666,0,0,0.71428326,12.193576,-6.8567474)" />
+    <linearGradient
+       id="linearGradient3908-1-5">
+      <stop
+         id="stop3910-0-4"
+         style="stop-color:#000000;stop-opacity:0.54938269"
+         offset="0" />
+      <stop
+         id="stop3912-5-6"
+         style="stop-color:#000000;stop-opacity:0.16666667"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="8.2377691"
+       x2="23.99999"
+       y2="40.224758"
+       id="linearGradient3079-5"
+       xlink:href="#linearGradient4414-3-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.18918921,0,0,0.0810811,3.4594601,4.0540536)" />
+    <linearGradient
+       id="linearGradient4414-3-6">
+      <stop
+         id="stop4416-89-4"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4418-69-9"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop4420-2-7"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop4422-2-4"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4720-4-2-8">
+      <stop
+         id="stop4722-3-5-4"
+         style="stop-color:#868688;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4724-0-1-7"
+         style="stop-color:#dddede;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="169.07913"
+       y1="-4.4748607"
+       x2="169.07913"
+       y2="-26.459934"
+       id="linearGradient3131"
+       xlink:href="#linearGradient4720-4-2-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.23171921,0,0,0.20479227,-32.285639,9.1680906)"
+       spreadMethod="pad" />
+  </defs>
+  <metadata
+     id="metadata4111">
+    <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>
+  <path
+     d="m 3.0386041,0.49999962 9.9227929,0 c 0,0 1.167443,1.46423928 1.28899,1.58590248 0.221883,0.2220913 0.277713,0.5959352 0.237622,0.9048933 0,3.5813293 0,8.2203646 0,11.8016936 0.01558,0.600116 -0.678776,0.753196 -1.202792,0.696568 -3.669979,0 -7.3399563,0 -11.0099344,0 -0.6576004,0.01422 -0.8253438,-0.61944 -0.763292,-1.097647 0,-3.581332 0,-8.2203654 0,-11.801695 -0.00526,-0.1977776 0.093517,-0.3834831 0.2483484,-0.513358 z"
+     id="rect5505-21-3"
+     style="color:#000000;fill:none;stroke:url(#linearGradient3092);stroke-width:0.99999982;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" />
+  <path
+     d="M 3.3379099,1.0000003 2.1722645,2.4056612 c -0.014015,0.015505 -0.029652,0.02979 -0.046626,0.0426 C 2.0528135,2.509415 2.0063803,2.6232778 2.009074,2.7251335 l 0,11.5021575 c 0.00104,0.01418 0.00104,0.02843 0,0.04259 -0.023959,0.184826 -4.156e-4,0.40288 0.069939,0.532447 0.070354,0.129567 0.1259422,0.174722 0.3263809,0.170382 l 10.7705631,0 c 0.01553,-9.57e-4 0.03111,-9.57e-4 0.04663,0 0.202315,0.02189 0.441,3.8e-4 0.582825,-0.06389 0.141824,-0.06428 0.191251,-0.115056 0.186501,-0.298171 l 0,-11.5021582 c -0.0011,-0.014178 -0.0011,-0.028416 0,-0.0426 C 14.022887,2.8269374 13.962468,2.5589114 13.852031,2.4482446 13.774536,2.3706089 13.69695,2.2814525 13.572274,2.1287859 13.447601,1.9761219 13.302898,1.7836391 13.152644,1.5963413 12.903431,1.285685 12.737338,1.0934282 12.663072,1.0000003 z"
+     id="path3916"
+     style="color:#000000;fill:url(#linearGradient3095);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="11"
+     height="12"
+     x="2.4999998"
+     y="2.4999998"
+     id="rect6741-9"
+     style="opacity:0.5;fill:none;stroke:url(#linearGradient3089);stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+  <path
+     d="m 3.673035,1.4999998 8.61943,0 L 13.5,2.5000001 c -3.6666669,0 -7.3333333,0 -11.0000001,0 z"
+     id="rect6741-9-5"
+     style="opacity:0.5;fill:none;stroke:url(#linearGradient3086);stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+  <path
+     d="m 2.849151,9.5 10.269083,0"
+     id="path4846"
+     style="opacity:0.1;fill:none;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <rect
+     width="8"
+     height="4"
+     x="4"
+     y="11"
+     id="rect5505-21-0"
+     style="color:#000000;fill:url(#linearGradient3082);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="7.0000005"
+     height="3.0000002"
+     x="4.5"
+     y="11.5"
+     id="rect6741-9-1"
+     style="opacity:0.5;fill:none;stroke:url(#linearGradient3079);stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+  <path
+     d="m 6.2931402,11.928553 0,1.428565 3.4626329,0 0,-1.428565"
+     id="path4924-7"
+     style="fill:none;stroke:#848484;stroke-width:2.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 6.2931402,12.285694 0,1.071424 3.4626329,0 0,-1.071424"
+     id="path4924"
+     style="fill:none;stroke:#cccccc;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <rect
+     width="8"
+     height="4"
+     x="4"
+     y="3.9999995"
+     id="rect5505-21-0-7"
+     style="color:#000000;fill:url(#linearGradient3131);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <rect
+     width="7.0000005"
+     height="3.0000002"
+     x="4.5"
+     y="4.4999995"
+     id="rect6741-9-1-9"
+     style="opacity:0.5;fill:none;stroke:url(#linearGradient3079-5);stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+  <path
+     d="m 6.2931402,4.9285526 0,1.428565 3.4626329,0 0,-1.428565"
+     id="path4924-7-8"
+     style="fill:none;stroke:#848484;stroke-width:2.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  <path
+     d="m 6.2931402,5.2856936 0,1.071424 3.4626329,0 0,-1.071424"
+     id="path4924-5"
+     style="fill:none;stroke:#cccccc;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <rect
+     width="9.0028992"
+     height="5.0000386"
+     rx="0.5"
+     ry="0.5"
+     x="3.5230067"
+     y="3.4999614"
+     id="rect5505-21-0-0-3"
+     style="color:#000000;fill:none;stroke:url(#linearGradient3064-8);stroke-width:0.99999982;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" />
+  <rect
+     width="9.0028992"
+     height="5.0000386"
+     rx="0.5"
+     ry="0.5"
+     x="3.5230067"
+     y="10.499962"
+     id="rect5505-21-0-0"
+     style="color:#000000;fill:none;stroke:url(#linearGradient3064);stroke-width:0.99999982;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" />
+</svg>
diff --git a/icons/24x24/mail-archive.svg b/icons/24x24/mail-archive.svg
new file mode 100644
index 00000000..8308455b
--- /dev/null
+++ b/icons/24x24/mail-archive.svg
@@ -0,0 +1,446 @@
+<?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"
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg4106">
+  <defs
+     id="defs4108">
+    <linearGradient
+       x1="-0.3790026"
+       y1="22.010834"
+       x2="-0.3790026"
+       y2="14.4129"
+       id="linearGradient3914-7"
+       xlink:href="#linearGradient3908-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.020157,8.0004845)" />
+    <linearGradient
+       id="linearGradient3908-1">
+      <stop
+         id="stop3910-0"
+         style="stop-color:#000000;stop-opacity:0.54938269"
+         offset="0" />
+      <stop
+         id="stop3912-5"
+         style="stop-color:#000000;stop-opacity:0.16666667"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="8.2377691"
+       x2="23.99999"
+       y2="40.224758"
+       id="linearGradient3179"
+       xlink:href="#linearGradient4414-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29729732,0,0,0.13513514,4.8648661,13.756719)" />
+    <linearGradient
+       id="linearGradient4414-1">
+      <stop
+         id="stop4416-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4418-6"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop4420-5"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop4422-9"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="169.07913"
+       y1="-4.4748607"
+       x2="169.07913"
+       y2="-26.459934"
+       id="linearGradient3182"
+       xlink:href="#linearGradient4720-4-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37654594,0,0,0.35839049,-53.464549,22.544182)"
+       spreadMethod="pad" />
+    <linearGradient
+       id="linearGradient4720-4-6">
+      <stop
+         id="stop4722-3-7"
+         style="stop-color:#868688;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4724-0-3"
+         style="stop-color:#dddede;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="119.47528"
+       y1="16.924896"
+       x2="119.47528"
+       y2="26.671993"
+       id="linearGradient3184"
+       xlink:href="#linearGradient4714-4-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8224499,0,0,0.82905873,-91.762338,-1.0488626)" />
+    <linearGradient
+       id="linearGradient4714-4-8">
+      <stop
+         id="stop4716-1-5"
+         style="stop-color:#b6b6b6;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4718-4-3"
+         style="stop-color:#4a4a4a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="8.2377691"
+       x2="23.99999"
+       y2="40.224758"
+       id="linearGradient3189"
+       xlink:href="#linearGradient4414-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29729732,0,0,0.13513514,4.8648661,22.756718)" />
+    <linearGradient
+       id="linearGradient4414-3">
+      <stop
+         id="stop4416-89"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4418-69"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop4420-2"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop4422-2"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="169.07913"
+       y1="-4.4748607"
+       x2="169.07913"
+       y2="-26.459934"
+       id="linearGradient3192"
+       xlink:href="#linearGradient4720-4-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.34757878,0,0,0.30718842,-48.428451,30.752136)"
+       spreadMethod="pad" />
+    <linearGradient
+       id="linearGradient4720-4-2">
+      <stop
+         id="stop4722-3-5"
+         style="stop-color:#868688;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4724-0-1"
+         style="stop-color:#dddede;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="11.962924"
+       x2="23.99999"
+       y2="32.555599"
+       id="linearGradient3198"
+       xlink:href="#linearGradient3924-742-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4054054,0,0,0.05405406,2.270272,9.202703)" />
+    <linearGradient
+       id="linearGradient3924-742-7">
+      <stop
+         id="stop3115-3"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3117-46"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop3119-5"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3121-5"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="23.99999"
+       y1="4.999989"
+       x2="23.99999"
+       y2="43"
+       id="linearGradient3201"
+       xlink:href="#linearGradient3924-742"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4054054,0,0,0.43243245,2.2702721,9.1216244)" />
+    <linearGradient
+       id="linearGradient3924-742">
+      <stop
+         id="stop3115"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3117"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.06316455" />
+      <stop
+         id="stop3119"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.95056331" />
+      <stop
+         id="stop3121"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="-0.3790026"
+       y1="21.012358"
+       x2="-0.3790026"
+       y2="0.032915123"
+       id="linearGradient3914"
+       xlink:href="#linearGradient3908"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(18.020157,8.0004845)" />
+    <linearGradient
+       id="linearGradient3908">
+      <stop
+         id="stop3910"
+         style="stop-color:#000000;stop-opacity:0.62962961"
+         offset="0" />
+      <stop
+         id="stop3912"
+         style="stop-color:#000000;stop-opacity:0.2962963"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="169.07913"
+       y1="-7.4346271"
+       x2="169.07913"
+       y2="-60.497246"
+       id="linearGradient3918"
+       xlink:href="#linearGradient4720"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.37454439,0,0,0.35698767,-53.115912,31.486625)"
+       spreadMethod="pad" />
+    <linearGradient
+       id="linearGradient4720">
+      <stop
+         id="stop4722"
+         style="stop-color:#868688;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4724"
+         style="stop-color:#dddede;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient4253"
+       xlink:href="#linearGradient3688-166-749-49"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
+    <linearGradient
+       id="linearGradient3688-166-749-49">
+      <stop
+         id="stop3079"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3081"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient4255"
+       xlink:href="#linearGradient3688-464-309-276"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
+    <linearGradient
+       id="linearGradient3688-464-309-276">
+      <stop
+         id="stop3085"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3087"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       id="linearGradient4257"
+       xlink:href="#linearGradient3702-501-757-979"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3702-501-757-979">
+      <stop
+         id="stop3091"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3093"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3095"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata4111">
+    <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
+     transform="translate(0,-8)"
+     id="layer1">
+    <g
+       transform="matrix(0.55,0,0,0.3333336,-1.2002477,14.333331)"
+       id="g2036"
+       style="display:inline">
+      <g
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+         id="g3712"
+         style="opacity:0.4">
+        <rect
+           width="5"
+           height="7"
+           x="38"
+           y="40"
+           id="rect2801"
+           style="fill:url(#radialGradient4253);fill-opacity:1;stroke:none" />
+        <rect
+           width="5"
+           height="7"
+           x="-10"
+           y="-47"
+           transform="scale(-1,-1)"
+           id="rect3696"
+           style="fill:url(#radialGradient4255);fill-opacity:1;stroke:none" />
+        <rect
+           width="28"
+           height="7.0000005"
+           x="10"
+           y="40"
+           id="rect3700"
+           style="fill:url(#linearGradient4257);fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+    <path
+       d="m 5.7838797,9 -1.5541944,2.054427 c -0.018688,0.02266 -0.039536,0.04354 -0.062168,0.06226 -0.0971,0.08938 -0.159011,0.255794 -0.1554194,0.40466 l 0,15.377074 c 0.00139,0.02072 0.00139,0.04154 0,0.06226 -0.031943,0.27013 -5.54e-4,0.588825 0.093252,0.778192 0.093806,0.189367 0.1679229,0.255361 0.4351745,0.249021 l 14.3607566,0 c 0.02069,-0.0014 0.04148,-0.0014 0.06217,0 0.269751,0.03198 0.587997,5.55e-4 0.777098,-0.09338 0.1891,-0.09394 0.255002,-0.168159 0.248671,-0.435787 l 0,-15.377075 c -0.0014,-0.02072 -0.0014,-0.04153 0,-0.06226 0.0413,-0.349236 -0.03925,-0.740966 -0.186507,-0.90271 C 19.699394,11.0032 19.595941,10.872895 19.429707,10.649767 19.263472,10.426639 19.070535,10.145318 18.870197,9.8715751 18.537911,9.4175392 18.316455,9.1365486 18.217435,9 z"
+       id="path3916"
+       style="color:#000000;fill:url(#linearGradient3918);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 5.4997594,8.5 13.0000006,0 c 0,0 1.529481,2.10208 1.688724,2.276741 0.290691,0.318837 0.363834,0.855532 0.311311,1.299076 0,5.141401 0,10.282802 0,15.424203 0.02041,0.861532 -0.889275,1.081295 -1.575796,1 -4.808093,0 -9.6161856,0 -14.4242786,0 -0.861532,0.02041 -1.081295,-0.889275 -1,-1.575796 0,-5.141402 0,-10.282802 0,-15.424203 -0.0069,-0.283932 0.122518,-0.550533 0.325365,-0.736983 z"
+       id="rect5505-21-3"
+       style="color:#000000;fill:none;stroke:url(#linearGradient3914);stroke-width:0.99999994;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" />
+    <rect
+       width="15"
+       height="16"
+       x="4.5"
+       y="11.500001"
+       id="rect6741-9"
+       style="opacity:0.5;fill:none;stroke:url(#linearGradient3201);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 6.0995932,9.4999996 11.7537668,0 L 19.5,11.5 c -5,0 -10.0000001,0 -15.0000001,0 z"
+       id="rect6741-9-5"
+       style="opacity:0.5;fill:none;stroke:url(#linearGradient3198);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 5.2720568,21.499999 13.4554022,0"
+       id="path4846"
+       style="opacity:0.1;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <rect
+       width="12"
+       height="6"
+       rx="0.5"
+       ry="0.5"
+       x="6"
+       y="23"
+       id="rect5505-21-0"
+       style="color:#000000;fill:url(#linearGradient3192);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="11"
+       height="5"
+       x="6.5"
+       y="23.49996"
+       id="rect6741-9-1"
+       style="opacity:0.5;fill:none;stroke:url(#linearGradient3189);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 9.4999999,24.499959 0,2 5.0000001,0 0,-2"
+       id="path4924-7"
+       style="fill:none;stroke:#848484;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 9.4999999,24.999959 0,1.5 5.0000001,0 0,-1.5"
+       id="path4924"
+       style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <rect
+       width="13.000078"
+       height="7.0000782"
+       rx="1"
+       ry="0.99999994"
+       x="5.4999614"
+       y="13.499922"
+       id="rect5505-21-0-2"
+       style="color:#000000;fill:url(#linearGradient3182);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3184);stroke-width:0.99999994;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" />
+    <rect
+       width="11"
+       height="5"
+       x="6.5"
+       y="14.49996"
+       id="rect6741-9-1-7"
+       style="opacity:0.5;fill:none;stroke:url(#linearGradient3179);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       d="m 9.4999998,15.49996 0,2 5.0000002,0 0,-2"
+       id="path4924-7-6"
+       style="fill:none;stroke:#848484;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 9.4999998,15.99996 0,1.5 5.0000002,0 0,-1.5"
+       id="path4924-5"
+       style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <rect
+       width="13.000078"
+       height="7.0000782"
+       rx="1"
+       ry="0.99999994"
+       x="5.4999614"
+       y="22.499922"
+       id="rect5505-21-0-0"
+       style="color:#000000;fill:none;stroke:url(#linearGradient3914-7);stroke-width:0.99999994;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" />
+  </g>
+</svg>
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 230851aa..c874c047 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -13,12 +13,14 @@ set(ICON_FILES
 )
 
 set(ICON_FILES_16
+    16x16/mail-archive
     16x16/tag.svg
     16x16/tag-new.svg
     16x16/tags.svg
 )
 
 set(ICON_FILES_24
+    24x24/mail-archive.svg
     24x24/mail-move.svg
     24x24/tag.svg
     24x24/tag-new.svg
diff --git a/icons/archive-insert.svg b/icons/archive-insert.svg
deleted file mode 100644
index 6f0de555..00000000
--- a/icons/archive-insert.svg
+++ /dev/null
@@ -1,544 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="48"
-   height="48"
-   id="svg4486">
-  <defs
-     id="defs4488">
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         id="stop5050"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop5056"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop5052"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5060">
-      <stop
-         id="stop5062"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5064"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3104">
-      <stop
-         id="stop3106"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3108"
-         style="stop-color:#c8c8c8;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>
-    <radialGradient
-       cx="102"
-       cy="112.3047"
-       r="139.55859"
-       id="XMLID_8_"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop41"
-         style="stop-color:#b7b8b9;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop47"
-         style="stop-color:#ececec;stop-opacity:1"
-         offset="0.18851049" />
-      <stop
-         id="stop49"
-         style="stop-color:#fafafa;stop-opacity:0"
-         offset="0.25718147" />
-      <stop
-         id="stop51"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0.30111277" />
-      <stop
-         id="stop53"
-         style="stop-color:#fafafa;stop-opacity:0"
-         offset="0.53130001" />
-      <stop
-         id="stop55"
-         style="stop-color:#ebecec;stop-opacity:0"
-         offset="0.84490001" />
-      <stop
-         id="stop57"
-         style="stop-color:#e1e2e3;stop-opacity:0"
-         offset="1" />
-    </radialGradient>
-    <linearGradient
-       id="linearGradient3211">
-      <stop
-         id="stop3213"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3215"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8589">
-      <stop
-         id="stop8591"
-         style="stop-color:#fefefe;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop8593"
-         style="stop-color:#cbcbcb;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="32.892288"
-       y1="8.0590115"
-       x2="36.358372"
-       y2="5.4565363"
-       id="linearGradient3312"
-       xlink:href="#linearGradient8589"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9976985,0,0,1.0406866,0.1638029,-1.1057939)" />
-    <linearGradient
-       x1="24"
-       y1="1.9999999"
-       x2="24"
-       y2="46.01725"
-       id="linearGradient3316"
-       xlink:href="#linearGradient3211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9777778,0,-0.9666693)" />
-    <radialGradient
-       cx="102"
-       cy="112.3047"
-       r="139.55859"
-       id="radialGradient3319"
-       xlink:href="#XMLID_8_"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3617022,0,0,-0.3907784,0.8510637,47.517004)" />
-    <linearGradient
-       x1="25.132275"
-       y1="0.98520643"
-       x2="25.132275"
-       y2="47.013336"
-       id="linearGradient3322"
-       xlink:href="#linearGradient3600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9561695,-1.0064697e-7,-1.914922)" />
-    <linearGradient
-       x1="-51.786404"
-       y1="50.786446"
-       x2="-51.786404"
-       y2="2.9062471"
-       id="linearGradient3324"
-       xlink:href="#linearGradient3104"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805533)" />
-    <radialGradient
-       cx="605.71429"
-       cy="486.64789"
-       r="117.14286"
-       fx="605.71429"
-       fy="486.64789"
-       id="radialGradient3327"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" />
-    <radialGradient
-       cx="605.71429"
-       cy="486.64789"
-       r="117.14286"
-       fx="605.71429"
-       fy="486.64789"
-       id="radialGradient3330"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" />
-    <linearGradient
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507"
-       id="linearGradient3333"
-       xlink:href="#linearGradient5048"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" />
-    <filter
-       x="-0.14846256"
-       y="-0.16434373"
-       width="1.2969251"
-       height="1.3286875"
-       color-interpolation-filters="sRGB"
-       id="filter3212">
-      <feGaussianBlur
-         id="feGaussianBlur3214"
-         stdDeviation="0.77391625" />
-    </filter>
-    <radialGradient
-       cx="5"
-       cy="41.5"
-       r="5"
-       fx="5"
-       fy="41.5"
-       id="radialGradient2983"
-       xlink:href="#linearGradient3681"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5938225,0,0,1.5366531,41.140892,-103.93618)" />
-    <linearGradient
-       id="linearGradient3703">
-      <stop
-         id="stop3705"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop3711"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop3707"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="17.554192"
-       y1="46.000275"
-       x2="17.554192"
-       y2="34.999718"
-       id="linearGradient2905"
-       xlink:href="#linearGradient3703"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7570316,0,0,1.3969574,-17.394014,-16.411698)" />
-    <linearGradient
-       id="linearGradient3681">
-      <stop
-         id="stop3683"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3685"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="5"
-       cy="41.5"
-       r="5"
-       fx="5"
-       fy="41.5"
-       id="radialGradient2903"
-       xlink:href="#linearGradient3681"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5938225,0,0,1.5366531,-6.6594735,-103.93618)" />
-    <linearGradient
-       id="linearGradient3295">
-      <stop
-         id="stop3297"
-         style="stop-color:#c9af8b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3299"
-         style="stop-color:#ad8757;stop-opacity:1"
-         offset="0.23942046" />
-      <stop
-         id="stop3301"
-         style="stop-color:#c2a57f;stop-opacity:1"
-         offset="0.27582464" />
-      <stop
-         id="stop3303"
-         style="stop-color:#9d7d53;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="15.464298"
-       y1="7.9756851"
-       x2="15.464298"
-       y2="45.04248"
-       id="linearGradient2897"
-       xlink:href="#linearGradient3295"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.70732457,0,0,0.69402746,-0.97578945,-1.3832872)" />
-    <linearGradient
-       id="linearGradient3199">
-      <stop
-         id="stop3201"
-         style="stop-color:#dac197;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3203"
-         style="stop-color:#c1a581;stop-opacity:1"
-         offset="0.23942046" />
-      <stop
-         id="stop3205"
-         style="stop-color:#dbc298;stop-opacity:1"
-         offset="0.27582464" />
-      <stop
-         id="stop3207"
-         style="stop-color:#a68b60;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="24.822832"
-       y1="15.377745"
-       x2="24.996943"
-       y2="37.27668"
-       id="linearGradient2895"
-       xlink:href="#linearGradient3199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.90694933,0,0,1.0807825,-5.2693853,-11.995491)" />
-    <linearGradient
-       id="linearGradient4559">
-      <stop
-         id="stop4561"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop4563"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="23.451576"
-       y1="30.554907"
-       x2="43.00663"
-       y2="45.934479"
-       id="linearGradient2892"
-       xlink:href="#linearGradient4559"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.90694933,0,0,0.81526518,-5.2693853,-5.0638302)" />
-    <linearGradient
-       id="linearGradient2909">
-      <stop
-         id="stop2911"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2913"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.3021296" />
-      <stop
-         id="stop2915"
-         style="stop-color:#ffffff;stop-opacity:0.6901961"
-         offset="0.39746851" />
-      <stop
-         id="stop2917"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="26"
-       y1="22"
-       x2="26"
-       y2="8"
-       id="linearGradient2889"
-       xlink:href="#linearGradient2909"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99999976,0,0,0.71428568,-7.9999942,-1.7142862)" />
-    <linearGradient
-       id="linearGradient3275">
-      <stop
-         id="stop3277"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop3283"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.245" />
-      <stop
-         id="stop3285"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.77350003" />
-      <stop
-         id="stop3279"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="44.994774"
-       y1="17.5"
-       x2="3.0052247"
-       y2="17.5"
-       id="linearGradient2886"
-       xlink:href="#linearGradient3275"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.70749164,0,0,0.69402746,-0.97979919,-1.6454802)"
-       spreadMethod="reflect" />
-    <linearGradient
-       x1="28.62199"
-       y1="18.218788"
-       x2="28.62199"
-       y2="49.56282"
-       id="linearGradient2529"
-       xlink:href="#linearGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.599071,0,0,0.6156931,3.8304189,17.018589)" />
-    <linearGradient
-       id="linearGradient4222">
-      <stop
-         id="stop4224"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4226"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="22.181572"
-       y1="14.499924"
-       x2="22.181572"
-       y2="44.051018"
-       id="linearGradient2532"
-       xlink:href="#linearGradient2264"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.5165267,0,0,0.5333212,30.519825,20.258444)" />
-    <linearGradient
-       id="linearGradient2264">
-      <stop
-         id="stop2266"
-         style="stop-color:#d7e866;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2268"
-         style="stop-color:#8cab2a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5105-262-943-861">
-      <stop
-         id="stop2487"
-         style="stop-color:#0d0d0d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2489"
-         style="stop-color:#0d0d0d;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="11.25"
-       cy="19.03125"
-       r="8.0625"
-       fx="11.25"
-       fy="19.03125"
-       id="radialGradient3282"
-       xlink:href="#linearGradient5105-262-943-861"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.282946,0,13.64644)" />
-  </defs>
-  <rect
-     width="32.508301"
-     height="3.5700529"
-     x="7.7378473"
-     y="42.429947"
-     id="rect2879"
-     style="opacity:0.3;fill:url(#linearGradient3333);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 7.7378475,42.430102 c 0,0 0,3.569856 0,3.569856 -1.1865002,0.0067 -2.8683795,-0.799823 -2.8683795,-1.785158 0,-0.985333 1.3240446,-1.784697 2.8683795,-1.784698 z"
-     id="path2881"
-     style="opacity:0.3;fill:url(#radialGradient3330);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 40.246148,42.430102 c 0,0 0,3.569856 0,3.569856 1.1865,0.0067 2.86838,-0.799823 2.86838,-1.785158 0,-0.985333 -1.324045,-1.784697 -2.86838,-1.784698 z"
-     id="path2883"
-     style="opacity:0.3;fill:url(#radialGradient3327);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="m 6.4999609,0.49719878 c 8.0202951,0 16.0405901,0 24.0608861,0 1.406933,0.4746531 8.965454,5.88220462 10.939195,9.62640622 0,11.459733 0,22.919465 0,34.379198 -11.666694,0 -23.333387,0 -35.0000811,0 0,-14.668535 0,-29.33707 0,-44.00560422 z"
-     id="path4160"
-     style="fill:url(#linearGradient3322);fill-opacity:1;stroke:url(#linearGradient3324);stroke-width:0.99992186;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
-  <path
-     d="m 7.3617017,44 c -0.199297,0 -0.361702,-0.175459 -0.361702,-0.39078 l 0,-42.2040499 c 0,-0.2157088 0.162405,-0.3907775 0.361702,-0.3907775 C 14.844793,1.1224073 23.137385,0.85281757 30.611384,1.0412872 L 40.894021,9.9073127 41,43.60922 C 41,43.824541 40.837957,44 40.638297,44 L 7.3617017,44 z"
-     id="path4191"
-     style="fill:url(#radialGradient3319);fill-opacity:1" />
-  <path
-     d="m 40.500039,10.258811 c 0,10.949037 0,22.31441 0,33.263447 -11.000026,0 -22.000052,0 -33.0000781,0 0,-14.014841 0,-28.029681 0,-42.0445213 7.5619931,0 15.3043341,0 22.8663281,0"
-     id="path2435"
-     style="opacity:0.6;fill:none;stroke:url(#linearGradient3316);stroke-width:0.9999218;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" />
-  <path
-     d="m 28.617256,0.92125832 c 4.282522,0 2.15325,8.48317128 2.15325,8.48317128 0,0 10.357642,-1.8023467 10.357642,2.8187444 0,-2.6097233 -11.302304,-10.7285956 -12.510892,-11.30191568 z"
-     id="path12038"
-     style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline;filter:url(#filter3212)" />
-  <path
-     d="m 28.617256,0.92125832 c 3.186493,0 2.33576,7.66187848 2.33576,7.66187848 0,0 10.175132,-0.9810539 10.175132,3.6400372 0,-1.125939 0.08591,-1.932245 -0.133777,-2.2835928 C 39.416058,7.4154025 32.598855,1.7511811 30.137071,1.008793 29.952849,0.95323837 29.544367,0.92125832 28.617256,0.92125832 z"
-     id="path4474"
-     style="fill:url(#linearGradient3312);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-  <g
-     transform="translate(16.000123,16)"
-     id="layer1">
-    <g
-       transform="matrix(0.6905424,0,0,0.6781532,-0.50408884,-0.4485072)"
-       id="g3305"
-       style="opacity:0.4;display:inline">
-      <rect
-         width="2.9601951"
-         height="15.366531"
-         x="-3.6903627"
-         y="-47.848343"
-         transform="scale(-1,-1)"
-         id="rect2484"
-         style="fill:url(#radialGradient2903);fill-opacity:1;stroke:none" />
-      <rect
-         width="40.41172"
-         height="15.366531"
-         x="3.6903627"
-         y="32.481812"
-         id="rect2486"
-         style="fill:url(#linearGradient2905);fill-opacity:1;stroke:none" />
-      <rect
-         width="2.9601951"
-         height="15.366531"
-         x="44.110001"
-         y="-47.848343"
-         transform="scale(1,-1)"
-         id="rect3444"
-         style="fill:url(#radialGradient2983);fill-opacity:1;stroke:none;display:inline" />
-    </g>
-    <path
-       d="m 5.3977176,4.5159458 20.8644634,0 c 1.218003,0 1.766136,-0.198873 2.116,0.694028 l 2.1232,5.2900262 0,18.080594 c 0,1.078035 0.0728,0.913323 -1.145203,0.913323 l -26.712355,0 c -1.2180076,0 -1.1452034,0.164712 -1.1452034,-0.913323 l 0,-18.080594 2.1232007,-5.2900262 c 0.3401041,-0.874865 0.5578898,-0.694028 1.7758973,-0.694028 z"
-       id="path2488"
-       style="fill:url(#linearGradient2895);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2897);stroke-width:0.99420077;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" />
-    <path
-       d="m 6.0608126,5.2189598 19.5595564,0 c 1.141828,0 1.848507,0.38625 2.326758,1.447759 l 1.647317,4.4554642 0,16.062958 c 0,1.013748 -0.579128,1.524144 -1.72096,1.524144 l -23.8603237,0 c -1.1418295,0 -1.6075904,-0.561349 -1.6075904,-1.575099 l 0,-16.012003 1.5941757,-4.5509892 c 0.3188353,-0.822694 0.919235,-1.352234 2.061067,-1.352234 z"
-       id="path2490"
-       style="opacity:0.50549454;fill:none;stroke:url(#linearGradient2892);stroke-width:0.74211526;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible" />
-    <path
-       d="m 14,3.9999998 c 1.333332,0 2.666666,0 4,0 0,3.333333 0,6.6666662 0,10.0000002 -0.393729,0 -0.787459,0 -1.181187,0 -0.403125,0 -0.806249,0 -1.209374,0 -0.324531,0 -0.649058,0 -0.973587,0 -0.211951,0 -0.4239,0 -0.635852,0 0,-3.333334 0,-6.6666672 0,-10.0000002 z"
-       id="rect3326"
-       style="opacity:0.4;fill:url(#linearGradient2889);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       d="m 1.5001181,10.5 28.9997639,0"
-       id="path3273"
-       style="opacity:0.4;fill:none;stroke:url(#linearGradient2886);stroke-width:0.99999994px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-  </g>
-  <path
-     d="m 17.562451,22.488448 12.011552,10.537961 -12.011552,10.485143 0,-5.011552 -9.011552,0 0,-11 9.011552,0 0,-5.011552 z"
-     id="path2624"
-     style="fill:url(#linearGradient2532);fill-opacity:1;fill-rule:nonzero;stroke:#699536;stroke-width:0.97689688;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" />
-  <path
-     d="M 18.562451,24.593836 28.079686,33 l -9.517235,8.363535 0,-3.863535 -9.0000004,0 0,-9 9.0000004,0 0,-3.906164 z"
-     id="path2626"
-     style="opacity:0.35400002;fill:none;stroke:url(#linearGradient2529);stroke-width:1;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" />
-</svg>
diff --git a/icons/archive.svg b/icons/archive.svg
deleted file mode 100644
index b0d16af2..00000000
--- a/icons/archive.svg
+++ /dev/null
@@ -1,631 +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"
-   version="1.1"
-   width="23.999516"
-   height="23.999516"
-   id="svg4449">
-  <defs
-     id="defs4451">
-    <linearGradient
-       id="linearGradient4720">
-      <stop
-         id="stop4722"
-         style="stop-color:#868688;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4724"
-         style="stop-color:#dddede;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4714">
-      <stop
-         id="stop4716"
-         style="stop-color:#b6b6b6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4718"
-         style="stop-color:#4a4a4a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3702-501-757-979">
-      <stop
-         id="stop3091"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop3093"
-         style="stop-color:#181818;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop3095"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3688-464-309-276">
-      <stop
-         id="stop3085"
-         style="stop-color:#181818;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3087"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3688-166-749-49">
-      <stop
-         id="stop3079"
-         style="stop-color:#181818;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3081"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3924-742">
-      <stop
-         id="stop3115"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3117"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.06316455" />
-      <stop
-         id="stop3119"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.95056331" />
-      <stop
-         id="stop3121"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4121-6-7-7-7">
-      <stop
-         id="stop4123-85-8-3-7"
-         style="stop-color:#3f7010;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4125-2-9-6-3"
-         style="stop-color:#84a718;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3242-7-8-3-6-1">
-      <stop
-         id="stop3244-5-5-7-5-7"
-         style="stop-color:#eef87e;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3246-9-0-2-5-5"
-         style="stop-color:#cde34f;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3248-7-5-3-3-3"
-         style="stop-color:#93b723;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop3250-8-9-5-8-8"
-         style="stop-color:#5a7e0d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3518">
-      <stop
-         id="stop3520"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3522"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.02531639" />
-      <stop
-         id="stop3524"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.46737173" />
-      <stop
-         id="stop3526"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0.4813104" />
-      <stop
-         id="stop3528"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="4.9929786"
-       cy="43.5"
-       r="2.5"
-       fx="4.9929786"
-       fy="43.5"
-       id="radialGradient4253"
-       xlink:href="#linearGradient3688-166-749-49"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
-    <radialGradient
-       cx="4.9929786"
-       cy="43.5"
-       r="2.5"
-       fx="4.9929786"
-       fy="43.5"
-       id="radialGradient4255"
-       xlink:href="#linearGradient3688-464-309-276"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
-    <linearGradient
-       x1="25.058096"
-       y1="47.027729"
-       x2="25.058096"
-       y2="39.999443"
-       id="linearGradient4257"
-       xlink:href="#linearGradient3702-501-757-979"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="10.3977"
-       y1="25.410501"
-       x2="41.2967"
-       y2="25.410501"
-       id="linearGradient4280"
-       xlink:href="#linearGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.34727158,-0.32836932,0,20.763007,7.2142)" />
-    <radialGradient
-       cx="64.575233"
-       cy="48.605404"
-       r="31.000002"
-       fx="64.575233"
-       fy="48.605404"
-       id="radialGradient4283"
-       xlink:href="#linearGradient3242-7-8-3-6-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.62753527,-0.5433914,0,38.528243,-31.812413)" />
-    <linearGradient
-       x1="72.421684"
-       y1="124.75623"
-       x2="72.421684"
-       y2="51.244411"
-       id="linearGradient4285"
-       xlink:href="#linearGradient4121-6-7-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13479521,0,0,0.17073282,0.2606697,0.05948628)" />
-    <linearGradient
-       x1="23.99999"
-       y1="4.999989"
-       x2="23.99999"
-       y2="43"
-       id="linearGradient4495"
-       xlink:href="#linearGradient3924-742"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4054054,0,0,0.43243245,2.3931689,8.9987286)" />
-    <linearGradient
-       x1="169.07913"
-       y1="-7.4346271"
-       x2="169.07913"
-       y2="-60.497246"
-       id="linearGradient4867"
-       xlink:href="#linearGradient4720"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37654594,0,0,0.35839049,-53.341652,31.421327)"
-       spreadMethod="pad" />
-    <linearGradient
-       x1="116.84357"
-       y1="2.7247458"
-       x2="116.84357"
-       y2="24.931841"
-       id="linearGradient4869"
-       xlink:href="#linearGradient4714"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8224499,0,0,0.82905873,-91.639441,7.8282814)" />
-    <linearGradient
-       id="linearGradient3924-742-7">
-      <stop
-         id="stop3115-3"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3117-46"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.06316455" />
-      <stop
-         id="stop3119-5"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.95056331" />
-      <stop
-         id="stop3121-5"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="23.99999"
-       y1="11.962924"
-       x2="23.99999"
-       y2="32.555599"
-       id="linearGradient4922"
-       xlink:href="#linearGradient3924-742-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4054054,0,0,0.05405406,2.3931688,9.0798072)" />
-    <linearGradient
-       id="linearGradient4414-1">
-      <stop
-         id="stop4416-6"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4418-6"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.06316455" />
-      <stop
-         id="stop4420-5"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.95056331" />
-      <stop
-         id="stop4422-9"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4720-4-6">
-      <stop
-         id="stop4722-3-7"
-         style="stop-color:#868688;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4724-0-3"
-         style="stop-color:#dddede;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4714-4-8">
-      <stop
-         id="stop4716-1-5"
-         style="stop-color:#b6b6b6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4718-4-3"
-         style="stop-color:#4a4a4a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="23.99999"
-       y1="8.2377691"
-       x2="23.99999"
-       y2="40.224758"
-       id="linearGradient4391-5"
-       xlink:href="#linearGradient4414-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29729732,0,0,0.13513514,4.9877629,22.633823)" />
-    <linearGradient
-       id="linearGradient4414-3">
-      <stop
-         id="stop4416-89"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4418-69"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.06316455" />
-      <stop
-         id="stop4420-2"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.95056331" />
-      <stop
-         id="stop4422-2"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4720-4-2">
-      <stop
-         id="stop4722-3-5"
-         style="stop-color:#868688;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4724-0-1"
-         style="stop-color:#dddede;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4714-4-26">
-      <stop
-         id="stop4716-1-1"
-         style="stop-color:#b6b6b6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4718-4-0"
-         style="stop-color:#4a4a4a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="169.07913"
-       y1="-4.4748607"
-       x2="169.07913"
-       y2="-26.459934"
-       id="linearGradient5067"
-       xlink:href="#linearGradient4720-4-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37654594,0,0,0.35839049,-53.341652,31.421287)"
-       spreadMethod="pad" />
-    <linearGradient
-       x1="119.47528"
-       y1="16.924896"
-       x2="119.47528"
-       y2="26.671993"
-       id="linearGradient5069"
-       xlink:href="#linearGradient4714-4-26"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8224499,0,0,0.82905873,-91.639441,7.8282423)" />
-    <linearGradient
-       x1="169.07913"
-       y1="-4.4748607"
-       x2="169.07913"
-       y2="-26.459934"
-       id="linearGradient5152"
-       xlink:href="#linearGradient4720-4-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37654594,0,0,0.35839049,-53.341652,22.421287)"
-       spreadMethod="pad" />
-    <linearGradient
-       x1="119.47528"
-       y1="16.924896"
-       x2="119.47528"
-       y2="26.671993"
-       id="linearGradient5154"
-       xlink:href="#linearGradient4714-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8224499,0,0,0.82905873,-91.639441,-1.1717584)" />
-    <linearGradient
-       x1="23.99999"
-       y1="8.2377691"
-       x2="23.99999"
-       y2="40.224758"
-       id="linearGradient5156"
-       xlink:href="#linearGradient4414-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29729732,0,0,0.13513514,4.9877629,13.633823)" />
-    <linearGradient
-       x1="10.3977"
-       y1="25.410501"
-       x2="41.2967"
-       y2="25.410501"
-       id="linearGradient3169"
-       xlink:href="#linearGradient3518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.34727158,-0.32836932,0,20.64011,-0.6633887)" />
-    <radialGradient
-       cx="64.575233"
-       cy="48.605404"
-       r="31.000002"
-       fx="64.575233"
-       fy="48.605404"
-       id="radialGradient3172"
-       xlink:href="#linearGradient3242-7-8-3-6-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.62753527,-0.5433914,0,38.405346,-39.690002)" />
-    <linearGradient
-       x1="72.421684"
-       y1="124.75623"
-       x2="72.421684"
-       y2="51.244411"
-       id="linearGradient3174"
-       xlink:href="#linearGradient4121-6-7-7-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13479521,0,0,0.17073282,0.13777286,-7.8181024)" />
-    <linearGradient
-       x1="23.99999"
-       y1="8.2377691"
-       x2="23.99999"
-       y2="40.224758"
-       id="linearGradient3179"
-       xlink:href="#linearGradient4414-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29729732,0,0,0.13513514,4.8648661,5.7562343)" />
-    <linearGradient
-       x1="169.07913"
-       y1="-4.4748607"
-       x2="169.07913"
-       y2="-26.459934"
-       id="linearGradient3182"
-       xlink:href="#linearGradient4720-4-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37654594,0,0,0.35839049,-53.464549,14.543698)"
-       spreadMethod="pad" />
-    <linearGradient
-       x1="119.47528"
-       y1="16.924896"
-       x2="119.47528"
-       y2="26.671993"
-       id="linearGradient3184"
-       xlink:href="#linearGradient4714-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8224499,0,0,0.82905873,-91.762338,-9.0493471)" />
-    <linearGradient
-       x1="23.99999"
-       y1="8.2377691"
-       x2="23.99999"
-       y2="40.224758"
-       id="linearGradient3189"
-       xlink:href="#linearGradient4414-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.29729732,0,0,0.13513514,4.8648661,14.756234)" />
-    <linearGradient
-       x1="169.07913"
-       y1="-4.4748607"
-       x2="169.07913"
-       y2="-26.459934"
-       id="linearGradient3192"
-       xlink:href="#linearGradient4720-4-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37654594,0,0,0.35839049,-53.464549,23.543698)"
-       spreadMethod="pad" />
-    <linearGradient
-       x1="119.47528"
-       y1="16.924896"
-       x2="119.47528"
-       y2="26.671993"
-       id="linearGradient3194"
-       xlink:href="#linearGradient4714-4-26"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8224499,0,0,0.82905873,-91.762338,-0.0493464)" />
-    <linearGradient
-       x1="23.99999"
-       y1="11.962924"
-       x2="23.99999"
-       y2="32.555599"
-       id="linearGradient3198"
-       xlink:href="#linearGradient3924-742-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4054054,0,0,0.05405406,2.270272,1.2022185)" />
-    <linearGradient
-       x1="23.99999"
-       y1="4.999989"
-       x2="23.99999"
-       y2="43"
-       id="linearGradient3201"
-       xlink:href="#linearGradient3924-742"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4054054,0,0,0.43243245,2.2702721,1.1211399)" />
-    <linearGradient
-       x1="169.07913"
-       y1="-7.4346271"
-       x2="169.07913"
-       y2="-60.497246"
-       id="linearGradient3204"
-       xlink:href="#linearGradient4720"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.37654594,0,0,0.35839049,-53.464549,23.543738)"
-       spreadMethod="pad" />
-    <linearGradient
-       x1="116.84357"
-       y1="2.7247458"
-       x2="116.84357"
-       y2="24.931841"
-       id="linearGradient3206"
-       xlink:href="#linearGradient4714"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8224499,0,0,0.82905873,-91.762338,-0.0493073)" />
-  </defs>
-  <metadata
-     id="metadata4454">
-    <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
-     transform="matrix(0.55,0,0,0.3333336,-1.2002477,6.3328463)"
-     id="g2036"
-     style="display:inline">
-    <g
-       transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
-       id="g3712"
-       style="opacity:0.4">
-      <rect
-         width="5"
-         height="7"
-         x="38"
-         y="40"
-         id="rect2801"
-         style="fill:url(#radialGradient4253);fill-opacity:1;stroke:none" />
-      <rect
-         width="5"
-         height="7"
-         x="-10"
-         y="-47"
-         transform="scale(-1,-1)"
-         id="rect3696"
-         style="fill:url(#radialGradient4255);fill-opacity:1;stroke:none" />
-      <rect
-         width="28"
-         height="7.0000005"
-         x="10"
-         y="40"
-         id="rect3700"
-         style="fill:url(#linearGradient4257);fill-opacity:1;stroke:none" />
-    </g>
-  </g>
-  <path
-     d="m 5.5,0.4995155 13,0 c 0,0 1.529481,2.1020798 1.688724,2.2767408 0.290691,0.318837 0.363834,0.855532 0.311311,1.299076 0,5.141401 0,10.2828027 0,15.4242037 0.02041,0.861532 -0.889275,1.081295 -1.575796,1 -4.808093,0 -9.6161853,0 -14.424278,0 -0.8615321,0.02041 -1.0812954,-0.889275 -1,-1.575796 0,-5.141402 0,-10.2828027 0,-15.4242037 -0.00686,-0.283932 0.1225177,-0.550533 0.3253643,-0.736983 z"
-     id="rect5505-21"
-     style="color:#000000;fill:url(#linearGradient3204);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3206);stroke-width:0.99999994;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" />
-  <rect
-     width="15"
-     height="16"
-     x="4.5"
-     y="3.499516"
-     id="rect6741-9"
-     style="opacity:0.5;fill:none;stroke:url(#linearGradient3201);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-  <path
-     d="m 6.0995932,1.4995151 11.7537668,0 L 19.5,3.4995153 c -5,0 -10.0000001,0 -15.0000001,0 z"
-     id="rect6741-9-5"
-     style="opacity:0.5;fill:none;stroke:url(#linearGradient3198);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-  <path
-     d="m 5.2720568,13.499515 13.4554022,0"
-     id="path4846"
-     style="opacity:0.1;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  <rect
-     width="13.000078"
-     height="7.0000782"
-     rx="1"
-     ry="0.99999994"
-     x="5.4999614"
-     y="14.499437"
-     id="rect5505-21-0"
-     style="color:#000000;fill:url(#linearGradient3192);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3194);stroke-width:0.99999994;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" />
-  <rect
-     width="11"
-     height="5"
-     x="6.5"
-     y="15.499475"
-     id="rect6741-9-1"
-     style="opacity:0.5;fill:none;stroke:url(#linearGradient3189);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-  <path
-     d="m 9.4999999,16.499475 0,2 5.0000001,0 0,-2"
-     id="path4924-7"
-     style="fill:none;stroke:#848484;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <path
-     d="m 9.4999999,16.999475 0,1.5 5.0000001,0 0,-1.5"
-     id="path4924"
-     style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  <rect
-     width="13.000078"
-     height="7.0000782"
-     rx="1"
-     ry="0.99999994"
-     x="5.4999614"
-     y="5.4994369"
-     id="rect5505-21-0-2"
-     style="color:#000000;fill:url(#linearGradient3182);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3184);stroke-width:0.99999994;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" />
-  <rect
-     width="11"
-     height="5"
-     x="6.5"
-     y="6.499475"
-     id="rect6741-9-1-7"
-     style="opacity:0.5;fill:none;stroke:url(#linearGradient3179);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-  <path
-     d="m 9.4999998,7.4994753 0,2 5.0000002,0 0,-2"
-     id="path4924-7-6"
-     style="fill:none;stroke:#848484;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <path
-     d="m 9.4999998,7.9994753 0,1.5 5.0000002,0 0,-1.5"
-     id="path4924-5"
-     style="fill:none;stroke:#cccccc;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-</svg>
diff --git a/src/client/geary-controller.vala b/src/client/geary-controller.vala
index d3c23b49..c96308e9 100644
--- a/src/client/geary-controller.vala
+++ b/src/client/geary-controller.vala
@@ -63,7 +63,7 @@ public class GearyController {
     
     private const string ARCHIVE_MESSAGE_LABEL = _("_Archive");
     private const string ARCHIVE_MESSAGE_TOOLTIP = _("Archive the selected conversation");
-    private const string ARCHIVE_MESSAGE_ICON_NAME = "archive-insert";
+    private const string ARCHIVE_MESSAGE_ICON_NAME = "mail-archive";
     
     public MainWindow main_window { get; private set; }
     
diff --git a/src/client/models/folder-list.vala b/src/client/models/folder-list.vala
index c331567a..1a902461 100644
--- a/src/client/models/folder-list.vala
+++ b/src/client/models/folder-list.vala
@@ -52,7 +52,7 @@ public class FolderList : Sidebar.Tree {
                     return new ThemedIcon("starred");
                 
                 case Geary.SpecialFolderType.ALL_MAIL:
-                    return new ThemedIcon("archive");
+                    return IconFactory.instance.get_custom_icon("mail-archive", IconFactory.ICON_SIDEBAR);
                 
                 case Geary.SpecialFolderType.SPAM:
                     return new ThemedIcon("mail-mark-junk");