[evolution/tintou/preferences-headerbar] M!82 - EPreferencesWindow: Use headerbar and stack widgets




commit efd6f5810f6aecaba9b7686ea69ddffe5f149e97
Author: Corentin Noël <corentin noel collabora com>
Date:   Thu Jul 1 10:38:29 2021 +0200

    M!82 - EPreferencesWindow: Use headerbar and stack widgets
    
    Switch to a Headerbar and a StackSidebar widget for navigation, place all the
    buttons directly in the headerbar.
    
    Closes https://gitlab.gnome.org/GNOME/evolution/-/merge_requests/82

 data/icons/CMakeLists.txt                          |    7 +
 ...gories_24x24_preferences-calendar-and-tasks.svg |  659 +++++++++
 ...r_categories_24x24_preferences-certificates.svg |  468 ++++++
 ...color_categories_24x24_preferences-composer.svg |  756 ++++++++++
 ...icolor_categories_24x24_preferences-contact.svg |  610 ++++++++
 ..._categories_24x24_preferences-mail-accounts.svg |  543 +++++++
 .../hicolor_categories_24x24_preferences-mail.svg  |  431 ++++++
 ...ries_24x24_preferences-system-network-proxy.svg | 1513 ++++++++++++++++++++
 src/e-util/e-preferences-window.c                  |  606 +++-----
 src/e-util/e-preferences-window.h                  |    2 +
 src/modules/addressbook/e-book-shell-backend.c     |    2 +-
 src/modules/mail/e-mail-shell-backend.c            |    1 +
 src/modules/mail/em-account-prefs.c                |    3 +-
 13 files changed, 5217 insertions(+), 384 deletions(-)
---
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index 60235cf637..f60017b5e2 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -97,6 +97,13 @@ set(private_icons
        hicolor_actions_scalable_view-calendar-month.svg
        hicolor_actions_scalable_view-calendar-week.svg
        hicolor_actions_scalable_view-calendar-workweek.svg
+       hicolor_categories_24x24_preferences-calendar-and-tasks.svg
+       hicolor_categories_24x24_preferences-certificates.svg
+       hicolor_categories_24x24_preferences-composer.svg
+       hicolor_categories_24x24_preferences-contact.svg
+       hicolor_categories_24x24_preferences-mail.svg
+       hicolor_categories_24x24_preferences-mail-accounts.svg
+       hicolor_categories_24x24_preferences-system-network-proxy.svg
        hicolor_categories_48x48_preferences-autocompletion.png
        hicolor_categories_48x48_preferences-calendar-and-tasks.png
        hicolor_categories_48x48_preferences-certificates.png
diff --git a/data/icons/hicolor_categories_24x24_preferences-calendar-and-tasks.svg 
b/data/icons/hicolor_categories_24x24_preferences-calendar-and-tasks.svg
new file mode 100644
index 0000000000..62b2350be4
--- /dev/null
+++ b/data/icons/hicolor_categories_24x24_preferences-calendar-and-tasks.svg
@@ -0,0 +1,659 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg1580"
+   sodipodi:docname="hicolor_categories_24x24_preferences-calendar-and-tasks.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:svg="http://www.w3.org/2000/svg";>
+  <sodipodi:namedview
+     id="namedview77"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="5.980945"
+     inkscape:cx="38.706258"
+     inkscape:cy="29.343189"
+     inkscape:window-width="1600"
+     inkscape:window-height="869"
+     inkscape:window-x="40"
+     inkscape:window-y="1050"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g32" />
+  <defs
+     id="defs1577">
+    <radialGradient
+       cx="11.092737"
+       cy="18.597048"
+       fx="11.092737"
+       fy="18.597048"
+       gradientTransform="matrix(1,0,0,0.2469636,0,14.004255)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11811"
+       r="10.915961"
+       xlink:href="#linearGradient7440" />
+    <linearGradient
+       id="linearGradient7440">
+      <stop
+         id="stop7442"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7444"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11813"
+       x1="35.310661"
+       x2="33.536613"
+       xlink:href="#linearGradient6964"
+       y1="16.222532"
+       y2="4.7902908" />
+    <linearGradient
+       id="linearGradient6964">
+      <stop
+         id="stop6966"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+      <stop
+         id="stop6968"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30,1)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11815"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient7440"
+       y1="4.7506509"
+       y2="1.75" />
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11817"
+       x1="38"
+       x2="38"
+       xlink:href="#linearGradient8718"
+       y1="9.7488794"
+       y2="11.492249" />
+    <linearGradient
+       id="linearGradient8718">
+      <stop
+         id="stop8720"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+      <stop
+         id="stop8722"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11819"
+       x1="41.96875"
+       x2="41.96875"
+       xlink:href="#linearGradient6934"
+       y1="6.7255816"
+       y2="12.34375" />
+    <linearGradient
+       id="linearGradient6934">
+      <stop
+         id="stop6936"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop6938"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11821"
+       x1="36.21875"
+       x2="36.96875"
+       xlink:href="#linearGradient7013"
+       y1="9.71875"
+       y2="11.688599" />
+    <linearGradient
+       id="linearGradient7013">
+      <stop
+         id="stop7015"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7017"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11823"
+       x1="42.8125"
+       x2="41"
+       xlink:href="#linearGradient6981"
+       y1="6"
+       y2="-0.12500003" />
+    <linearGradient
+       id="linearGradient6981">
+      <stop
+         id="stop6983"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6985"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11825"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient6926"
+       y1="4.75"
+       y2="1.4357522" />
+    <linearGradient
+       id="linearGradient6926">
+      <stop
+         id="stop6928"
+         offset="0"
+         style="stop-color:#a3a5a1;stop-opacity:1;" />
+      <stop
+         id="stop6930"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11827"
+       x1="37.21875"
+       x2="37.21875"
+       xlink:href="#linearGradient7013"
+       y1="4.65625"
+       y2="0.96384674" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11829"
+       x1="49.5"
+       x2="49.5"
+       xlink:href="#linearGradient7013"
+       y1="6.0625"
+       y2="0.18749996" />
+    <linearGradient
+       id="linearGradient7134">
+      <stop
+         id="stop7136"
+         offset="0"
+         style="stop-color:#f0f0ee;stop-opacity:1" />
+      <stop
+         id="stop7138"
+         offset="1"
+         style="stop-color:#a1a196;stop-opacity:1" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5046">
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.46707526"
+         inkscape:original="M 716.96875 181.4375 C 714.46819 181.4375 712.43749 183.48912 712.4375 186 C 
712.4375 187.41668 713.11279 188.66556 714.125 189.5 C 711.94045 190.29751 710.40625 191.96761 710.40625 
193.90625 C 710.40624 194.88 710.78135 195.79899 711.4375 196.5625 L 722.53125 196.5625 C 723.18737 195.79899 
723.5625 194.88 723.5625 193.90625 C 723.5625 191.96761 722.0283 190.29751 719.84375 189.5 C 720.85066 
188.66548 721.5 187.41238 721.5 186 C 721.5 183.48911 719.46934 181.4375 716.96875 181.4375 z "
+         
style="display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.902582;marker:none;enable-background:accumulate"
+         id="path5048"
+         transform="translate(-6,-3)" />
+    </clipPath>
+    <linearGradient
+       id="linearGradient9590">
+      <stop
+         id="stop9592"
+         offset="0"
+         style="stop-color:#bfbfbf;stop-opacity:1;" />
+      <stop
+         id="stop9594"
+         offset="1"
+         style="stop-color:#f8f8f8;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5635">
+      <stop
+         id="stop5637"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5639"
+         offset="1"
+         style="stop-color:#ededed;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3384">
+      <stop
+         id="stop3386"
+         offset="0"
+         style="stop-color:white;stop-opacity:1" />
+      <stop
+         id="stop3388"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3269">
+      <stop
+         id="stop3271"
+         offset="0"
+         style="stop-color:#fecb81;stop-opacity:1" />
+      <stop
+         id="stop3273"
+         offset="1"
+         style="stop-color:#fcaf3e;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7403">
+      <stop
+         id="stop7405"
+         offset="0"
+         style="stop-color:#e9b96e;stop-opacity:1;" />
+      <stop
+         id="stop7407"
+         offset="1"
+         style="stop-color:#c17d11;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4537">
+      <stop
+         id="stop6075"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6073"
+         offset="1"
+         style="stop-color:#e6e6e6;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5772-1">
+      <stop
+         id="stop5774-8"
+         offset="0"
+         style="stop-color:#e2b369;stop-opacity:1" />
+      <stop
+         id="stop5776-7"
+         offset="1"
+         style="stop-color:#c79b55;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3-paper-sheet-orig-08-1-7-9-4-5-4-8-5">
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 1;"
+         offset="0"
+         id="stop6-paper-sheet-orig-1-0-9-5-1-7-5-9-9" />
+      <stop
+         style="stop-color: rgb(211, 215, 207); stop-opacity: 1;"
+         offset="1"
+         id="stop7-paper-sheet-orig-2-0-1-5-7-0-3-8-3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3881-2-4-1">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop3883-6-8-8" />
+      <stop
+         id="stop3895-6-7-4"
+         offset="0.13349205"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+      <stop
+         id="stop3891-1-9-4"
+         offset="0.53102833"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0.78738999"
+         id="stop3893-0-9-8" />
+      <stop
+         style="stop-color:#9c988a;stop-opacity:1;"
+         offset="1"
+         id="stop3885-35-2-2" />
+    </linearGradient>
+    <radialGradient
+       cx="3"
+       cy="43"
+       fx="3"
+       fy="43"
+       gradientTransform="matrix(2,0,0,2,-13,-129)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7492"
+       inkscape:collect="always"
+       r="2"
+       xlink:href="#linearGradient7440" />
+    <radialGradient
+       cx="3"
+       cy="43"
+       fx="3"
+       fy="43"
+       gradientTransform="matrix(2,0,0,2,35,-43)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7494"
+       inkscape:collect="always"
+       r="2"
+       xlink:href="#linearGradient7440" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7496"
+       inkscape:collect="always"
+       x1="11.507806"
+       x2="11.507806"
+       xlink:href="#linearGradient3428"
+       y1="39"
+       y2="47.015659" />
+    <linearGradient
+       id="linearGradient3428">
+      <stop
+         id="stop3430"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop3436"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3432"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7409"
+       inkscape:collect="always"
+       x1="18.384777"
+       x2="-7.20365"
+       xlink:href="#linearGradient7403"
+       y1="24.651651"
+       y2="-13.266952" />
+    <linearGradient
+       gradientTransform="matrix(0.459865,0,0,0.6334093,-0.266651,-3.0045023)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2309"
+       inkscape:collect="always"
+       x1="37.270947"
+       x2="31.705347"
+       xlink:href="#linearGradient4537"
+       y1="27.272932"
+       y2="18.099077" />
+    <linearGradient
+       gradientTransform="matrix(0.300009,0,0,0.287194,6.6728037,4.446934)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2301"
+       inkscape:collect="always"
+       x1="35.996582"
+       x2="33.664921"
+       xlink:href="#linearGradient2224"
+       y1="40.458221"
+       y2="37.770721" />
+    <linearGradient
+       id="linearGradient2224">
+      <stop
+         id="stop2226"
+         offset="0"
+         style="stop-color:#7c7c7c;stop-opacity:1;" />
+      <stop
+         id="stop2228"
+         offset="1"
+         style="stop-color:#b8b8b8;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.26971,0,0,0.254566,8.0206737,5.771734)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2298"
+       inkscape:collect="always"
+       x1="33.396004"
+       x2="34.170048"
+       xlink:href="#linearGradient7013"
+       y1="36.921333"
+       y2="38.070381" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7425"
+       inkscape:collect="always"
+       x1="3.125"
+       x2="14.3125"
+       xlink:href="#linearGradient7013"
+       y1="2.3125"
+       y2="31.1875" />
+    <radialGradient
+       cx="8.5"
+       cy="3.5073366"
+       fx="8.5"
+       fy="3.5073366"
+       gradientTransform="matrix(2.5003472,0,0,2.3333334,-13.752951,-5.4817709)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7504"
+       inkscape:collect="always"
+       r="1.5"
+       xlink:href="#linearGradient7498" />
+    <linearGradient
+       id="linearGradient7498"
+       inkscape:collect="always">
+      <stop
+         id="stop7500"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7502"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       cx="8.5"
+       cy="3.5073366"
+       fx="8.5"
+       fy="3.5073366"
+       gradientTransform="matrix(2.5003472,0,0,2.3333334,-6.752951,-5.4817709)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7508"
+       inkscape:collect="always"
+       r="1.5"
+       xlink:href="#linearGradient7498" />
+    <radialGradient
+       cx="13"
+       cy="2.5"
+       fx="13"
+       fy="2.5"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7526"
+       inkscape:collect="always"
+       r="0.5"
+       xlink:href="#linearGradient7013" />
+    <radialGradient
+       cx="13"
+       cy="2.5"
+       fx="13"
+       fy="2.5"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7530"
+       inkscape:collect="always"
+       r="0.5"
+       xlink:href="#linearGradient7013" />
+  </defs>
+  <g
+     id="g32"
+     style="display:inline;enable-background:new"
+     transform="matrix(0.26458334,0,0,0.26458334,-1.3205092,-0.81649318)">
+    <g
+       transform="translate(-266.5523,-210.86997)"
+       style="display:inline;enable-background:new"
+       id="g5703" />
+    <g
+       id="g22"
+       style="display:inline;enable-background:new"
+       transform="translate(5.9922399,4.0859582)">
+      <g
+         id="g233"
+         transform="matrix(1,0,0,0.9324156,-1,1.0675844)" />
+      <g
+         id="g7484"
+         style="display:inline;opacity:0.567164"
+         transform="matrix(0.5238733,0,0,0.5,-1.5742985,-1.5)">
+        <rect
+           height="8"
+           id="rect7486"
+           
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient7492);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           transform="scale(-1)"
+           width="4"
+           x="-7"
+           y="-47" />
+        <rect
+           height="8"
+           id="rect7488"
+           
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient7494);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           width="4"
+           x="41"
+           y="39" />
+        <rect
+           height="8"
+           id="rect7490"
+           
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7496);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:6;stroke-dasharray:none;stroke-dashoffset:1.4;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           width="34"
+           x="7"
+           y="39" />
+      </g>
+      <path
+         d="M 2.3285246,2.5 H 19.671475 C 20.130478,2.5 20.5,2.869522 20.5,3.3285246 V 19.671475 C 
20.5,20.130478 20.130478,20.5 19.671475,20.5 H 2.3285246 C 1.869522,20.5 1.5,20.130478 1.5,19.671475 V 
3.3285246 C 1.5,2.869522 1.869522,2.5 2.3285246,2.5 Z"
+         id="rect7401"
+         sodipodi:nodetypes="ccccccccc"
+         
style="fill:url(#linearGradient7409);fill-opacity:1;fill-rule:evenodd;stroke:#8f5902;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.992366"
 />
+      <path
+         d="m 3.5,4.5000002 h 15 V 18.540001 h -15 z"
+         id="path3660"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         sodipodi:nodetypes="ccccc"
+         
style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient2309);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
 />
+      <path
+         d="m 4.5,5.5 h 13 v 11 h -13 z"
+         id="path4545"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         sodipodi:nodetypes="ccccc"
+         
style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
 />
+      <path
+         d="M 18,17 V 14.5 L 15.5,17 Z"
+         id="path6077"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         sodipodi:nodetypes="cccc"
+         
style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.208791;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
 />
+      <path
+         d="m 15.5,16.5 c 0.952081,0.06001 3.175794,-0.904175 2.976182,-2.391022 -0.468995,0.695895 
-1.427598,0.334814 -2.660262,0.380478 0,0 0.09028,1.797488 -0.31592,2.010544 z"
+         id="path5275"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         sodipodi:nodetypes="cccc"
+         
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient2301);fill-opacity:1;fill-rule:evenodd;stroke:#868a84;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
 />
+      <path
+         d="m 16.519117,16.129281 c 0.369441,-0.17408 1.194342,-0.546418 1.544801,-1.025258 
-0.446713,0.09616 -0.778828,0.02255 -1.521755,0.01769 0,0 0.02756,0.810287 -0.02305,1.007569 z"
+         id="path5277"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         sodipodi:nodetypes="cccc"
+         
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.369318;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2298);stroke-width:0.999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
 />
+      <rect
+         height="1"
+         id="rect7397"
+         
style="opacity:1;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.992366"
+         width="14"
+         x="4"
+         y="17" />
+      <path
+         d="m 2.5,3.5 v 16 h 17 v -16 z"
+         id="path7415"
+         sodipodi:nodetypes="ccccc"
+         
style="display:inline;opacity:0.287313;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7425);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.992366"
 />
+      <ellipse
+         id="path7510"
+         
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.1547;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.992366"
+         transform="matrix(0.75,0,0,1,1.125,0)"
+         cx="8.5"
+         cy="7"
+         rx="2"
+         ry="1.5" />
+      <rect
+         height="7"
+         id="rect7427"
+         rx="0.82852459"
+         ry="0.82852459"
+         
style="opacity:1;fill:url(#radialGradient7504);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.992366"
+         width="2"
+         x="6.5"
+         y="0.5" />
+      <path
+         d="m 11.460732,11.851457 c 0.383774,0.08205 0.682856,0.252767 0.897246,0.512145 0.217028,0.259383 
0.325545,0.579639 0.325549,0.960768 -4e-6,0.584931 -0.201157,1.249264 -0.603457,1.569519 -0.402309,0.320256 
-0.974005,0.480384 -1.71509,0.480384 -0.248796,0 -0.5055299,-0.02514 -0.7702025,-0.07543 C 9.3327487,15.2512 
9.0614577,15.178414 8.7809038,15.080485 v -0.774173 c 0.2223256,0.129692 0.4658258,0.227621 
0.7305012,0.293789 0.2646728,0.06617 0.541257,0.09925 0.829754,0.09925 0.502879,0 0.885333,-0.09925 
1.147364,-0.297759 0.26467,-0.198505 0.397007,-0.698739 0.397011,-1.077225 -4e-6,-0.349368 
-0.123077,-0.621982 -0.369221,-0.817844 -0.243503,-0.1985 -0.583609,-0.297753 -1.020319,-0.297756 H 9.8051936 
v -0.659039 h 0.7225614 c 0.394362,4e-6 0.69609,-0.07808 0.905186,-0.234237 0.209089,-0.1588 
0.313635,-0.17468 0.313639,-0.471119 -4e-6,-0.304371 -0.10852,-0.537284 -0.325549,-0.698741 
-0.21439,-0.1640925 -0.522735,-0.2461415 -0.925037,-0.2461468 -0.219682,5.3e-6 -0.455242,0.0238
 26 -0.7066809,0.071462 C 9.5378711,10.018593 9.2612867,10.092702 8.959559,10.193273 V 9.4786519 c 
0.3043744,-0.08469 0.5888991,-0.1482117 0.8535748,-0.1905655 0.2673192,-0.042342 0.5187592,-0.063516 
0.7543222,-0.063522 0.608748,6.1e-6 1.090455,0.13896 1.445122,0.4168622 0.354659,0.2752666 0.531991,0.6484574 
0.531995,1.1195724 -4e-6,0.328201 -0.09396,0.394368 -0.281878,0.621984 -0.187923,0.224977 -0.455244,0.381135 
-0.801963,0.468474"
+         id="text7433"
+         sodipodi:nodetypes="csssssccsssssccccsssssccsssssc"
+         style="font-style:normal;font-weight:normal;font-size:8.1308px;font-family:'Bitstream Vera 
Sans';fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         transform="scale(1.0249515,0.9756559)" />
+      <ellipse
+         id="path7512"
+         
style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.1547;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.992366"
+         transform="matrix(0.75,0,0,1,8.125,0)"
+         cx="8.5"
+         cy="7"
+         rx="2"
+         ry="1.5" />
+      <rect
+         height="7"
+         id="rect7506"
+         rx="0.82852459"
+         ry="0.82852459"
+         
style="display:inline;opacity:1;fill:url(#radialGradient7508);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.992366"
+         width="2"
+         x="13.5"
+         y="0.5" />
+      <circle
+         id="path7514"
+         
style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.992366"
+         transform="translate(1)"
+         cx="13"
+         cy="2.5"
+         r="0.5" />
+      <circle
+         id="path7516"
+         
style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.992366"
+         transform="translate(-6)"
+         cx="13"
+         cy="2.5"
+         r="0.5" />
+      <circle
+         id="path7518"
+         
style="display:inline;opacity:0.600746;fill:url(#radialGradient7526);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.992366"
+         transform="matrix(3,0,0,4,-24.5,-7)"
+         cx="13"
+         cy="2.5"
+         r="0.5" />
+      <circle
+         id="path7528"
+         
style="display:inline;opacity:0.600746;fill:url(#radialGradient7530);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.992366"
+         transform="matrix(3,0,0,4,-31.5,-7)"
+         cx="13"
+         cy="2.5"
+         r="0.5" />
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/hicolor_categories_24x24_preferences-certificates.svg 
b/data/icons/hicolor_categories_24x24_preferences-certificates.svg
new file mode 100644
index 0000000000..e7492990c1
--- /dev/null
+++ b/data/icons/hicolor_categories_24x24_preferences-certificates.svg
@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg1580"
+   sodipodi:docname="hicolor_categories_24x24_preferences-certificates.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:svg="http://www.w3.org/2000/svg";>
+  <sodipodi:namedview
+     id="namedview77"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="11.96189"
+     inkscape:cx="-2.0481713"
+     inkscape:cy="17.095961"
+     inkscape:window-width="1680"
+     inkscape:window-height="989"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1580" />
+  <defs
+     id="defs1577">
+    <radialGradient
+       cx="11.092737"
+       cy="18.597048"
+       fx="11.092737"
+       fy="18.597048"
+       gradientTransform="matrix(1,0,0,0.2469636,0,14.004255)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11811"
+       r="10.915961"
+       xlink:href="#linearGradient7440" />
+    <linearGradient
+       id="linearGradient7440">
+      <stop
+         id="stop7442"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7444"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11813"
+       x1="35.310661"
+       x2="33.536613"
+       xlink:href="#linearGradient6964"
+       y1="16.222532"
+       y2="4.7902908" />
+    <linearGradient
+       id="linearGradient6964">
+      <stop
+         id="stop6966"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+      <stop
+         id="stop6968"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30,1)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11815"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient7440"
+       y1="4.7506509"
+       y2="1.75" />
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11817"
+       x1="38"
+       x2="38"
+       xlink:href="#linearGradient8718"
+       y1="9.7488794"
+       y2="11.492249" />
+    <linearGradient
+       id="linearGradient8718">
+      <stop
+         id="stop8720"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+      <stop
+         id="stop8722"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11819"
+       x1="41.96875"
+       x2="41.96875"
+       xlink:href="#linearGradient6934"
+       y1="6.7255816"
+       y2="12.34375" />
+    <linearGradient
+       id="linearGradient6934">
+      <stop
+         id="stop6936"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop6938"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11821"
+       x1="36.21875"
+       x2="36.96875"
+       xlink:href="#linearGradient7013"
+       y1="9.71875"
+       y2="11.688599" />
+    <linearGradient
+       id="linearGradient7013">
+      <stop
+         id="stop7015"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7017"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11823"
+       x1="42.8125"
+       x2="41"
+       xlink:href="#linearGradient6981"
+       y1="6"
+       y2="-0.12500003" />
+    <linearGradient
+       id="linearGradient6981">
+      <stop
+         id="stop6983"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6985"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11825"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient6926"
+       y1="4.75"
+       y2="1.4357522" />
+    <linearGradient
+       id="linearGradient6926">
+      <stop
+         id="stop6928"
+         offset="0"
+         style="stop-color:#a3a5a1;stop-opacity:1;" />
+      <stop
+         id="stop6930"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11827"
+       x1="37.21875"
+       x2="37.21875"
+       xlink:href="#linearGradient7013"
+       y1="4.65625"
+       y2="0.96384674" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11829"
+       x1="49.5"
+       x2="49.5"
+       xlink:href="#linearGradient7013"
+       y1="6.0625"
+       y2="0.18749996" />
+    <linearGradient
+       id="linearGradient7134">
+      <stop
+         id="stop7136"
+         offset="0"
+         style="stop-color:#f0f0ee;stop-opacity:1" />
+      <stop
+         id="stop7138"
+         offset="1"
+         style="stop-color:#a1a196;stop-opacity:1" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5046">
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.46707526"
+         inkscape:original="M 716.96875 181.4375 C 714.46819 181.4375 712.43749 183.48912 712.4375 186 C 
712.4375 187.41668 713.11279 188.66556 714.125 189.5 C 711.94045 190.29751 710.40625 191.96761 710.40625 
193.90625 C 710.40624 194.88 710.78135 195.79899 711.4375 196.5625 L 722.53125 196.5625 C 723.18737 195.79899 
723.5625 194.88 723.5625 193.90625 C 723.5625 191.96761 722.0283 190.29751 719.84375 189.5 C 720.85066 
188.66548 721.5 187.41238 721.5 186 C 721.5 183.48911 719.46934 181.4375 716.96875 181.4375 z "
+         
style="display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.902582;marker:none;enable-background:accumulate"
+         id="path5048"
+         transform="translate(-6,-3)" />
+    </clipPath>
+    <linearGradient
+       gradientTransform="matrix(0.09125781,0,0,0.09374382,69.688,218.6482)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1356"
+       inkscape:collect="always"
+       x1="-543.28723"
+       x2="-500.66992"
+       xlink:href="#linearGradient9590"
+       y1="-2279.0508"
+       y2="-1917.6714" />
+    <linearGradient
+       id="linearGradient9590">
+      <stop
+         id="stop9592"
+         offset="0"
+         style="stop-color:#bfbfbf;stop-opacity:1;" />
+      <stop
+         id="stop9594"
+         offset="1"
+         style="stop-color:#f8f8f8;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5590"
+       inkscape:collect="always"
+       x1="25.980804"
+       x2="26.085234"
+       xlink:href="#linearGradient7013"
+       y1="2.4864533"
+       y2="42.614761" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5641"
+       inkscape:collect="always"
+       x1="22.5"
+       x2="20.75"
+       xlink:href="#linearGradient5635"
+       y1="23"
+       y2="3.5" />
+    <linearGradient
+       id="linearGradient5635">
+      <stop
+         id="stop5637"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5639"
+         offset="1"
+         style="stop-color:#ededed;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5721"
+       inkscape:collect="always"
+       x1="-2093.4902"
+       x2="-2047.13"
+       xlink:href="#linearGradient5715"
+       y1="-1592.3221"
+       y2="-1400.3396" />
+    <linearGradient
+       id="linearGradient5715"
+       inkscape:collect="always">
+      <stop
+         id="stop5717"
+         offset="0"
+         style="stop-color:#fdcd12;stop-opacity:1;" />
+      <stop
+         id="stop5719"
+         offset="1"
+         style="stop-color:#bd9600;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="g22"
+     style="display:inline;enable-background:new"
+     transform="matrix(0.26458334,0,0,0.26458334,0.10193648,0.45853301)">
+    <g
+       id="g124"
+       inkscape:r_cx="true"
+       inkscape:r_cy="true"
+       style="opacity:0.714286"
+       transform="matrix(0.482224,0,0,0.2568323,-76.223594,40.835252)">
+      <path
+         d="m 162.36286,-88.911137 c -2.24456,0 -4.05156,2.200132 -4.05156,4.933031 0,2.732899 
1.807,4.933031 4.05156,4.933031 h 37.27432 c 2.24456,0 4.05155,-2.200132 4.05155,-4.933031 0,-2.732899 
-1.80699,-4.933031 -4.05155,-4.933031 z"
+         id="path126"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="opacity:0.0478723;fill-rule:evenodd;stroke-width:3pt" />
+      <path
+         d="m 162.36286,-88.582269 c -2.09492,0 -3.78145,2.053457 -3.78145,4.604163 0,2.550706 
1.68653,4.604162 3.78145,4.604162 h 37.27432 c 2.09492,0 3.78145,-2.053456 3.78145,-4.604162 0,-2.550706 
-1.68653,-4.604163 -3.78145,-4.604163 z"
+         id="path128"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="opacity:0.0478723;fill-rule:evenodd;stroke-width:3pt" />
+      <path
+         d="m 162.36286,-88.2534 c -1.94529,0 -3.51135,1.906781 -3.51135,4.275294 0,2.368513 
1.56606,4.275294 3.51135,4.275294 h 37.27432 c 1.94528,0 3.51135,-1.906781 3.51135,-4.275294 0,-2.368513 
-1.56607,-4.275294 -3.51135,-4.275294 z"
+         id="path130"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="opacity:0.0478723;fill-rule:evenodd;stroke-width:3pt" />
+      <path
+         d="m 162.36286,-87.924531 c -1.79565,0 -3.24124,1.760105 -3.24124,3.946425 0,2.186319 
1.44559,3.946425 3.24124,3.946425 h 37.27432 c 1.79565,0 3.24124,-1.760106 3.24124,-3.946425 0,-2.18632 
-1.44559,-3.946425 -3.24124,-3.946425 z"
+         id="path132"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="opacity:0.0478723;fill-rule:evenodd;stroke-width:3pt" />
+      <path
+         d="m 162.36309,-87.595662 c -1.64601,0 -2.97114,1.61343 -2.97114,3.617556 0,2.004126 
1.32513,3.617556 2.97114,3.617556 h 37.27398 c 1.64601,0 2.97114,-1.61343 2.97114,-3.617556 0,-2.004126 
-1.32513,-3.617556 -2.97114,-3.617556 z"
+         id="path134"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="opacity:0.0478723;fill-rule:evenodd;stroke-width:3pt" />
+      <path
+         d="m 162.36286,-87.266794 c -1.49637,0 -2.70104,1.466755 -2.70104,3.288688 0,1.821933 
1.20467,3.288687 2.70104,3.288687 h 37.27432 c 1.49637,0 2.70103,-1.466754 2.70103,-3.288687 0,-1.821933 
-1.20466,-3.288688 -2.70103,-3.288688 z"
+         id="path136"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="opacity:0.0478723;fill-rule:evenodd;stroke-width:3pt" />
+      <path
+         d="m 162.36286,-86.937925 c -1.34674,0 -2.43093,1.320079 -2.43093,2.959819 0,1.639739 
1.08419,2.959819 2.43093,2.959819 h 37.27432 c 1.34673,0 2.43093,-1.32008 2.43093,-2.959819 0,-1.63974 
-1.0842,-2.959819 -2.43093,-2.959819 z"
+         id="path138"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="opacity:0.0478723;fill-rule:evenodd;stroke-width:3pt" />
+      <path
+         d="m 162.36286,-86.609056 c -1.1971,0 -2.16083,1.173404 -2.16083,2.63095 0,1.457546 0.96373,2.63095 
2.16083,2.63095 h 37.27432 c 1.1971,0 2.16083,-1.173404 2.16083,-2.63095 0,-1.457546 -0.96373,-2.63095 
-2.16083,-2.63095 z"
+         id="path140"
+         inkscape:r_cx="true"
+         inkscape:r_cy="true"
+         style="opacity:0.0478723;fill-rule:evenodd;stroke-width:3pt" />
+    </g>
+    <rect
+       height="18"
+       id="rect142"
+       rx="0.34312677"
+       ry="0.39917094"
+       
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1356);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       width="19"
+       x="1.4999999"
+       y="0.49999982" />
+    <rect
+       height="16"
+       id="rect144"
+       rx="0"
+       ry="0"
+       
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.697143;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5590);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       width="17"
+       x="2.5"
+       y="1.5000002" />
+    <path
+       d="M 3.9859594,2 C 3.4403598,2 3,2.5183715 3,3.1606267 3,3.5403204 3.1608045,3.8746017 
3.3993759,4.0861899 3.1550132,4.3004983 3,4.6404224 3,5.026445 3,5.4124665 3.1550132,5.7523907 
3.3993759,5.966699 3.1550132,6.1810074 3,6.5209324 3,6.9069541 3,7.2929756 3.1550132,7.6328998 
3.3993759,7.847209 3.1550132,8.0615166 3,8.4014415 3,8.7874631 3,9.1734848 3.1550132,9.5134088 
3.3993759,9.7277173 3.1550132,9.9420264 3,10.281951 3,10.667972 3,11.053993 3.1550132,11.393918 
3.3993759,11.608227 3.1550132,11.822535 3,12.16246 3,12.548481 3,12.934503 3.1550132,13.274427 
3.3993759,13.488735 3.1550132,13.703045 3,14.042969 3,14.428991 3,14.691744 3.0757672,14.938384 
3.199688,15.134182 3.0719811,15.329841 3,15.572863 3,15.839372 3,16.481628 3.44036,17 3.9859594,17 
4.3051575,17 4.5914852,16.821236 4.7722309,16.544564 4.9531815,16.817101 5.2296186,17 5.5460218,17 
5.8624251,17 6.1388623,16.817101 6.3198128,16.544564 6.5005584,16.821237 6.7868862,17 7.1060846,17 
7.4252825,17 7.7116099,16.821236 7
 .8923559,16.544564 8.0733059,16.817101 8.3497439,17 8.6661465,17 8.9844126,17 9.2591185,16.819857 
9.4399372,16.544564 9.6206832,16.821237 9.9070101,17 10.226209,17 10.544475,17 10.819182,16.819857 
11,16.544564 11.180818,16.819857 11.455525,17 11.77379,17 12.092989,17 12.379317,16.821236 
12.560062,16.544564 12.74088,16.819857 13.015586,17 13.333853,17 13.653051,17 13.939378,16.821236 
14.120124,16.544564 14.300943,16.819857 14.57565,17 14.893915,17 15.213114,17 15.499441,16.821236 
15.680187,16.544564 15.861137,16.817101 16.137573,17 16.453978,17 c 0.316403,0 0.59284,-0.182899 
0.77379,-0.455436 C 17.408514,16.821237 17.694842,17 18.01404,17 18.559639,17 19,16.481627 19,15.839372 c 
0,-0.273747 -0.07812,-0.521692 -0.212168,-0.719881 0.117503,-0.192761 0.187207,-0.435315 0.187207,-0.6905 
0,-0.386022 -0.155014,-0.725946 -0.399377,-0.940256 0.244363,-0.214308 0.399377,-0.554232 0.399377,-0.940254 
0,-0.386021 -0.155014,-0.725946 -0.399377,-0.940254 0.244363,-0.214309 0.399377,-0.554234 0.399
 377,-0.940255 0,-0.386021 -0.155014,-0.7259456 -0.399377,-0.9402547 0.244363,-0.2143085 0.399377,-0.5542325 
0.399377,-0.9402542 0,-0.3860216 -0.155014,-0.7259465 -0.399377,-0.9402541 0.244363,-0.2143092 
0.399377,-0.5542334 0.399377,-0.9402549 0,-0.3860217 -0.155014,-0.7259467 -0.399377,-0.9402551 
0.244363,-0.2143083 0.399377,-0.5542325 0.399377,-0.940254 0,-0.3784534 -0.150658,-0.7105509 
-0.386897,-0.9255634 C 18.834527,3.8901399 19,3.5475589 19,3.1606267 19,2.5183716 18.559639,2 18.01404,2 
17.694842,2 17.408514,2.1787626 17.227768,2.4554359 17.046818,2.1828972 16.770381,2 16.453978,2 16.137574,2 
15.861137,2.1828972 15.680187,2.4554359 15.499441,2.1787626 15.213114,2 14.893915,2 14.57565,2 
14.300943,2.1801428 14.120124,2.4554359 13.939379,2.1787626 13.653051,2 13.333853,2 13.015586,2 
12.74088,2.1801428 12.560062,2.4554359 12.379317,2.1787626 12.092989,2 11.77379,2 11.455525,2 
11.180818,2.1801428 11,2.4554359 10.819182,2.1801428 10.544475,2 10.226209,2 9.9070101,2 9.6206832,2.1787626
  9.4399372,2.4554359 9.2591185,2.1801428 8.9844126,2 8.6661465,2 8.3497439,2 8.0733059,2.1828972 
7.8923559,2.4554359 7.7116099,2.1787626 7.4252825,2 7.1060846,2 6.7868862,2 6.5005584,2.1787626 
6.3198128,2.4554359 6.1388623,2.1828972 5.8624248,2 5.5460218,2 5.2296186,2 4.9531815,2.1828972 
4.7722309,2.4554359 4.5914852,2.1787626 4.3051576,2 3.9859594,2 Z m 0.7862715,1.8658174 c 0.1809506,0.2725392 
0.4573877,0.4554358 0.7737909,0.4554358 0.3164033,0 0.5928405,-0.1828966 0.773791,-0.4554358 
0.1807456,0.2766733 0.4670734,0.4554358 0.7862718,0.4554358 0.3191979,0 0.6055253,-0.1787625 
0.7862713,-0.4554358 0.18095,0.2725392 0.457388,0.4554358 0.7737906,0.4554358 0.3182661,0 0.592972,-0.1801424 
0.7737907,-0.4554358 0.180746,0.2766733 0.4670729,0.4554358 0.7862718,0.4554358 0.318266,0 
0.592973,-0.1801424 0.773791,-0.4554358 0.180818,0.2752934 0.455525,0.4554358 0.77379,0.4554358 0.319199,0 
0.605527,-0.1787625 0.786272,-0.4554358 0.180818,0.2752934 0.455524,0.4554358 0.773791,0.4554358 0.31919
 8,0 0.605525,-0.1787625 0.786271,-0.4554358 0.180819,0.2752934 0.455526,0.4554358 0.773791,0.4554358 
0.319199,0 0.605526,-0.1787625 0.786272,-0.4554358 0.18095,0.2725392 0.457386,0.4554358 0.773791,0.4554358 
0.316403,0 0.59284,-0.1828966 0.77379,-0.4554358 0.05075,0.077682 0.108943,0.1452258 0.174728,0.2056808 
-0.257286,0.21267 -0.424338,0.55703 -0.424338,0.9549468 0,0.3860215 0.155014,0.7259457 0.399377,0.940254 
-0.244363,0.2143084 -0.399377,0.5542334 -0.399377,0.9402551 0,0.3860215 0.155014,0.7259457 0.399377,0.9402549 
-0.244363,0.2143076 -0.399377,0.5542325 -0.399377,0.9402541 0,0.3860217 0.155014,0.7259457 0.399377,0.9402542 
-0.244363,0.2143091 -0.399377,0.5542337 -0.399377,0.9402547 0,0.386021 0.155014,0.725946 0.399377,0.940255 
-0.244363,0.214308 -0.399377,0.554233 -0.399377,0.940254 0,0.386022 0.155014,0.725946 0.399377,0.940254 
-0.244363,0.21431 -0.399377,0.554234 -0.399377,0.940256 0,0.18465 0.0353,0.358675 0.09984,0.514202 
-0.168918,-0.166418 -0.386722,-0.264446 -0.624024,
 -0.264446 -0.316404,1e-6 -0.592841,0.182895 -0.773791,0.455435 -0.180746,-0.276673 -0.467073,-0.455435 
-0.786272,-0.455435 -0.318265,1e-6 -0.592972,0.180142 -0.773791,0.455435 -0.180745,-0.276673 
-0.467073,-0.455435 -0.786271,-0.455435 -0.318267,1e-6 -0.592973,0.180142 -0.773791,0.455435 
-0.180745,-0.276673 -0.467073,-0.455435 -0.786272,-0.455435 -0.318265,1e-6 -0.592972,0.180142 
-0.77379,0.455435 -0.180818,-0.275293 -0.455525,-0.455435 -0.773791,-0.455435 -0.3191989,1e-6 
-0.6055258,0.178761 -0.7862718,0.455435 -0.1808187,-0.275293 -0.4555246,-0.455435 -0.7737907,-0.455435 
-0.3164026,1e-6 -0.5928406,0.182895 -0.7737906,0.455435 -0.180746,-0.276673 -0.4670734,-0.455435 
-0.7862713,-0.455435 -0.3191984,1e-6 -0.6055262,0.178761 -0.7862718,0.455435 -0.1809505,-0.272539 
-0.457388,-0.455435 -0.773791,-0.455435 -0.2784955,1e-6 -0.5201994,0.147484 -0.6989078,0.367286 
0.093425,-0.178835 0.149766,-0.391843 0.149766,-0.617042 0,-0.386022 -0.1550134,-0.725946 
-0.3993761,-0.940256 C 4.8418666,13.
 274427 4.99688,12.934503 4.99688,12.548481 4.99688,12.16246 4.8418666,11.822535 4.5975039,11.608227 
4.8418666,11.393918 4.99688,11.053993 4.99688,10.667972 4.99688,10.281951 4.8418666,9.9420264 
4.5975039,9.7277173 4.8418666,9.5134088 4.99688,9.1734848 4.99688,8.7874631 4.99688,8.4014415 
4.8418666,8.0615166 4.5975039,7.847209 4.8418666,7.6328998 4.99688,7.2929756 4.99688,6.9069541 
4.99688,6.5209324 4.8418666,6.1810074 4.5975039,5.966699 4.8418666,5.7523907 4.99688,5.4124665 
4.99688,5.026445 4.99688,4.6360983 4.8340635,4.2999791 4.5850234,4.0861899 4.6562885,4.0229949 
4.718007,3.94882 4.7722309,3.8658174 Z"
+       id="path146"
+       
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.302857;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
 />
+    <rect
+       height="13"
+       id="rect148"
+       rx="0.30188766"
+       ry="0.36041716"
+       
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient5641);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+       width="14"
+       x="4"
+       y="3" />
+    <g
+       id="g150"
+       style="stroke:#204a87;stroke-width:1.93898;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.3148196,0.03099511,-0.00574837,0.2106514,-142.78444,-19.643739)">
+      <path
+         d="m 474.25,81.922 c 0.03,0.361 0.084,0.953 0.084,0.953 0,0 0.069,-1.077 -0.411,-1.157 
-1.043,-0.165 -1.589,1.34 -1.943,2.433 -0.494,1.509 -0.092,3.159 1.379,3.388 1.754,0.278 4.473,-2.38 
4.473,-2.38 0,0 -0.343,0.278 -0.402,0.501 -0.093,0.287 -0.283,0.709 -0.259,0.758 0.022,0.037 0.281,0.04 
0.456,0.071 0.495,0.076 1.06,-0.265 1.22,-0.775 0.138,-0.417 0.343,-1.033 0.343,-1.033 0,0 -0.214,0.299 
-0.275,0.486 -0.136,0.409 0.29,0.626 0.687,0.69 0.671,0.109 1.602,-1.021 1.653,-1.017 0.069,0.007 0.283,0.569 
0.633,0.623 0.511,0.085 1.144,-0.575 1.356,-0.562 0.062,0.004 0.122,0.273 0.29,0.303 0.579,0.092 1.486,-0.657 
1.538,-0.619 0.16,0.125 0.261,1.476 0.244,2.532"
+         knockout="Off"
+         id="path152"
+         stroke-miterlimit="3.8637"
+         
style="fill:none;stroke:#204a87;stroke-width:1.93898;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
 />
+      <path
+         d="m 487.965,80.738 c -0.349,1.288 -0.304,2.057 -0.594,3.349"
+         knockout="Off"
+         id="path154"
+         stroke-miterlimit="3.8637"
+         
style="fill:none;stroke:#204a87;stroke-width:1.93898;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
 />
+      <path
+         d="m 487.707,81.308 c -0.151,0.207 -0.235,0.312 -0.396,0.518 1.09,-0.39 2.721,-1.042 2.782,-0.983 
0.006,0.014 0.084,0.209 0.037,0.357 -0.273,0.838 -1.143,2.021 -1.143,2.021 0.068,0.083 3.062,-0.987 
3.329,-0.765 0.054,0.047 0.1,0.429 0.017,0.697 -0.153,0.472 -0.396,0.69 -0.694,1.103 0.107,-0.023 0.16,-0.024 
0.268,-0.044"
+         knockout="Off"
+         id="path156"
+         stroke-miterlimit="3.8637"
+         
style="fill:none;stroke:#204a87;stroke-width:1.93898;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
 />
+    </g>
+    <path
+       d="m 16.640455,14.525368 c 0.04467,1.407166 0.486579,2.7164 1.135382,3.974632 l 0.510922,-2.071288 
2.100456,0.447845 C 19.63749,16.414371 18.116973,15.021123 17.491991,14.021542 Z"
+       id="path158"
+       sodipodi:nodetypes="cccccc"
+       
style="fill:#3465a4;fill-rule:evenodd;stroke:#204a87;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
 />
+    <g
+       id="g160"
+       transform="matrix(0.0529096,0,0,0.05246853,63.839799,119.03548)">
+      <path
+         id="path162"
+         inkscape:flatsided="false"
+         inkscape:randomized="0"
+         inkscape:rounded="0.38"
+         sodipodi:arg1="0.84055688"
+         sodipodi:arg2="1.1896227"
+         sodipodi:cx="-2073.0457"
+         sodipodi:cy="-1596.6304"
+         sodipodi:r1="209.7282"
+         sodipodi:r2="180.36626"
+         sodipodi:sides="9"
+         sodipodi:type="star"
+         
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#f7f999;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5721);stroke-width:80.1097;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         transform="matrix(0.236918,0,0,0.236918,-411.8839,-1633.833)"
+         d="m -1933.1469,-1440.3798 c -20.8515,18.6694 -46.8214,0.7587 -72.8007,11.1706 -25.9793,10.4118 
-32.3917,41.3004 -60.3653,42.1989 -27.9736,0.8985 -36.355,-29.515 -62.9489,-38.2382 -26.5939,-8.7233 
-51.3609,10.817 -73.3675,-6.4758 -22.0065,-17.2929 -8.8776,-45.9784 -23.6425,-69.755 -14.7649,-23.7766 
-46.2978,-24.7279 -52.0402,-52.1205 -5.7424,-27.3926 22.7536,-40.9279 26.7264,-68.6325 3.9727,-27.7047 
-19.5715,-48.7023 -6.3628,-73.3774 13.2087,-24.6751 43.7383,-16.7268 64.5898,-35.3962 20.8515,-18.6693 
16.3126,-49.8884 42.2919,-60.3002 25.9793,-10.4118 44.2573,15.3009 72.2309,14.4024 27.9736,-0.8984 
44.5638,-27.7311 71.1577,-19.0079 26.5939,8.7233 24.0678,40.1692 46.0744,57.462 22.0065,17.2928 
51.9631,7.4018 66.728,31.1785 14.7649,23.7766 -7.3833,46.2418 -1.6409,73.6344 5.7424,27.3926 35.0483,39.0714 
31.0756,66.776 -3.9728,27.7047 -35.3796,30.6774 -48.5883,55.3525 -13.2087,24.6751 1.7339,52.459 
-19.1176,71.1284 z" />
+      <g
+         id="g164"
+         transform="matrix(0.89577,0,0,0.89577,-95.73024,-211.15)">
+        <ellipse
+           id="path166"
+           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fdce15;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           transform="matrix(1.162924,0,0,1.162924,226.5602,-739.689)"
+           cx="-971.1156"
+           cy="-1093.3582"
+           rx="29.97831"
+           ry="29.069878" />
+        <path
+           d="m -888.9211,-2029.5723 c -1.1619,-0.7545 -2.4266,-1.383 -3.7884,-1.8738 -3.4899,-1.5806 
-7.3246,-2.3383 -11.1408,-2.2199 -0.0915,0 -0.1731,0.016 -0.2648,0.02 -15.7146,-0.3477 -28.0678,19.7245 
-19.2266,33.2595 0.8594,1.5032 1.8991,2.8586 3.0755,4.0735"
+           id="path168"
+           sodipodi:nodetypes="cccccc"
+           
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.8211;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
 />
+      </g>
+    </g>
+    <path
+       d="M 5.6323272,5 H 16.140577"
+       id="path170"
+       
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+    <path
+       d="M 6.5000002,8.4999998 H 14.176492"
+       id="path172"
+       
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
 />
+    <path
+       d="m 6.5,10.5 h 5.246552"
+       id="path174"
+       
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
 />
+    <path
+       d="M 5.6935543,14.5 H 11.5"
+       id="path176"
+       
style="fill:#888a85;fill-rule:evenodd;stroke:#babdb6;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
 />
+  </g>
+</svg>
diff --git a/data/icons/hicolor_categories_24x24_preferences-composer.svg 
b/data/icons/hicolor_categories_24x24_preferences-composer.svg
new file mode 100644
index 0000000000..3673dbf61e
--- /dev/null
+++ b/data/icons/hicolor_categories_24x24_preferences-composer.svg
@@ -0,0 +1,756 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg1580"
+   sodipodi:docname="hicolor_categories_24x24_preferences-composer.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:svg="http://www.w3.org/2000/svg";>
+  <sodipodi:namedview
+     id="namedview77"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="8.4583333"
+     inkscape:cx="2.8965517"
+     inkscape:cy="17.20197"
+     inkscape:window-width="1600"
+     inkscape:window-height="869"
+     inkscape:window-x="40"
+     inkscape:window-y="1050"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1580" />
+  <defs
+     id="defs1577">
+    <radialGradient
+       cx="11.092737"
+       cy="18.597048"
+       fx="11.092737"
+       fy="18.597048"
+       gradientTransform="matrix(1,0,0,0.2469636,0,14.004255)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11811"
+       r="10.915961"
+       xlink:href="#linearGradient7440" />
+    <linearGradient
+       id="linearGradient7440">
+      <stop
+         id="stop7442"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7444"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11813"
+       x1="35.310661"
+       x2="33.536613"
+       xlink:href="#linearGradient6964"
+       y1="16.222532"
+       y2="4.7902908" />
+    <linearGradient
+       id="linearGradient6964">
+      <stop
+         id="stop6966"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+      <stop
+         id="stop6968"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30,1)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11815"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient7440"
+       y1="4.7506509"
+       y2="1.75" />
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11817"
+       x1="38"
+       x2="38"
+       xlink:href="#linearGradient8718"
+       y1="9.7488794"
+       y2="11.492249" />
+    <linearGradient
+       id="linearGradient8718">
+      <stop
+         id="stop8720"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+      <stop
+         id="stop8722"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11819"
+       x1="41.96875"
+       x2="41.96875"
+       xlink:href="#linearGradient6934"
+       y1="6.7255816"
+       y2="12.34375" />
+    <linearGradient
+       id="linearGradient6934">
+      <stop
+         id="stop6936"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop6938"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11821"
+       x1="36.21875"
+       x2="36.96875"
+       xlink:href="#linearGradient7013"
+       y1="9.71875"
+       y2="11.688599" />
+    <linearGradient
+       id="linearGradient7013">
+      <stop
+         id="stop7015"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7017"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11823"
+       x1="42.8125"
+       x2="41"
+       xlink:href="#linearGradient6981"
+       y1="6"
+       y2="-0.12500003" />
+    <linearGradient
+       id="linearGradient6981">
+      <stop
+         id="stop6983"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6985"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11825"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient6926"
+       y1="4.75"
+       y2="1.4357522" />
+    <linearGradient
+       id="linearGradient6926">
+      <stop
+         id="stop6928"
+         offset="0"
+         style="stop-color:#a3a5a1;stop-opacity:1;" />
+      <stop
+         id="stop6930"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11827"
+       x1="37.21875"
+       x2="37.21875"
+       xlink:href="#linearGradient7013"
+       y1="4.65625"
+       y2="0.96384674" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11829"
+       x1="49.5"
+       x2="49.5"
+       xlink:href="#linearGradient7013"
+       y1="6.0625"
+       y2="0.18749996" />
+    <filter
+       inkscape:collect="always"
+       id="filter9723"
+       x="-0.067058823"
+       width="1.1341176"
+       y="-0.26476592"
+       height="1.5295318">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.475"
+         id="feGaussianBlur9725" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9312"
+       id="linearGradient9318"
+       x1="305"
+       y1="181.625"
+       x2="321.19629"
+       y2="186.1875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29765626,0,0,0.27928243,-93.628416,-45.080692)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9312">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop9314" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="1"
+         id="stop9316" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9728"
+       id="linearGradient9734"
+       x1="318.06305"
+       y1="169"
+       x2="321"
+       y2="185.24222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29765626,0,0,0.27928243,-93.33076,-45.080692)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9728">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="0"
+         id="stop9730" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop9732" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9302"
+       id="linearGradient9308"
+       x1="311.0625"
+       y1="182.125"
+       x2="309.8125"
+       y2="174.0936"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29986111,0,0,0.26458334,-94.31964,-42.060032)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9302">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9304" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="1"
+         id="stop9306" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9312"
+       id="linearGradient3599"
+       gradientUnits="userSpaceOnUse"
+       x1="308.43115"
+       y1="169.16127"
+       x2="308.43115"
+       y2="171.16251" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9606"
+       id="linearGradient3601"
+       gradientUnits="userSpaceOnUse"
+       x1="309.5625"
+       y1="171.27699"
+       x2="309.5625"
+       y2="167.34317" />
+    <linearGradient
+       id="linearGradient9606">
+      <stop
+         id="stop9608"
+         offset="0"
+         style="stop-color:#555753;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0.66795093"
+         id="stop9610" />
+      <stop
+         id="stop9612"
+         offset="1"
+         style="stop-color:#888a85;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="18.53828"
+       x2="34.473412"
+       y1="18.53828"
+       x1="18.1875"
+       gradientTransform="matrix(0.666667,0,0,0.2766721,4.365669,17.844608)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6424-5"
+       xlink:href="#linearGradient7440"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.666667,0,0,0.666667,4.2615023,8.1230633)"
+       y2="14.691495"
+       x2="30.432114"
+       y1="12.120453"
+       x1="27.861073"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6432-5"
+       xlink:href="#linearGradient2275-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2275-7">
+      <stop
+         style="stop-color:#fcaf3e;stop-opacity:1"
+         offset="0"
+         id="stop2277-5" />
+      <stop
+         style="stop-color:#ce5c00"
+         offset="1"
+         id="stop2279-9" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4117-1-0-1-9"
+       id="radialGradient736-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2154679,-0.2155172,0.2168264,0.216876,31.917507,-48.128825)"
+       cx="-138.83727"
+       cy="128.00087"
+       fx="-138.83727"
+       fy="128.00087"
+       r="9.1267023" />
+    <linearGradient
+       id="linearGradient4117-1-0-1-9"
+       inkscape:collect="always">
+      <stop
+         style="stop-color:#f9a9a9;stop-opacity:1"
+         offset="0"
+         id="stop4121-0-5-5-8" />
+      <stop
+         style="stop-color:#ab5f5f;stop-opacity:1"
+         offset="1"
+         id="stop4119-1-6-1-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4099-6-7-7-3"
+       id="linearGradient820"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.1272465,-0.1272845,0.1272465,0.1272845,31.393152,-23.626692)"
+       x1="-158.75"
+       y1="115.93846"
+       x2="-158.75"
+       y2="134.25" />
+    <linearGradient
+       id="linearGradient4099-6-7-7-3"
+       inkscape:collect="always">
+      <stop
+         id="stop4101-1-8-4-5"
+         offset="0"
+         style="stop-color:#dddddd;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.34467545"
+         id="stop4107-2-2-1-7" />
+      <stop
+         id="stop4109-5-7-5-9"
+         offset="0.72694808"
+         style="stop-color:#737373;stop-opacity:1" />
+      <stop
+         id="stop4103-9-2-9-9"
+         offset="1"
+         style="stop-color:#bbbbbb;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="g1298"
+     transform="translate(3.3314043,-1.4858371)">
+    <path
+       transform="matrix(0.30624434,0,0,0.22950419,-96.021387,-35.682967)"
+       
style="display:inline;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter9723);enable-background:new"
+       d="m 304.97963,183.69431 h 15.04074 L 321,188 h -17 z"
+       id="rect9705"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9318);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient9734);stroke-width:0.264583;stroke-opacity:1;marker:none;enable-background:new"
+       id="rect10371"
+       width="4.7625003"
+       height="5.0270834"
+       x="-2.6944294"
+       y="2.2576771"
+       rx="0.22324219"
+       ry="0.20946182" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9308);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.264583;marker:none;enable-background:new"
+       id="rect8528"
+       width="4.4979167"
+       height="3.96875"
+       x="-2.5621376"
+       y="2.6545522"
+       rx="0"
+       ry="0" />
+    <g
+       style="display:inline;enable-background:new"
+       id="g3651"
+       transform="matrix(0.26458334,0,0,0.26458334,-96.22464,-42.589199)">
+      <rect
+         ry="0"
+         rx="0"
+         y="176"
+         x="356"
+         height="1"
+         width="4"
+         id="rect9632"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="176"
+         x="361"
+         height="1"
+         width="1"
+         id="rect9634"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="176"
+         x="363"
+         height="1"
+         width="1"
+         id="rect9636"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="176"
+         x="365"
+         height="1"
+         width="4"
+         id="rect9638"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="178"
+         x="356"
+         height="1"
+         width="1"
+         id="rect9640"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="178"
+         x="358"
+         height="1"
+         width="3"
+         id="rect9642"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="178"
+         x="362"
+         height="1"
+         width="2"
+         id="rect9644"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="180"
+         x="356"
+         height="1"
+         width="6"
+         id="rect9646"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="180"
+         x="363"
+         height="1"
+         width="2"
+         id="rect9650"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="180"
+         x="366"
+         height="1"
+         width="1"
+         id="rect9652"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="182"
+         x="364"
+         height="1"
+         width="1"
+         id="rect9654"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="182"
+         x="356"
+         height="1"
+         width="3"
+         id="rect9656"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="182"
+         x="360"
+         height="1"
+         width="3"
+         id="rect9658"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="184"
+         x="356"
+         height="1"
+         width="4"
+         id="rect9660"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="178"
+         x="365"
+         height="1"
+         width="2"
+         id="rect3587"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="180"
+         x="368"
+         height="1"
+         width="1"
+         id="rect3589"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="174"
+         x="356"
+         height="1"
+         width="1"
+         id="rect3603"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="174"
+         x="358"
+         height="1"
+         width="4"
+         id="rect3605"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="174"
+         x="363"
+         height="1"
+         width="3"
+         id="rect3607"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0"
+         rx="0"
+         y="174"
+         x="367"
+         height="1"
+         width="2"
+         id="rect3609"
+         style="display:inline;opacity:0.48;fill:#888a85;fill-opacity:1;stroke:none;enable-background:new" />
+    </g>
+    <rect
+       
style="display:inline;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
+       id="rect9300"
+       width="5.0270834"
+       height="0.26458335"
+       x="-2.826721"
+       y="7.1524692"
+       rx="0"
+       ry="0" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#ffffff;stroke-width:0.264583;stroke-opacity:1;marker:none;enable-background:new"
+       id="rect9310"
+       width="4.2333331"
+       height="4.4979167"
+       x="-2.429846"
+       y="2.5222604"
+       rx="0"
+       ry="0" />
+    <path
+       
style="display:inline;opacity:0.1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
+       d="m -1.9006793,2.3899688 c -0.219075,0 -0.3968724,0.1777974 -0.396875,0.396875 0,0.219075 
0.1778027,0.3968724 0.396875,0.396875 0.1011608,0 0.1944661,-0.036838 0.2645834,-0.099219 0.00275,0.00238 
0.00545,0.0059 0.00825,0.00826 0.030012,0.025162 0.062635,0.042394 0.099219,0.057878 0.01651,0.00717 
0.032036,0.011615 0.049609,0.016536 0.00839,0.00238 0.016193,0.00651 0.024791,0.00825 0.0028,5.292e-4 
0.00545,-5.291e-4 0.00825,0 0.023442,0.00431 0.049742,0.00826 0.074414,0.00826 0.1011608,0 
0.1944661,-0.036838 0.2645833,-0.099219 0.035057,0.031192 0.079288,0.057407 0.12402348,0.074414 
0.0447357,0.017013 0.0899795,0.024791 0.1405599,0.024791 0.1011608,0 0.19446611,-0.036838 
0.26458334,-0.099219 0.0350573,0.031192 0.0792877,0.057407 0.12402344,0.074414 0.0447358,0.017013 
0.0899795,0.024792 0.1405599,0.024792 0.1011608,0 0.19446611,-0.036838 0.26458334,-0.099219 
0.0350573,0.031192 0.07928769,0.057407 0.12402344,0.074414 0.04473575,0.017013 0.08997951,0.024791 
0.1405599,0.024791 0.101
 1608,0 0.19446611,-0.036838 0.26458334,-0.099219 0.0350573,0.031192 0.0792877,0.057407 0.12402344,0.074414 
0.0447357,0.017013 0.0899795,0.024791 0.1405599,0.024791 0.0273844,0 0.0568537,-0.00299 0.0826823,-0.00826 
0.009128,-0.00185 0.0159014,-0.00577 0.0247915,-0.00825 0.014261,-0.00392 0.0277574,-0.011113 
0.0413411,-0.016536 0.002117,-7.938e-4 0.006112,0.00106 0.008255,0 0.0365839,-0.015478 0.0692071,-0.032708 
0.0992188,-0.057878 0.00299,-0.00238 0.00537,-0.00569 0.00825,-0.00826 0.070117,0.062381 0.1634225,0.099219 
0.2645833,0.099219 0.219075,0 0.396875,-0.1778026 0.396875,-0.396875 0,-0.219075 -0.1778,-0.3968777 
-0.396875,-0.396875 -0.1011608,0 -0.1944661,0.036838 -0.2645833,0.099219 -0.00291,-0.00265 -0.00529,-0.00577 
-0.00825,-0.00825 -0.0300117,-0.025162 -0.0626348,-0.042394 -0.0992188,-0.057878 -0.0158221,-0.00669 
-0.0328163,-0.011906 -0.0496094,-0.016536 -0.0348509,-0.00973 -0.0694849,-0.016497 -0.10742084,-0.016497 
-0.0252942,0 -0.0503449,0.00384 -0.0744141,0.00825 -0.02407
 71,0.00442 -0.043778,0.00804 -0.0661458,0.016537 -0.0447358,0.017013 -0.0889661,0.043222 
-0.12402344,0.074414 -0.0701172,-0.062381 -0.16342255,-0.099219 -0.26458334,-0.099219 -0.0252942,0 
-0.0503449,0.00384 -0.0744141,0.00826 -0.0240771,0.00442 -0.04377796,0.00804 -0.06614584,0.016536 
-0.04473575,0.017013 -0.08896615,0.043222 -0.12402344,0.074414 -0.07011723,-0.062381 -0.16342255,-0.099219 
-0.26458334,-0.099219 -0.0252942,0 -0.0503449,0.00384 -0.0744141,0.00826 -0.0240771,0.00442 -0.043778,0.00804 
-0.0661458,0.016536 -0.0447358,0.017013 -0.0889661,0.043222 -0.12402344,0.074414 -0.0701172,-0.062381 
-0.16342255,-0.099219 -0.26458334,-0.099219 -0.0252942,0 -0.0503449,0.00384 -0.0744141,0.00826 
-0.0240771,0.00442 -0.043778,0.00804 -0.0661458,0.016536 -0.0447358,0.017013 -0.0889662,0.043222 
-0.1240235,0.074414 -0.070117,-0.062381 -0.1634225,-0.099219 -0.2645833,-0.099219 -0.036512,0 
-0.073901,0.0073 -0.107487,0.016536 -0.017568,0.00492 -0.03311,0.00937 -0.049609,0.016536 -0.036584,0.0154
 78 -0.069207,0.032708 -0.099219,0.057878 -0.00283,0.00238 -0.00553,0.00582 -0.00825,0.00826 
-0.070117,-0.062381 -0.1634226,-0.099219 -0.2645834,-0.099219 z"
+       id="path9666" />
+    <g
+       id="g9344"
+       transform="matrix(0.26458334,0,0,0.26458334,-83.52464,-42.589199)"
+       style="display:inline;enable-background:new">
+      <rect
+         ry="1"
+         rx="1"
+         y="167.5"
+         x="307.5"
+         height="4"
+         width="2"
+         id="rect9320"
+         
style="fill:url(#linearGradient3599);fill-opacity:1;stroke:url(#linearGradient3601);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+      <rect
+         ry="1.34375"
+         rx="1.5925926"
+         y="167.6875"
+         x="307.5"
+         height="1.34375"
+         width="1.34375"
+         id="rect9332"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    </g>
+    <use
+       x="0"
+       y="0"
+       xlink:href="#g9344"
+       id="use9348"
+       width="400"
+       height="300"
+       transform="translate(0.52916679)"
+       style="display:inline;enable-background:new" />
+    <use
+       style="display:inline;enable-background:new"
+       x="0"
+       y="0"
+       xlink:href="#g9344"
+       id="use9354"
+       width="400"
+       height="300"
+       transform="translate(1.0583335)" />
+    <use
+       style="display:inline;enable-background:new"
+       x="0"
+       y="0"
+       xlink:href="#g9344"
+       id="use9356"
+       width="400"
+       height="300"
+       transform="translate(1.5875002)" />
+    <use
+       style="display:inline;enable-background:new"
+       x="0"
+       y="0"
+       xlink:href="#g9344"
+       id="use9358"
+       width="400"
+       height="300"
+       transform="translate(2.1166668)" />
+    <use
+       style="display:inline;enable-background:new"
+       x="0"
+       y="0"
+       xlink:href="#g9344"
+       id="use9360"
+       width="400"
+       height="300"
+       transform="translate(2.6458335)" />
+    <use
+       style="display:inline;enable-background:new"
+       x="0"
+       y="0"
+       xlink:href="#g9344"
+       id="use3585"
+       width="400"
+       height="300"
+       transform="translate(3.1750002)" />
+    <g
+       id="g771-4"
+       style="display:inline;enable-background:new"
+       transform="matrix(0.25125064,0,0,0.25125064,-4.8903096,0.27303485)">
+      <path
+         sodipodi:nodetypes="cccccccccccc"
+         
style="display:inline;opacity:0.4;fill:url(#linearGradient6424-5);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         d="m 28.439579,18.977235 -11.05307,2.981944 -0.08333,0.04323 -0.0625,0.05188 -1.833334,1.90212 
4.958336,-0.56199 0.1875,-0.01729 0.125,-0.05188 7.761402,-1.788796 v -2.559216 z"
+         id="path2334-5-8" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path2273-6-2"
+         d="m 17.261509,20.123069 9.114589,-9.208339 c 1.450033,0.239974 2.05648,1.154818 2.333334,2.333335 
l -9.114589,9.208339 -2.826979,0.270797 z"
+         
style="fill:url(#linearGradient6432-5);fill-opacity:1;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1.05307;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+      <path
+         sodipodi:nodetypes="cczcc"
+         id="path2298-0-7"
+         d="m 16.516694,22.952014 1.047591,-2.628096 c 0,0 0.75413,0.154254 1.214731,0.613024 
0.4606,0.458769 0.627673,1.222055 0.627673,1.222055 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         id="path2313-6-7"
+         d="M 17.931487,20.648059 28.796386,9.8599434 c 0.567332,0.092866 0.789902,0.5141756 
1.04122,1.0409006 L 19.02477,21.741005 17.306755,22.209411 Z"
+         
style="display:inline;opacity:0.282353;fill:none;stroke:#ffffff;stroke-width:1.05307;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+      <path
+         sodipodi:nodetypes="ccc"
+         id="path6416-5"
+         d="m 19.594843,22.456404 -3.666668,1 1.333334,-3.333335"
+         
style="fill:none;stroke:#e9b96e;stroke-width:1.05307;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 />
+      <path
+         id="path2283-1-5"
+         d="m 15.907127,22.191239 -0.817772,2.03033 2.114928,-0.592179 c 0.0018,-0.02873 0,-0.05541 
0,-0.0846 0,-0.723812 -0.582306,-1.317279 -1.297156,-1.353553 z"
+         style="display:inline;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+         sodipodi:nodetypes="cccsc" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path4113-1-6-3"
+         d="m 26.741372,10.597989 c 1.233482,-0.336694 2.612732,1.11088 2.320097,2.320621 l 
1.476419,-1.476761 C 31.255126,9.7826894 29.77644,8.4756072 28.187664,9.0910857 Z"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient736-9);fill-opacity:1;fill-rule:nonzero;stroke:#ef2929;stroke-width:1.05307;marker:none;enable-background:new"
 />
+      <path
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient820);fill-opacity:1;fill-rule:nonzero;stroke:#888a85;stroke-width:1.05307;marker:none;enable-background:new"
+         d="m 25.221696,12.012979 c 1.30228,-0.355488 2.758451,1.172927 2.449493,2.45023 l 1.55877,-1.559236 
c 0.507381,-1.07342 -1.375033,-2.917669 -2.481304,-2.482047 z"
+         id="path4095-8-4-6"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/hicolor_categories_24x24_preferences-contact.svg 
b/data/icons/hicolor_categories_24x24_preferences-contact.svg
new file mode 100644
index 0000000000..fb80ce845c
--- /dev/null
+++ b/data/icons/hicolor_categories_24x24_preferences-contact.svg
@@ -0,0 +1,610 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg1580"
+   sodipodi:docname="hicolor_categories_24x24_preferences-autocompletion.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:svg="http://www.w3.org/2000/svg";>
+  <sodipodi:namedview
+     id="namedview77"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="5.980945"
+     inkscape:cx="23.825666"
+     inkscape:cy="22.82248"
+     inkscape:window-width="1680"
+     inkscape:window-height="989"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g1146" />
+  <defs
+     id="defs1577">
+    <radialGradient
+       cx="11.092737"
+       cy="18.597048"
+       fx="11.092737"
+       fy="18.597048"
+       gradientTransform="matrix(1,0,0,0.2469636,0,14.004255)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11811"
+       r="10.915961"
+       xlink:href="#linearGradient7440" />
+    <linearGradient
+       id="linearGradient7440">
+      <stop
+         id="stop7442"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7444"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11813"
+       x1="35.310661"
+       x2="33.536613"
+       xlink:href="#linearGradient6964"
+       y1="16.222532"
+       y2="4.7902908" />
+    <linearGradient
+       id="linearGradient6964">
+      <stop
+         id="stop6966"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+      <stop
+         id="stop6968"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30,1)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11815"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient7440"
+       y1="4.7506509"
+       y2="1.75" />
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11817"
+       x1="38"
+       x2="38"
+       xlink:href="#linearGradient8718"
+       y1="9.7488794"
+       y2="11.492249" />
+    <linearGradient
+       id="linearGradient8718">
+      <stop
+         id="stop8720"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+      <stop
+         id="stop8722"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11819"
+       x1="41.96875"
+       x2="41.96875"
+       xlink:href="#linearGradient6934"
+       y1="6.7255816"
+       y2="12.34375" />
+    <linearGradient
+       id="linearGradient6934">
+      <stop
+         id="stop6936"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop6938"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11821"
+       x1="36.21875"
+       x2="36.96875"
+       xlink:href="#linearGradient7013"
+       y1="9.71875"
+       y2="11.688599" />
+    <linearGradient
+       id="linearGradient7013">
+      <stop
+         id="stop7015"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7017"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11823"
+       x1="42.8125"
+       x2="41"
+       xlink:href="#linearGradient6981"
+       y1="6"
+       y2="-0.12500003" />
+    <linearGradient
+       id="linearGradient6981">
+      <stop
+         id="stop6983"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6985"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11825"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient6926"
+       y1="4.75"
+       y2="1.4357522" />
+    <linearGradient
+       id="linearGradient6926">
+      <stop
+         id="stop6928"
+         offset="0"
+         style="stop-color:#a3a5a1;stop-opacity:1;" />
+      <stop
+         id="stop6930"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11827"
+       x1="37.21875"
+       x2="37.21875"
+       xlink:href="#linearGradient7013"
+       y1="4.65625"
+       y2="0.96384674" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11829"
+       x1="49.5"
+       x2="49.5"
+       xlink:href="#linearGradient7013"
+       y1="6.0625"
+       y2="0.18749996" />
+    <linearGradient
+       id="linearGradient7134">
+      <stop
+         id="stop7136"
+         offset="0"
+         style="stop-color:#f0f0ee;stop-opacity:1" />
+      <stop
+         id="stop7138"
+         offset="1"
+         style="stop-color:#a1a196;stop-opacity:1" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5046">
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.46707526"
+         inkscape:original="M 716.96875 181.4375 C 714.46819 181.4375 712.43749 183.48912 712.4375 186 C 
712.4375 187.41668 713.11279 188.66556 714.125 189.5 C 711.94045 190.29751 710.40625 191.96761 710.40625 
193.90625 C 710.40624 194.88 710.78135 195.79899 711.4375 196.5625 L 722.53125 196.5625 C 723.18737 195.79899 
723.5625 194.88 723.5625 193.90625 C 723.5625 191.96761 722.0283 190.29751 719.84375 189.5 C 720.85066 
188.66548 721.5 187.41238 721.5 186 C 721.5 183.48911 719.46934 181.4375 716.96875 181.4375 z "
+         
style="display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.902582;marker:none;enable-background:accumulate"
+         id="path5048"
+         transform="translate(-6,-3)" />
+    </clipPath>
+    <linearGradient
+       id="linearGradient9590">
+      <stop
+         id="stop9592"
+         offset="0"
+         style="stop-color:#bfbfbf;stop-opacity:1;" />
+      <stop
+         id="stop9594"
+         offset="1"
+         style="stop-color:#f8f8f8;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5635">
+      <stop
+         id="stop5637"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop5639"
+         offset="1"
+         style="stop-color:#ededed;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3384">
+      <stop
+         id="stop3386"
+         offset="0"
+         style="stop-color:white;stop-opacity:1" />
+      <stop
+         id="stop3388"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3269">
+      <stop
+         id="stop3271"
+         offset="0"
+         style="stop-color:#fecb81;stop-opacity:1" />
+      <stop
+         id="stop3273"
+         offset="1"
+         style="stop-color:#fcaf3e;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7440"
+       id="radialGradient75156"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7440"
+       id="radialGradient75158"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
+       cx="4.9929786"
+       cy="43.5"
+       fx="4.9929786"
+       fy="43.5"
+       r="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3702"
+       id="linearGradient75160"
+       gradientUnits="userSpaceOnUse"
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443" />
+    <linearGradient
+       id="linearGradient3702">
+      <stop
+         id="stop3704"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         id="stop3710"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop3706"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6732"
+       id="linearGradient75148"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5299684,0,0,0.5000003,32.329,-4.73409)"
+       x1="11.511479"
+       y1="0.75951481"
+       x2="31.5"
+       y2="36.625" />
+    <linearGradient
+       id="linearGradient6732">
+      <stop
+         id="stop6734"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6736"
+         offset="1"
+         style="stop-color:#dddddd;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4585"
+       id="linearGradient75132"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.601359,0,0,0.5980622,32.91089,-9.54032)"
+       x1="9.117774"
+       y1="18.345161"
+       x2="8.4885712"
+       y2="34.608616" />
+    <linearGradient
+       id="linearGradient4585">
+      <stop
+         id="stop4587"
+         offset="0"
+         style="stop-color:#9e9e9e;stop-opacity:1;" />
+      <stop
+         id="stop4589"
+         offset="1"
+         style="stop-color:#dddddd;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6557">
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="0"
+         id="stop6559" />
+      <stop
+         id="stop6565"
+         offset="0.67301035"
+         style="stop-color:#fce94f;stop-opacity:1" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:0;"
+         offset="1"
+         id="stop6561" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6620">
+      <stop
+         id="stop6622"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.32992947"
+         id="stop6624" />
+      <stop
+         id="stop6626"
+         offset="1"
+         style="stop-color:#fce94f;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="g32"
+     style="display:inline;enable-background:new"
+     transform="matrix(0.26458334,0,0,0.26458334,-1.3205092,-0.81649318)">
+    <g
+       id="g1146"
+       transform="translate(-27.960236,7.820061)">
+      <g
+         transform="matrix(0.5499999,0,0,0.3596138,31.7489,-0.63594)"
+         inkscape:label="Shadow"
+         id="g9211"
+         style="display:inline;enable-background:new">
+        <g
+           style="display:inline"
+           inkscape:label="Shadow"
+           id="g9213">
+          <g
+             transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+             style="opacity:0.4"
+             id="g9215">
+            <rect
+               y="40"
+               x="38"
+               width="5"
+               
style="opacity:1;fill:url(#radialGradient75156);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               id="rect9217"
+               height="7" />
+            <rect
+               y="-47"
+               x="-10"
+               width="5"
+               transform="scale(-1)"
+               
style="opacity:1;fill:url(#radialGradient75158);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               id="rect9219"
+               height="7" />
+            <rect
+               y="40"
+               x="10"
+               width="28"
+               
style="opacity:1;fill:url(#linearGradient75160);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               id="rect9221"
+               height="7.0000005" />
+          </g>
+        </g>
+      </g>
+      <rect
+         y="-0.23408474"
+         x="34.448898"
+         width="21"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient75148);fill-opacity:1;fill-rule:evenodd;stroke:#939393;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:new"
+         ry="2.0346971"
+         rx="2.0346971"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="rect9223"
+         height="15.000001" />
+      <path
+         
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:4.12102px;line-height:120%;font-family:Segoe;text-align:start;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="path9225"
+         d="m 44.4822,3.19344 c 0,0.20076 -0.0472,0.35472 -0.14154,0.46188 -0.0944,0.10645 -0.22303,0.15968 
-0.38601,0.15968 -0.0665,0 -0.1301,-0.0125 -0.19087,-0.0375 V 3.49244 c 0.0536,0.0407 0.11295,0.0611 
0.178,0.0611 0.0801,0 0.14011,-0.0296 0.18014,-0.0889 0.0407,-0.06 0.0611,-0.14967 0.0611,-0.26899 V 2.2451 h 
0.29916 v 0.94841 m 0.83529,-0.54868 c 0.16727,0 0.30059,0.0514 0.39995,0.15432 0.0994,0.10287 
0.14904,0.24112 0.14904,0.41472 0,0.18861 -0.0532,0.33579 -0.15977,0.44152 -0.10651,0.10502 -0.24947,0.15753 
-0.42889,0.15753 -0.16514,0 -0.29952,-0.0518 -0.40318,-0.15539 -0.10293,-0.10359 -0.1544,-0.23933 
-0.1544,-0.40722 0,-0.18861 0.054,-0.3365 0.16191,-0.44366 0.10794,-0.10788 0.25305,-0.16182 0.43534,-0.16182 
m -0.0247,0.93769 c 0.0872,0 0.15797,-0.0311 0.2123,-0.0932 0.055,-0.0629 0.0826,-0.14825 0.0826,-0.25613 
0,-0.1093 -0.0272,-0.19539 -0.0815,-0.25826 -0.0543,-0.0636 -0.12403,-0.0954 -0.20909,-0.0954 -0.0844,0 
-0.15584,0.0332 -0.21446,0.0997 -0.0586,0.0657 -0.0879,0
 .15253 -0.0879,0.26041 0,0.10645 0.0286,0.1904 0.0858,0.25184 0.0579,0.0607 0.12867,0.0911 0.21231,0.0911 M 
47.1146,3.7819 H 46.82723 V 3.18071 c 0,-0.10073 -0.0154,-0.1736 -0.0461,-0.21861 -0.0307,-0.0457 
-0.0833,-0.0686 -0.15762,-0.0686 -0.0651,0 -0.11903,0.0247 -0.16191,0.0739 -0.0429,0.0493 -0.0643,0.11217 
-0.0643,0.18861 V 3.78185 H 46.10672 V 2.15724 h 0.29058 v 0.68049 c 0.0393,-0.0643 0.0883,-0.11252 
0.1469,-0.14467 0.0593,-0.0322 0.12831,-0.0482 0.20694,-0.0482 0.12081,0 0.2116,0.0375 0.27236,0.11252 
0.0608,0.075 0.0911,0.18754 0.0912,0.33757 v 0.68692 m 1.31673,0 H 48.14406 V 3.18068 c 0,-0.10073 
-0.0154,-0.1736 -0.0461,-0.21861 -0.0307,-0.0457 -0.0833,-0.0686 -0.15762,-0.0686 -0.065,0 -0.11902,0.0247 
-0.16191,0.0739 -0.0429,0.0493 -0.0643,0.11217 -0.0643,0.18861 V 3.78182 H 47.42355 V 2.68446 h 0.29058 V 
2.8377 c 0.0393,-0.0643 0.0883,-0.11252 0.14691,-0.14467 0.0593,-0.0322 0.1283,-0.0482 0.20694,-0.0482 
0.12081,0 0.21159,0.0375 0.27235,0.11252 0.0608,0.075 0.0912,0.1875
 4 0.0912,0.33757 V 3.78184 M 49.3719,2.2451 h 0.53827 c 0.2602,1e-5 0.45535,0.0625 0.58546,0.18754 
0.13081,0.12503 0.19621,0.31221 0.19621,0.56155 0,0.24076 -0.0736,0.43223 -0.22088,0.5744 -0.14655,0.14217 
-0.34527,0.21325 -0.59618,0.21325 H 49.3719 V 2.2451 m 0.29915,1.29991 h 0.1973 c 0.16155,0 0.28844,-0.0482 
0.38065,-0.14467 0.0929,-0.0964 0.13939,-0.22826 0.1394,-0.39544 -10e-6,-0.16217 -0.045,-0.28827 
-0.13511,-0.37829 -0.0901,-0.09 -0.21552,-0.13503 -0.37636,-0.13503 h -0.20588 v 1.05343 m 1.78853,-0.90018 c 
0.16727,0 0.30059,0.0514 0.39995,0.15432 0.0994,0.10287 0.14905,0.24112 0.14905,0.41472 0,0.18861 
-0.0533,0.33579 -0.15977,0.44152 -0.10651,0.10502 -0.24948,0.15753 -0.4289,0.15753 -0.16513,0 
-0.29952,-0.0518 -0.40317,-0.15539 C 50.9138,3.55394 50.86233,3.4182 50.86233,3.25031 c 0,-0.18861 
0.054,-0.3365 0.16191,-0.44366 0.10794,-0.10788 0.25306,-0.16182 0.43534,-0.16182 m -0.0247,0.93769 c 
0.0872,0 0.15798,-0.0311 0.21231,-0.0932 0.055,-0.0629 0.0826,-0.14825 0.0826,-0.25
 613 0,-0.1093 -0.0272,-0.19539 -0.0815,-0.25826 -0.0543,-0.0636 -0.12402,-0.0954 -0.20908,-0.0954 -0.0844,0 
-0.15584,0.0332 -0.21445,0.0997 -0.0586,0.0657 -0.0879,0.15253 -0.0879,0.26041 0,0.10645 0.0286,0.1904 
0.0858,0.25184 0.0579,0.0607 0.12867,0.0911 0.21231,0.0911 m 1.7585,-0.28613 h -0.73128 c 0,0.09 
0.0275,0.16003 0.0826,0.21004 0.0557,0.0493 0.13295,0.0739 0.2316,0.0739 0.10866,0 0.21339,-0.0325 
0.31418,-0.0975 v 0.2379 c -0.11295,0.0586 -0.23948,0.0879 -0.37958,0.0879 -0.16942,0 -0.30202,-0.0497 
-0.39781,-0.14896 -0.0951,-0.0993 -0.14262,-0.23505 -0.14262,-0.40723 0,-0.18575 0.0508,-0.33364 
0.15227,-0.44366 0.10222,-0.11073 0.23661,-0.1661 0.40317,-0.1661 0.14654,0 0.26091,0.0457 0.34312,0.13717 
0.0829,0.0907 0.12438,0.21754 0.12438,0.38043 v 0.1361 m -0.26807,-0.1929 c 0,-0.0764 -0.0193,-0.1361 
-0.0579,-0.17896 -0.0379,-0.0429 -0.0918,-0.0643 -0.16191,-0.0643 -0.0636,0 -0.11866,0.0222 -0.16512,0.0664 
-0.0465,0.0436 -0.0726,0.10252 -0.0783,0.17682 h 0.46321" />
+      <rect
+         y="5.2659001"
+         x="42.948898"
+         width="10"
+         
style="display:inline;overflow:visible;visibility:visible;opacity:0.397661;fill:#8d8d8d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:new"
+         ry="1"
+         rx="1"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="rect9227"
+         height="1.0000004" />
+      <rect
+         y="7.2659001"
+         x="42.948898"
+         width="8"
+         
style="display:inline;overflow:visible;visibility:visible;opacity:0.397661;fill:#8d8d8d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:new"
+         ry="1"
+         rx="1.0000001"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="rect9229"
+         height="0.99999952" />
+      <g
+         transform="matrix(0.477773,0,0,0.4438082,33.20227,-2.97473)"
+         style="display:inline;opacity:0.48538;fill:#787878;fill-opacity:1;enable-background:new"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="g9231">
+        <rect
+           y="29.834135"
+           x="5.7488174"
+           width="2.0930443"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           ry="0"
+           rx="0"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="rect9233"
+           height="4.5064521" />
+        <rect
+           y="29.834135"
+           x="9.934906"
+           width="2.0930443"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           ry="0"
+           rx="0"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="rect9235"
+           height="4.5064425" />
+        <rect
+           y="29.834135"
+           x="14.120995"
+           width="2.0930443"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="rect9239"
+           height="4.5064425" />
+        <rect
+           y="29.834135"
+           x="18.307083"
+           width="2.0930438"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="rect9243"
+           height="2.2532265" />
+        <rect
+           y="29.834135"
+           x="22.493172"
+           width="4.1860876"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="rect9247"
+           height="4.5064425" />
+        <rect
+           y="29.834135"
+           x="28.772305"
+           width="2.0930433"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="rect9253"
+           height="4.5064425" />
+        <rect
+           y="29.834135"
+           x="32.958393"
+           width="2.0930455"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="rect9255"
+           height="4.5064425" />
+        <rect
+           y="29.834135"
+           x="37.144482"
+           width="2.0930429"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="rect9257"
+           height="4.5064425" />
+        <rect
+           y="29.834135"
+           x="41.33057"
+           width="2.093044"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#787878;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="rect9261"
+           height="4.5064511" />
+      </g>
+      <rect
+         y="2.2658999"
+         x="35.948898"
+         width="6.0000005"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient75132);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:new"
+         ry="0"
+         rx="0"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="rect9265"
+         height="7" />
+      <g
+         transform="matrix(0.1851369,0,0,0.1825178,32.40625,1.82877)"
+         style="display:inline;fill:#939393;fill-opacity:1;stroke:none;enable-background:new"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="g9267">
+        <path
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#939393;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.29991px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           sodipodi:nodetypes="ccccc"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="path9269"
+           d="M 45.839501,40.747425 C 46.695797,38.324508 45.985665,33.523468 40.43143,29.789592 H 30.053777 
c -5.554236,3.446655 -6.24834,8.160264 -4.969579,10.914407 0,0 20.755303,0.04343 20.755303,0.04343 z" />
+        <circle
+           transform="matrix(1.2471424,0,0,1.2650381,-3.4624488,-5.2148703)"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#939393;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.29991px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+           inkscape:r_cy="true"
+           inkscape:r_cx="true"
+           id="path9271"
+           cx="31.112698"
+           cy="19.008621"
+           r="8.6620579" />
+      </g>
+      <rect
+         y="0.81156957"
+         x="35.448898"
+         width="18.999998"
+         
style="display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:new"
+         ry="1.2183677"
+         rx="1.2183677"
+         inkscape:r_cy="true"
+         inkscape:r_cx="true"
+         id="rect9273"
+         height="12.954331" />
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/hicolor_categories_24x24_preferences-mail-accounts.svg 
b/data/icons/hicolor_categories_24x24_preferences-mail-accounts.svg
new file mode 100644
index 0000000000..3235035fab
--- /dev/null
+++ b/data/icons/hicolor_categories_24x24_preferences-mail-accounts.svg
@@ -0,0 +1,543 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg1580"
+   sodipodi:docname="hicolor_categories_24x24_preferences-mail-accounts.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:svg="http://www.w3.org/2000/svg";>
+  <sodipodi:namedview
+     id="namedview77"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="11.96189"
+     inkscape:cx="-2.0481714"
+     inkscape:cy="17.095961"
+     inkscape:window-width="1680"
+     inkscape:window-height="989"
+     inkscape:window-x="0"
+     inkscape:window-y="30"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1580" />
+  <defs
+     id="defs1577">
+    <radialGradient
+       cx="11.092737"
+       cy="18.597048"
+       fx="11.092737"
+       fy="18.597048"
+       gradientTransform="matrix(1,0,0,0.2469636,0,14.004255)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11811"
+       r="10.915961"
+       xlink:href="#linearGradient7440" />
+    <linearGradient
+       id="linearGradient7440">
+      <stop
+         id="stop7442"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7444"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11813"
+       x1="35.310661"
+       x2="33.536613"
+       xlink:href="#linearGradient6964"
+       y1="16.222532"
+       y2="4.7902908" />
+    <linearGradient
+       id="linearGradient6964">
+      <stop
+         id="stop6966"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+      <stop
+         id="stop6968"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30,1)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11815"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient7440"
+       y1="4.7506509"
+       y2="1.75" />
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11817"
+       x1="38"
+       x2="38"
+       xlink:href="#linearGradient8718"
+       y1="9.7488794"
+       y2="11.492249" />
+    <linearGradient
+       id="linearGradient8718">
+      <stop
+         id="stop8720"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+      <stop
+         id="stop8722"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11819"
+       x1="41.96875"
+       x2="41.96875"
+       xlink:href="#linearGradient6934"
+       y1="6.7255816"
+       y2="12.34375" />
+    <linearGradient
+       id="linearGradient6934">
+      <stop
+         id="stop6936"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop6938"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11821"
+       x1="36.21875"
+       x2="36.96875"
+       xlink:href="#linearGradient7013"
+       y1="9.71875"
+       y2="11.688599" />
+    <linearGradient
+       id="linearGradient7013">
+      <stop
+         id="stop7015"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7017"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11823"
+       x1="42.8125"
+       x2="41"
+       xlink:href="#linearGradient6981"
+       y1="6"
+       y2="-0.12500003" />
+    <linearGradient
+       id="linearGradient6981">
+      <stop
+         id="stop6983"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6985"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11825"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient6926"
+       y1="4.75"
+       y2="1.4357522" />
+    <linearGradient
+       id="linearGradient6926">
+      <stop
+         id="stop6928"
+         offset="0"
+         style="stop-color:#a3a5a1;stop-opacity:1;" />
+      <stop
+         id="stop6930"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11827"
+       x1="37.21875"
+       x2="37.21875"
+       xlink:href="#linearGradient7013"
+       y1="4.65625"
+       y2="0.96384674" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11829"
+       x1="49.5"
+       x2="49.5"
+       xlink:href="#linearGradient7013"
+       y1="6.0625"
+       y2="0.18749996" />
+    <filter
+       inkscape:collect="always"
+       id="filter3759"
+       x="-0.084989584"
+       width="1.1699792"
+       y="-0.48208504"
+       height="1.9641701"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.60257583"
+         id="feGaussianBlur3761" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7134"
+       id="radialGradient6202"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6030658,0,0,0.772437,-13.404374,5.2151143)"
+       cx="22.989853"
+       cy="19.626234"
+       fx="22.989853"
+       fy="19.626234"
+       r="5.8947372" />
+    <linearGradient
+       id="linearGradient7134">
+      <stop
+         id="stop7136"
+         offset="0"
+         style="stop-color:#f0f0ee;stop-opacity:1" />
+      <stop
+         id="stop7138"
+         offset="1"
+         style="stop-color:#a1a196;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11307"
+       id="linearGradient6204"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0836401,0,0,1,-1.4628526,0)"
+       x1="22.405174"
+       y1="19.230879"
+       x2="22.405174"
+       y2="25.107412" />
+    <linearGradient
+       id="linearGradient11307"
+       inkscape:collect="always">
+      <stop
+         id="stop11309"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop11311"
+         offset="1"
+         style="stop-color:#3d3f3c;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7088"
+       id="radialGradient6206"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1709857,0,0,1.1709857,-13.208649,-9.3400963)"
+       cx="77.25"
+       cy="54.625004"
+       fx="77.25"
+       fy="54.625004"
+       r="5.125" />
+    <linearGradient
+       id="linearGradient7088"
+       inkscape:collect="always">
+      <stop
+         id="stop7090"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#c8c8c1;stop-opacity:1"
+         offset="0.63414639"
+         id="stop7096" />
+      <stop
+         id="stop7092"
+         offset="1"
+         style="stop-color:#d9d9d4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2401"
+       id="linearGradient6208"
+       gradientUnits="userSpaceOnUse"
+       x1="74.809799"
+       y1="55.235325"
+       x2="75.192665"
+       y2="59.013077" />
+    <linearGradient
+       id="linearGradient2401"
+       inkscape:collect="always">
+      <stop
+         id="stop2403"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop2405"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="linearGradient6210"
+       gradientUnits="userSpaceOnUse"
+       x1="77.114586"
+       y1="54.003254"
+       x2="77.114586"
+       y2="56.299889" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="linearGradient6212"
+       gradientUnits="userSpaceOnUse"
+       x1="73.414131"
+       y1="53.407055"
+       x2="74.435577"
+       y2="60.753109" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5046">
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.46707526"
+         inkscape:original="M 716.96875 181.4375 C 714.46819 181.4375 712.43749 183.48912 712.4375 186 C 
712.4375 187.41668 713.11279 188.66556 714.125 189.5 C 711.94045 190.29751 710.40625 191.96761 710.40625 
193.90625 C 710.40624 194.88 710.78135 195.79899 711.4375 196.5625 L 722.53125 196.5625 C 723.18737 195.79899 
723.5625 194.88 723.5625 193.90625 C 723.5625 191.96761 722.0283 190.29751 719.84375 189.5 C 720.85066 
188.66548 721.5 187.41238 721.5 186 C 721.5 183.48911 719.46934 181.4375 716.96875 181.4375 z "
+         
style="display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.902582;marker:none;enable-background:accumulate"
+         id="path5048"
+         transform="translate(-6,-3)" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter5063"
+       x="-0.22270509"
+       width="1.4454102"
+       y="-0.19540855"
+       height="1.3908171"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3078125"
+         id="feGaussianBlur5065" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7134"
+       id="radialGradient6230"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6030658,0,0,0.772437,-13.404374,5.2151143)"
+       cx="22.989853"
+       cy="19.626234"
+       fx="22.989853"
+       fy="19.626234"
+       r="5.8947372" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7088"
+       id="radialGradient6234"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1709857,0,0,1.1709857,-13.208649,-9.3400963)"
+       cx="77.25"
+       cy="54.625004"
+       fx="77.25"
+       fy="54.625004"
+       r="5.125" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11307"
+       id="linearGradient1104"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0836401,0,0,1,-1.4628526,0)"
+       x1="22.405174"
+       y1="19.230879"
+       x2="22.405174"
+       y2="25.107412" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2401"
+       id="linearGradient1106"
+       gradientUnits="userSpaceOnUse"
+       x1="74.809799"
+       y1="55.235325"
+       x2="75.192665"
+       y2="59.013077" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="linearGradient1108"
+       gradientUnits="userSpaceOnUse"
+       x1="77.114586"
+       y1="54.003254"
+       x2="77.114586"
+       y2="56.299889" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="linearGradient1110"
+       gradientUnits="userSpaceOnUse"
+       x1="73.414131"
+       y1="53.407055"
+       x2="74.435577"
+       y2="60.753109" />
+  </defs>
+  <g
+     id="g1150"
+     transform="translate(-1.4478454,-5.2080467)">
+    <rect
+       
style="display:inline;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3759);enable-background:new"
+       id="rect5129"
+       width="17.015991"
+       height="2.9998484"
+       x="304.98401"
+       y="195"
+       rx="1.4999242"
+       ry="1.4999242"
+       transform="matrix(0.2077338,0,0,0.26458334,-61.29379,-42.452451)" />
+    <g
+       transform="matrix(0.26458334,0,0,0.26458334,1.726964,5.6549445)"
+       inkscape:label="Layer 1"
+       id="use4942"
+       style="display:inline;enable-background:new">
+      <g
+         style="display:inline;enable-background:new"
+         id="g6188"
+         transform="matrix(1.1014872,0,0,1.0613236,-17.845915,-11.468757)">
+        <path
+           id="path6190"
+           d="m 23.449876,18.342249 c -3.296388,0 -5.960021,2.072 -5.960021,4.625 0,0.917484 
0.326987,1.780602 0.922681,2.5 h 10.074679 c 0.595694,-0.719398 0.922682,-1.582516 0.922682,-2.5 0,-2.553 
-2.663633,-4.625 -5.960021,-4.625 z"
+           
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient6202);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1104);stroke-width:0.834782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccc"
+           id="path6192"
+           d="m 18.161425,23.87563 c -1.911925,-6.294746 11.927092,-7.310199 10.786577,0 0.188277,-4.464615 
-11.120195,-4.757192 -10.786577,0 z"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:type="inkscape:offset"
+           inkscape:radius="-0.85675496"
+           inkscape:original="M 23.4375 18.34375 C 20.141111 18.34375 17.5 20.41575 17.5 22.96875 C 17.5 
23.886234 17.810556 24.749352 18.40625 25.46875 L 28.5 25.46875 C 29.095694 24.749352 29.40625 23.886234 
29.40625 22.96875 C 29.40625 20.41575 26.733888 18.34375 23.4375 18.34375 z "
+           
style="display:inline;overflow:visible;visibility:visible;opacity:0.424242;fill:none;stroke:#ffffff;stroke-width:0.835168;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="path6194"
+           d="m 23.4375,19.201172 c -1.468685,0 -2.772574,0.467203 -3.677734,1.173828 -0.905161,0.706625 
-1.402344,1.612691 -1.402344,2.59375 0,0.608945 0.26078,1.138829 0.595703,1.642578 h 9 c 0.334923,-0.503749 
0.595703,-1.033633 0.595703,-1.642578 0,-0.977563 -0.502594,-1.883881 -1.416016,-2.591797 -0.913421,-0.707916 
-2.226627,-1.175781 -3.695312,-1.175781 z" />
+        <circle
+           transform="matrix(0.8892163,0,0,0.9266773,-45.24438,-36.492579)"
+           id="path6196"
+           
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient6206);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1106);stroke-width:0.919613;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           cx="77.25"
+           cy="56.125"
+           r="4.625" />
+        <ellipse
+           transform="matrix(1.1827564,0,0,1.2888626,-67.743988,-56.551959)"
+           id="path6198"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:url(#linearGradient1108);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+           cx="77.0625"
+           cy="54.5"
+           rx="2.25"
+           ry="1.1875" />
+        <circle
+           transform="matrix(0.7070395,0,0,0.7368964,-31.17122,-25.841128)"
+           id="path6200"
+           
style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient1110);stroke-width:1.15651;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           cx="77.25"
+           cy="56.125"
+           r="4.625" />
+      </g>
+    </g>
+    <rect
+       
style="display:inline;opacity:0.8;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3759);enable-background:new"
+       id="rect5127"
+       width="17.015991"
+       height="2.9998484"
+       x="304.98401"
+       y="195"
+       rx="1.4999242"
+       ry="1.4999242"
+       transform="matrix(0.2077338,0,0,0.26458334,-59.70629,-41.658701)" />
+    <path
+       
style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.902582;marker:none;filter:url(#filter5063);enable-background:accumulate"
+       clip-path="url(#clipPath5046)"
+       d="m 715.96875,181.96875 c -2.75604,0 -5.00001,2.26853 -5,5.03125 0,1.32254 0.60229,2.45435 
1.4375,3.34375 -2.01198,0.92136 -3.46875,2.56653 -3.46875,4.5625 -10e-6,1.0937 0.4367,2.13147 1.15625,2.96875 
0.0875,0.0981 0.21228,0.15486 0.34375,0.15625 h 11.09375 c 0.13147,-0.001 0.25626,-0.0581 0.34375,-0.15625 
0.71951,-0.83728 1.15625,-1.87504 1.15625,-2.96875 0,-1.99597 -1.45677,-3.64114 -3.46875,-4.5625 
0.82786,-0.89245 1.40625,-2.02874 1.40625,-3.34375 0,-2.76272 -2.24394,-5.03125 -5,-5.03125 z"
+       id="path5040"
+       sodipodi:nodetypes="cscssccsscsc"
+       transform="matrix(0.26458334,0,0,0.26458334,-184.27512,-41.44089)"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(0.26458334,0,0,0.26458334,3.3144641,6.4486945)"
+       inkscape:label="Layer 1"
+       id="use5280"
+       style="display:inline;enable-background:new">
+      <g
+         style="display:inline;enable-background:new"
+         id="g6216"
+         transform="matrix(1.1014872,0,0,1.0613236,-17.845915,-11.468757)">
+        <path
+           id="path6218"
+           d="m 23.449876,18.342249 c -3.296388,0 -5.960021,2.072 -5.960021,4.625 0,0.917484 
0.326987,1.780602 0.922681,2.5 h 10.074679 c 0.595694,-0.719398 0.922682,-1.582516 0.922682,-2.5 0,-2.553 
-2.663633,-4.625 -5.960021,-4.625 z"
+           
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient6230);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6204);stroke-width:0.834782;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccc"
+           id="path6220"
+           d="m 18.161425,23.87563 c -1.911925,-6.294746 11.927092,-7.310199 10.786577,0 0.188277,-4.464615 
-11.120195,-4.757192 -10.786577,0 z"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:type="inkscape:offset"
+           inkscape:radius="-0.85675496"
+           inkscape:original="M 23.4375 18.34375 C 20.141111 18.34375 17.5 20.41575 17.5 22.96875 C 17.5 
23.886234 17.810556 24.749352 18.40625 25.46875 L 28.5 25.46875 C 29.095694 24.749352 29.40625 23.886234 
29.40625 22.96875 C 29.40625 20.41575 26.733888 18.34375 23.4375 18.34375 z "
+           
style="display:inline;overflow:visible;visibility:visible;opacity:0.424242;fill:none;stroke:#ffffff;stroke-width:0.835168;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="path6222"
+           d="m 23.4375,19.201172 c -1.468685,0 -2.772574,0.467203 -3.677734,1.173828 -0.905161,0.706625 
-1.402344,1.612691 -1.402344,2.59375 0,0.608945 0.26078,1.138829 0.595703,1.642578 h 9 c 0.334923,-0.503749 
0.595703,-1.033633 0.595703,-1.642578 0,-0.977563 -0.502594,-1.883881 -1.416016,-2.591797 -0.913421,-0.707916 
-2.226627,-1.175781 -3.695312,-1.175781 z" />
+        <circle
+           transform="matrix(0.8892163,0,0,0.9266773,-45.24438,-36.492579)"
+           id="path6224"
+           
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient6234);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6208);stroke-width:0.919613;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           cx="77.25"
+           cy="56.125"
+           r="4.625" />
+        <ellipse
+           transform="matrix(1.1827564,0,0,1.2888626,-67.743988,-56.551959)"
+           id="path6226"
+           
style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:url(#linearGradient6210);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+           cx="77.0625"
+           cy="54.5"
+           rx="2.25"
+           ry="1.1875" />
+        <circle
+           transform="matrix(0.7070395,0,0,0.7368964,-31.17122,-25.841128)"
+           id="path6228"
+           
style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient6212);stroke-width:1.15651;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+           cx="77.25"
+           cy="56.125"
+           r="4.625" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/hicolor_categories_24x24_preferences-mail.svg 
b/data/icons/hicolor_categories_24x24_preferences-mail.svg
new file mode 100644
index 0000000000..52c29bb4a6
--- /dev/null
+++ b/data/icons/hicolor_categories_24x24_preferences-mail.svg
@@ -0,0 +1,431 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg1580"
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:svg="http://www.w3.org/2000/svg";>
+  <defs
+     id="defs1577">
+    <radialGradient
+       cx="11.092737"
+       cy="18.597048"
+       fx="11.092737"
+       fy="18.597048"
+       gradientTransform="matrix(1,0,0,0.2469636,0,14.004255)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11811"
+       r="10.915961"
+       xlink:href="#linearGradient7440" />
+    <linearGradient
+       id="linearGradient7440">
+      <stop
+         id="stop7442"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7444"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11813"
+       x1="35.310661"
+       x2="33.536613"
+       xlink:href="#linearGradient6964"
+       y1="16.222532"
+       y2="4.7902908" />
+    <linearGradient
+       id="linearGradient6964">
+      <stop
+         id="stop6966"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+      <stop
+         id="stop6968"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30,1)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11815"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient7440"
+       y1="4.7506509"
+       y2="1.75" />
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11817"
+       x1="38"
+       x2="38"
+       xlink:href="#linearGradient8718"
+       y1="9.7488794"
+       y2="11.492249" />
+    <linearGradient
+       id="linearGradient8718">
+      <stop
+         id="stop8720"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+      <stop
+         id="stop8722"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11819"
+       x1="41.96875"
+       x2="41.96875"
+       xlink:href="#linearGradient6934"
+       y1="6.7255816"
+       y2="12.34375" />
+    <linearGradient
+       id="linearGradient6934">
+      <stop
+         id="stop6936"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop6938"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11821"
+       x1="36.21875"
+       x2="36.96875"
+       xlink:href="#linearGradient7013"
+       y1="9.71875"
+       y2="11.688599" />
+    <linearGradient
+       id="linearGradient7013">
+      <stop
+         id="stop7015"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7017"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11823"
+       x1="42.8125"
+       x2="41"
+       xlink:href="#linearGradient6981"
+       y1="6"
+       y2="-0.12500003" />
+    <linearGradient
+       id="linearGradient6981">
+      <stop
+         id="stop6983"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6985"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11825"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient6926"
+       y1="4.75"
+       y2="1.4357522" />
+    <linearGradient
+       id="linearGradient6926">
+      <stop
+         id="stop6928"
+         offset="0"
+         style="stop-color:#a3a5a1;stop-opacity:1;" />
+      <stop
+         id="stop6930"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11827"
+       x1="37.21875"
+       x2="37.21875"
+       xlink:href="#linearGradient7013"
+       y1="4.65625"
+       y2="0.96384674" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11829"
+       x1="49.5"
+       x2="49.5"
+       xlink:href="#linearGradient7013"
+       y1="6.0625"
+       y2="0.18749996" />
+  </defs>
+  <g
+     id="layer1">
+    <g
+       id="g22"
+       style="display:inline;enable-background:new"
+       transform="matrix(0.26458333,0,0,0.26458333,0.52801615,-0.05787756)">
+      <g
+         id="g8396"
+         transform="translate(-1,40)">
+        <ellipse
+           id="path6775"
+           style="opacity:0.2;fill:url(#radialGradient11811);fill-opacity:1;fill-rule:evenodd;stroke:none"
+           transform="matrix(1.0997059,0,0,1.1128234,-1.1944,-42.69523)"
+           cx="11.092737"
+           cy="18.597048"
+           rx="10.915961"
+           ry="2.6958447" />
+        <g
+           id="g6777"
+           transform="translate(0,-76)">
+          <g
+             id="g6779"
+             transform="translate(0,41)">
+            <rect
+               height="12.999999"
+               id="rect6781"
+               rx="1.4416946"
+               ry="1.4416946"
+               
style="fill:url(#linearGradient11813);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+               width="19"
+               x="1.5"
+               y="0.49999997" />
+            <path
+               d="m 2,2 7.5,7.5 h 3 L 20,2 Z"
+               id="path6783"
+               
style="opacity:0.106061;fill:none;stroke:url(#linearGradient11815);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
 />
+            <path
+               d="M 8.5,6.5 2,13 H 20 L 13.5,6.5 Z"
+               id="path6785"
+               
style="fill:url(#linearGradient11817);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11819);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
 />
+            <path
+               id="path6787"
+               
style="fill:none;stroke:url(#linearGradient11821);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+               transform="translate(-30)"
+               d="m 38.925781,7.53125 -6.4375,6.4375 h 17.023438 l -6.439453,-6.4375 z" />
+            <path
+               d="m 2,1 7.5,7.5 h 3 L 20,1 Z"
+               id="path6789"
+               
style="fill:url(#linearGradient11823);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient11825);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
 />
+            <path
+               id="path6791"
+               
style="fill:none;stroke:url(#linearGradient11827);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+               transform="translate(-30)"
+               d="m 31.261719,-1.0625 8.626953,8.625 h 2.222656 l 8.626953,-8.625 z" />
+            <path
+               id="path6793"
+               
style="opacity:0.810606;fill:none;stroke:url(#linearGradient11829);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.7;stroke-opacity:1"
+               transform="translate(-30)"
+               d="m 32.5,1.5 v 11 h 17 v -11 z" />
+          </g>
+          <g
+             id="g6795"
+             transform="matrix(1,0,0,-1,0,96)">
+            <rect
+               height="1"
+               id="rect6797"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="4"
+               y="43" />
+            <rect
+               height="1"
+               id="rect6799"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="5"
+               y="44" />
+            <rect
+               height="1"
+               id="rect6801"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="6"
+               y="45" />
+            <rect
+               height="1"
+               id="rect6803"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="7"
+               y="46" />
+            <rect
+               height="1"
+               id="rect6805"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="3"
+               y="42" />
+          </g>
+          <g
+             id="g6807"
+             transform="rotate(180,11,48)">
+            <rect
+               height="1"
+               id="rect6809"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="4"
+               y="43" />
+            <rect
+               height="1"
+               id="rect6811"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="5"
+               y="44" />
+            <rect
+               height="1"
+               id="rect6813"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="6"
+               y="45" />
+            <rect
+               height="1"
+               id="rect6815"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="7"
+               y="46" />
+            <rect
+               height="1"
+               id="rect6817"
+               style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               width="1"
+               x="3"
+               y="42" />
+          </g>
+          <g
+             id="g6819">
+            <g
+               id="g6821">
+              <rect
+                 height="1"
+                 id="rect6823"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="4"
+                 y="43" />
+              <rect
+                 height="1"
+                 id="rect6825"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="5"
+                 y="44" />
+              <rect
+                 height="1"
+                 id="rect6827"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="6"
+                 y="45" />
+              <rect
+                 height="1"
+                 id="rect6829"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="7"
+                 y="46" />
+              <rect
+                 height="1"
+                 id="rect6831"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="8"
+                 y="47" />
+              <rect
+                 height="1"
+                 id="rect327"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="9"
+                 y="48" />
+              <rect
+                 height="1"
+                 id="rect6835"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="3"
+                 y="42" />
+            </g>
+            <g
+               id="g6837"
+               transform="matrix(-1,0,0,1,22,0)">
+              <rect
+                 height="1"
+                 id="rect6839"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="4"
+                 y="43" />
+              <rect
+                 height="1"
+                 id="rect6841"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="5"
+                 y="44" />
+              <rect
+                 height="1"
+                 id="rect6843"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="6"
+                 y="45" />
+              <rect
+                 height="1"
+                 id="rect6845"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="7"
+                 y="46" />
+              <rect
+                 height="1"
+                 id="rect6847"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="8"
+                 y="47" />
+              <rect
+                 height="1"
+                 id="rect6849"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="9"
+                 y="48" />
+              <rect
+                 height="1"
+                 id="rect6851"
+                 style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+                 width="1"
+                 x="3"
+                 y="42" />
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/data/icons/hicolor_categories_24x24_preferences-system-network-proxy.svg 
b/data/icons/hicolor_categories_24x24_preferences-system-network-proxy.svg
new file mode 100644
index 0000000000..bc619be852
--- /dev/null
+++ b/data/icons/hicolor_categories_24x24_preferences-system-network-proxy.svg
@@ -0,0 +1,1513 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="24"
+   height="24"
+   viewBox="0 0 6.3499999 6.3500002"
+   version="1.1"
+   id="svg1580"
+   sodipodi:docname="hicolor_categories_24x24_preferences-system-network-proxy.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:svg="http://www.w3.org/2000/svg";>
+  <sodipodi:namedview
+     id="namedview77"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="11.96189"
+     inkscape:cx="-2.0481713"
+     inkscape:cy="17.095961"
+     inkscape:window-width="1600"
+     inkscape:window-height="869"
+     inkscape:window-x="40"
+     inkscape:window-y="1050"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1580" />
+  <defs
+     id="defs1577">
+    <radialGradient
+       cx="11.092737"
+       cy="18.597048"
+       fx="11.092737"
+       fy="18.597048"
+       gradientTransform="matrix(1,0,0,0.2469636,0,14.004255)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient11811"
+       r="10.915961"
+       xlink:href="#linearGradient7440" />
+    <linearGradient
+       id="linearGradient7440">
+      <stop
+         id="stop7442"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop7444"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11813"
+       x1="35.310661"
+       x2="33.536613"
+       xlink:href="#linearGradient6964"
+       y1="16.222532"
+       y2="4.7902908" />
+    <linearGradient
+       id="linearGradient6964">
+      <stop
+         id="stop6966"
+         offset="0"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+      <stop
+         id="stop6968"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30,1)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11815"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient7440"
+       y1="4.7506509"
+       y2="1.75" />
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11817"
+       x1="38"
+       x2="38"
+       xlink:href="#linearGradient8718"
+       y1="9.7488794"
+       y2="11.492249" />
+    <linearGradient
+       id="linearGradient8718">
+      <stop
+         id="stop8720"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+      <stop
+         id="stop8722"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11819"
+       x1="41.96875"
+       x2="41.96875"
+       xlink:href="#linearGradient6934"
+       y1="6.7255816"
+       y2="12.34375" />
+    <linearGradient
+       id="linearGradient6934">
+      <stop
+         id="stop6936"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop6938"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11821"
+       x1="36.21875"
+       x2="36.96875"
+       xlink:href="#linearGradient7013"
+       y1="9.71875"
+       y2="11.688599" />
+    <linearGradient
+       id="linearGradient7013">
+      <stop
+         id="stop7015"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop7017"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11823"
+       x1="42.8125"
+       x2="41"
+       xlink:href="#linearGradient6981"
+       y1="6"
+       y2="-0.12500003" />
+    <linearGradient
+       id="linearGradient6981">
+      <stop
+         id="stop6983"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop6985"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-30)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11825"
+       x1="40.28125"
+       x2="40.28125"
+       xlink:href="#linearGradient6926"
+       y1="4.75"
+       y2="1.4357522" />
+    <linearGradient
+       id="linearGradient6926">
+      <stop
+         id="stop6928"
+         offset="0"
+         style="stop-color:#a3a5a1;stop-opacity:1;" />
+      <stop
+         id="stop6930"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11827"
+       x1="37.21875"
+       x2="37.21875"
+       xlink:href="#linearGradient7013"
+       y1="4.65625"
+       y2="0.96384674" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11829"
+       x1="49.5"
+       x2="49.5"
+       xlink:href="#linearGradient7013"
+       y1="6.0625"
+       y2="0.18749996" />
+    <linearGradient
+       id="linearGradient7134">
+      <stop
+         id="stop7136"
+         offset="0"
+         style="stop-color:#f0f0ee;stop-opacity:1" />
+      <stop
+         id="stop7138"
+         offset="1"
+         style="stop-color:#a1a196;stop-opacity:1" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath5046">
+      <path
+         sodipodi:type="inkscape:offset"
+         inkscape:radius="0.46707526"
+         inkscape:original="M 716.96875 181.4375 C 714.46819 181.4375 712.43749 183.48912 712.4375 186 C 
712.4375 187.41668 713.11279 188.66556 714.125 189.5 C 711.94045 190.29751 710.40625 191.96761 710.40625 
193.90625 C 710.40624 194.88 710.78135 195.79899 711.4375 196.5625 L 722.53125 196.5625 C 723.18737 195.79899 
723.5625 194.88 723.5625 193.90625 C 723.5625 191.96761 722.0283 190.29751 719.84375 189.5 C 720.85066 
188.66548 721.5 187.41238 721.5 186 C 721.5 183.48911 719.46934 181.4375 716.96875 181.4375 z "
+         
style="display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.902582;marker:none;enable-background:accumulate"
+         id="path5048"
+         transform="translate(-6,-3)" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter9830"
+       x="-0.068033474"
+       width="1.1360669"
+       y="-0.50812501"
+       height="2.01625">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.4234375"
+         id="feGaussianBlur9832" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="linearGradient14677"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.8400265,0,0,0.2235366,300.03741,105.21509)"
+       x1="0.61210024"
+       y1="372.57819"
+       x2="5.0856376"
+       y2="372.57819" />
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         id="stop3941"
+         offset="0.0000000"
+         style="stop-color:#474747;stop-opacity:0.0000000;" />
+      <stop
+         id="stop3943"
+         offset="0.06732955"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop3945"
+         offset="0.92130679"
+         style="stop-color:#2e3436;stop-opacity:1" />
+      <stop
+         id="stop3947"
+         offset="1.0000000"
+         style="stop-color:#474747;stop-opacity:0.0000000;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient272-8"
+       id="linearGradient14679"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.8400269,0,0,0.2235361,300.03744,111.1348)"
+       x1="0.61209124"
+       y1="372.57819"
+       x2="5.0856328"
+       y2="372.57819" />
+    <linearGradient
+       id="linearGradient272-8">
+      <stop
+         style="stop-color:#474747;stop-opacity:0.0000000;"
+         offset="0.0000000"
+         id="stop273-7" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="0.06590912"
+         id="stop275-0" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="0.92840904"
+         id="stop276-8" />
+      <stop
+         style="stop-color:#474747;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop274-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10704"
+       id="linearGradient14681"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6235926,0,0,0.09123576,300.03741,176.75)"
+       x1="1.6422368"
+       y1="117.8271"
+       x2="15.343062"
+       y2="117.8271" />
+    <linearGradient
+       id="linearGradient10704">
+      <stop
+         id="stop10706"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
+      <stop
+         id="stop10708"
+         offset="0.07785367"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop10710"
+         offset="0.92053902"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop10712"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4734"
+       id="radialGradient4732"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.26815147,-0.04875601,0.12807273,0.32433936,263.87447,165.22825)"
+       cx="157.59206"
+       cy="69.233994"
+       fx="157.59206"
+       fy="69.233994"
+       r="52" />
+    <linearGradient
+       id="linearGradient4734"
+       inkscape:collect="always">
+      <stop
+         id="stop4736"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop4738"
+         offset="1"
+         style="stop-color:#555753;stop-opacity:1" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath10264-2">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         id="path10266-6"
+         d="M 112.28125,44 96.625,69.65625 96.4375,70 C 96.159959,70.52402 96,71.11349 96,71.75 v 192.5 c 
0,2.0775 1.6725,3.75 3.75,3.75 h 96.5 c 2.0775,0 3.75,-1.6725 3.75,-3.75 V 71.75 c 0,-0.63651 
-0.15996,-1.22598 -0.4375,-1.75 L 199.375,69.65625 183.71875,44 Z"
+         
style="display:inline;overflow:visible;visibility:visible;fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;enable-background:new"
 />
+    </clipPath>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10237-4"
+       id="radialGradient9564-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1452109,-0.5748075,1.0245814,3.8237894,-257.00405,-106.57205)"
+       cx="161.5"
+       cy="70.323822"
+       fx="161.5"
+       fy="70.323822"
+       r="52" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10237-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop10239-9" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop10241-5" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="radialGradient9566-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.572556,0,0,0.235038,-232.7383,43.602831)"
+       cx="137.00539"
+       cy="57.000008"
+       fx="137.00539"
+       fy="57.000008"
+       r="49.058216" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter10291-1"
+       x="-0.031941382"
+       y="-0.12156209"
+       width="1.0638828"
+       height="1.2431242">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.31736217"
+         id="feGaussianBlur10293-7" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10400-7"
+       id="linearGradient9568-2"
+       gradientUnits="userSpaceOnUse"
+       x1="93.341888"
+       y1="75.141579"
+       x2="198.31531"
+       y2="256.96088"
+       gradientTransform="matrix(1,0,0,0.94315757,0,15.23377)" />
+    <linearGradient
+       id="linearGradient10400-7">
+      <stop
+         id="stop10402-2"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1" />
+      <stop
+         id="stop10404-2"
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="linearGradient9572-6"
+       gradientUnits="userSpaceOnUse"
+       x1="135.5"
+       y1="256.02737"
+       x2="135.5"
+       y2="194.23477" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter10388-1"
+       x="-0.10254807"
+       width="1.2050961"
+       y="-0.14461017"
+       height="1.2892203">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="4.44375"
+         id="feGaussianBlur10390-5" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="radialGradient9574-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.760746,1.0451854,-0.2885048,1.8661835,-804.1216,-300.20626)"
+       cx="148"
+       cy="168"
+       fx="148"
+       fy="168"
+       r="50" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter10359-9"
+       x="-0.042597525"
+       y="-0.021085775"
+       width="1.0851951"
+       height="1.0421715">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.7525"
+         id="feGaussianBlur10361-1" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="radialGradient9576-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2830296,0,0,4.6524935,-41.888376,-240.03746)"
+       cx="148"
+       cy="69.875"
+       fx="148"
+       fy="69.875"
+       r="52" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="radialGradient9578-7-0-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.20072115,3.2484529e-7,-1.0576923e-8,0.41826921,284.79327,121.04081)"
+       cx="148"
+       cy="156.5"
+       fx="148"
+       fy="156.5"
+       r="52" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7013"
+       id="radialGradient9578-7-0-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.20072115,3.2484529e-7,-1.0576923e-8,0.41826921,284.79327,126.04081)"
+       cx="148"
+       cy="156.5"
+       fx="148"
+       fy="156.5"
+       r="52" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient9558"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9552">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop9554" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:0;"
+         offset="1"
+         id="stop9556" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3485"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3493"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3501"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3509"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3517"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3525"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3533"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3541"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3549"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3557"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3565"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3573"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3581"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3589"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3597"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3605"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3613"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3621"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3629"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3637"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3645"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3653"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10624-8"
+       id="linearGradient9638"
+       gradientUnits="userSpaceOnUse"
+       x1="319.52969"
+       y1="62.146957"
+       x2="323.01935"
+       y2="62.146957"
+       gradientTransform="matrix(0.59999996,0,0,0.66666675,122.40004,142.16666)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10624-8">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop10626-2" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop10628-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10604-6"
+       id="linearGradient9633"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.40000002,0,0,0.66666667,188.1,143.16667)"
+       x1="328.71875"
+       y1="64.3125"
+       x2="319.33331"
+       y2="62" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10604-6">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="0"
+         id="stop10606-3" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop10608-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10616-0"
+       id="linearGradient9635"
+       gradientUnits="userSpaceOnUse"
+       x1="326.65625"
+       y1="63.5625"
+       x2="325.9375"
+       y2="61.4375"
+       gradientTransform="matrix(0.66666603,0,0,0.66666667,100.50021,142.5)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient10616-0">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop10618-5" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop10620-7" />
+    </linearGradient>
+    <linearGradient
+       y2="62.146957"
+       x2="323.01935"
+       y1="62.146957"
+       x1="319.52969"
+       gradientTransform="matrix(0.59999996,0,0,0.66666675,122.40004,147.16666)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9666"
+       xlink:href="#linearGradient10624-8"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10604-6"
+       id="linearGradient9633-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.40000002,0,0,0.66666667,188.1,148.16667)"
+       x1="328.71875"
+       y1="64.3125"
+       x2="319.33331"
+       y2="62" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10616-0"
+       id="linearGradient9635-1"
+       gradientUnits="userSpaceOnUse"
+       x1="326.65625"
+       y1="63.5625"
+       x2="325.9375"
+       y2="61.4375"
+       gradientTransform="matrix(0.66666603,0,0,0.66666667,100.50021,147.5)" />
+    <linearGradient
+       y2="64.502014"
+       x2="314.5625"
+       y1="61.0625"
+       x1="314.5625"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9733"
+       xlink:href="#linearGradient9552"
+       inkscape:collect="always"
+       gradientTransform="matrix(1,0,0,0.75,-1,137)" />
+    <linearGradient
+       y2="64.502014"
+       x2="314.5625"
+       y1="61.0625"
+       x1="314.5625"
+       gradientTransform="matrix(1,0,0,0.75,-1,142)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9793"
+       xlink:href="#linearGradient9552"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3763"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3765"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3767"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3769"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3771"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3773"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3775"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3777"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3779"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3781"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3783"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3785"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3789"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3791"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3793"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3795"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3797"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3801"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3803"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="radialGradient3805"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6004132,0,0,1.0002582,-188.82994,-3.5515031)"
+       cx="314.5"
+       cy="199.49998"
+       fx="314.5"
+       fy="199.49998"
+       r="5.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="linearGradient1424"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.75,-1,137)"
+       x1="314.5625"
+       y1="61.0625"
+       x2="314.5625"
+       y2="64.502014" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9552"
+       id="linearGradient1426"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.75,-1,142)"
+       x1="314.5625"
+       y1="61.0625"
+       x2="314.5625"
+       y2="64.502014" />
+  </defs>
+  <g
+     id="g3409"
+     style="display:inline;enable-background:new"
+     transform="matrix(0.26458334,0,0,0.26458334,-79.904168,-46.577086)">
+    <rect
+       style="opacity:0.5;fill:#000000;stroke:none;filter:url(#filter9830)"
+       id="rect9824"
+       width="14.9375"
+       height="2"
+       x="307"
+       y="196"
+       rx="1.6201254"
+       ry="0.4243744"
+       transform="matrix(1.0264126,0,0,0.78301305,-8.3059642,43.246435)" />
+    <g
+       id="g14668"
+       transform="matrix(1.0160706,0,0,1,-4.8693944,2)">
+      <rect
+         
style="display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient14677);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         id="rect8661"
+         width="21.652037"
+         height="1"
+         x="303"
+         y="188" />
+      <rect
+         
style="display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient14679);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         id="rect8663"
+         width="21.652039"
+         height="1"
+         x="303"
+         y="186" />
+      <rect
+         
style="display:block;overflow:visible;visibility:visible;fill:url(#linearGradient14681);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none"
+         id="rect8665"
+         width="21.65204"
+         height="1"
+         x="303"
+         y="187" />
+      <g
+         transform="translate(-5.44165)"
+         id="g14661">
+        <g
+           style="fill:#ffffff;fill-opacity:0.720238"
+           id="g8673"
+           transform="matrix(0.544365,0,0,0.9411763,300.19957,148.29661)" />
+      </g>
+    </g>
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#888a85;fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+       id="rect4719"
+       width="5"
+       height="3.9999998"
+       x="305.5"
+       y="187.49998"
+       rx="1.9999999"
+       ry="1.9999999" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="1"
+       inkscape:original="M 310.03125 178 L 308.0625 180.1875 L 308.0625 180.21875 C 308.0278 180.26315 308 
180.28971 308 180.34375 L 308 196.6875 C 308 196.86372 308.20906 197 308.46875 197 L 320.53125 197 C 
320.79093 197 321 196.86372 321 196.6875 L 321 180.34375 C 321 180.28975 320.9722 180.2632 320.9375 180.21875 
L 320.9375 180.1875 L 318.96875 178 L 310.03125 178 z "
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient4732);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;enable-background:new"
+       id="path4730"
+       d="m 310.03125,177 a 1.0001,1.0001 0 0 0 -0.74414,0.33008 l -1.96875,2.1875 a 1.0001,1.0001 0 0 0 
-0.14063,0.36914 l 0.0977,-0.2832 c 0.003,-0.004 -0.0387,0.0304 -0.11719,0.1621 -0.0785,0.13174 
-0.1582,0.37963 -0.1582,0.57813 v 16.34375 c 0,0.48356 0.30075,0.86911 0.58398,1.05664 0.28324,0.18753 
0.58,0.25586 0.88477,0.25586 h 12.0625 c 0.30477,0 0.60154,-0.0683 0.88477,-0.25586 C 321.69924,197.55662 
322,197.17108 322,196.6875 v -16.34375 c 0,-0.1986 -0.0798,-0.44654 -0.1582,-0.57813 -0.0784,-0.13158 
-0.11817,-0.16586 -0.11524,-0.1621 l 0.10547,0.31054 a 1.0001,1.0001 0 0 0 -0.15039,-0.39648 l 
-1.96875,-2.1875 A 1.0001,1.0001 0 0 0 318.96875,177 Z" />
+    <g
+       style="display:inline;enable-background:new"
+       id="g9467-6"
+       clip-path="url(#clipPath10264-2)"
+       transform="matrix(0.12500005,0,0,0.08482145,295.99999,174.26785)">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         id="path9469-5"
+         d="M 112.28125,44 96.625,69.65625 96.4375,70 C 96.159959,70.52402 96,71.11349 96,71.75 v 192.5 c 
0,2.0775 1.6725,3.75 3.75,3.75 h 96.5 c 2.0775,0 3.75,-1.6725 3.75,-3.75 V 71.75 c 0,-0.63651 
-0.15996,-1.22598 -0.4375,-1.75 L 199.375,69.65625 183.71875,44 Z"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient9564-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;enable-background:new"
 />
+      <path
+         
style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#radialGradient9566-0);stroke-width:4.79789;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter10291-1);enable-background:new"
+         d="m 113.74986,44 h 68.50029 l 15.22229,26 H 98.527574 Z"
+         id="path9471-6"
+         sodipodi:nodetypes="ccccc" />
+      <rect
+         ry="3.5368409"
+         rx="3.75"
+         y="79.368484"
+         x="96"
+         height="188.63152"
+         width="104"
+         id="rect9473-3"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9568-2);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;enable-background:new"
 />
+      <path
+         
style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:url(#linearGradient9572-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;filter:url(#filter10388-1);enable-background:new"
+         d="m 96,194.25 v 70 c 0,2.0775 1.6725,3.75 3.75,3.75 h 96.5 c 2.0775,0 3.75,-1.6725 3.75,-3.75 v 
-70 z"
+         id="path9479-9"
+         sodipodi:nodetypes="ccccccc"
+         transform="matrix(0.9519231,0,0,0.6671773,7.1153846,87.423643)" />
+      <rect
+         ry="3.75"
+         rx="3.5697117"
+         y="68"
+         x="98.5"
+         height="200"
+         width="99"
+         id="rect9481-4"
+         
style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#radialGradient9574-9);stroke-width:4.82231;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;filter:url(#filter10359-9);enable-background:new"
+         transform="matrix(0.989899,0,0,1,1.4949495,0)" />
+      <path
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient9576-7);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;enable-background:new"
+         d="m 99.75,67.163628 c -2.0775,0 -3.75,10.408419 -3.75,23.337258 v 12.446544 c 0,-12.928848 
1.6725,-23.337261 3.75,-23.337261 h 96.5 c 2.0775,0 3.75,10.408413 3.75,23.337261 V 90.500886 c 0,-12.928839 
-1.6725,-23.337258 -3.75,-23.337258 z"
+         id="path9483-8" />
+    </g>
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-0.5"
+       inkscape:original="M 310.03125 178 L 308.0625 180.1875 L 308.0625 180.21875 C 308.0278 180.26315 308 
180.28971 308 180.34375 L 308 196.6875 C 308 196.86372 308.20906 197 308.46875 197 L 320.53125 197 C 
320.79093 197 321 196.86372 321 196.6875 L 321 180.34375 C 321 180.28975 320.9722 180.2632 320.9375 180.21875 
L 320.9375 180.1875 L 318.96875 178 L 310.03125 178 z "
+       
style="display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:new"
+       id="path4730-0"
+       d="m 310.25391,178.5 -1.69141,1.87891 v -0.16016 A 0.50005,0.50005 0 0 1 308.5,180.40234 V 196.5 h 12 
v -16.09766 a 0.50005,0.50005 0 0 1 -0.0625,-0.18359 v 0.16016 L 318.74609,178.5 Z" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       id="rect9487-4-1-9"
+       width="13"
+       height="1"
+       x="308"
+       y="185" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:url(#radialGradient9578-7-0-4);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       id="rect9489-8-4-5"
+       width="13"
+       height="1"
+       x="308"
+       y="186" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       id="rect9487-4-1-9-4"
+       width="13"
+       height="1"
+       x="308"
+       y="190" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:url(#radialGradient9578-7-0-4-7);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       id="rect9489-8-4-5-4"
+       width="13"
+       height="1"
+       x="308"
+       y="191" />
+    <g
+       id="g9528"
+       style="fill:url(#radialGradient9558);fill-opacity:1">
+      <rect
+         y="192"
+         x="309"
+         height="1"
+         width="1"
+         id="rect11088-3"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3763);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="193"
+         x="310"
+         height="1"
+         width="1"
+         id="rect11090-0"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3765);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="194"
+         x="309"
+         height="1"
+         width="1"
+         id="rect11092-0"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3767);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="195"
+         x="310"
+         height="1"
+         width="1"
+         id="rect11094-4"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3769);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="192"
+         x="311"
+         height="1"
+         width="1"
+         id="rect11140-6"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3771);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="193"
+         x="312"
+         height="1"
+         width="1"
+         id="rect11142-3"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3773);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="194"
+         x="311"
+         height="1"
+         width="1"
+         id="rect11144-9"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3775);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="195"
+         x="312"
+         height="1"
+         width="1"
+         id="rect11146-3"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3777);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="192"
+         x="313"
+         height="1"
+         width="1"
+         id="rect11172-2"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3779);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="193"
+         x="314"
+         height="1"
+         width="1"
+         id="rect11174-8"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3781);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="194"
+         x="313"
+         height="1"
+         width="1"
+         id="rect11176-1"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3783);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="195"
+         x="314"
+         height="1"
+         width="1"
+         id="rect11178-2"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3785);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="192"
+         x="315"
+         height="1"
+         width="1"
+         id="rect11204-5"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3787);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="193"
+         x="316"
+         height="1"
+         width="1"
+         id="rect11206-3"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3789);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="194"
+         x="315"
+         height="1"
+         width="1"
+         id="rect11208-7"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3791);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="195"
+         x="316"
+         height="1"
+         width="1"
+         id="rect11210-6"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3793);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="192"
+         x="317"
+         height="1"
+         width="1"
+         id="rect11236-9"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3795);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="193"
+         x="318"
+         height="1"
+         width="1"
+         id="rect11238-9"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3797);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="194"
+         x="317"
+         height="1"
+         width="1"
+         id="rect11240-8"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3799);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="195"
+         x="318"
+         height="1"
+         width="1"
+         id="rect11242-0"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3801);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="192"
+         x="319"
+         height="1"
+         width="1"
+         id="rect11268-0"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3803);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+      <rect
+         y="194"
+         x="319"
+         height="1"
+         width="1"
+         id="rect11272-3"
+         
style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3805);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+    </g>
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9638);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+       id="rect10575-2"
+       width="6"
+       height="2"
+       x="313.5"
+       y="182.5" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9633);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9635);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+       id="rect10612-0"
+       width="4"
+       height="2"
+       x="315.5"
+       y="183.5" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9666);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+       id="rect10575-2-6"
+       width="6"
+       height="2"
+       x="313.5"
+       y="187.5" />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9633-1);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9635-1);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+       id="rect10612-0-8"
+       width="4"
+       height="2"
+       x="315.5"
+       y="188.5" />
+    <rect
+       y="182"
+       x="309"
+       height="3"
+       width="1"
+       id="rect10664-9"
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1424);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+    <rect
+       y="182"
+       x="311"
+       height="3"
+       width="1"
+       id="rect10666-3"
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9733);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+    <rect
+       y="187"
+       x="309"
+       height="3"
+       width="1"
+       id="rect10664-9-8"
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1426);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+    <rect
+       y="187"
+       x="311"
+       height="3"
+       width="1"
+       id="rect10666-3-0"
+       
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient9793);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;enable-background:new"
 />
+    <rect
+       
style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d7cf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+       id="rect4721"
+       width="1.3125"
+       height="1.3125"
+       x="305.84375"
+       y="187.84375"
+       rx="3.2307692"
+       ry="1.3125" />
+  </g>
+</svg>
diff --git a/src/e-util/e-preferences-window.c b/src/e-util/e-preferences-window.c
index 74760fb9b0..1f5153208e 100644
--- a/src/e-util/e-preferences-window.c
+++ b/src/e-util/e-preferences-window.c
@@ -29,7 +29,12 @@
 
 #include "e-preferences-window.h"
 
-#define SWITCH_PAGE_INTERVAL 250
+enum {
+       CLOSE,
+       LAST_SIGNAL
+};
+
+static guint dialog_signals[LAST_SIGNAL];
 
 #define E_PREFERENCES_WINDOW_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
@@ -39,23 +44,8 @@ struct _EPreferencesWindowPrivate {
        gboolean   setup;
        gpointer   shell;
 
-       GtkWidget *icon_view;
-       GtkWidget *scroll;
-       GtkWidget *notebook;
-       GHashTable *index;
-
-       GtkListStore *store;
-       GtkTreeModelFilter *filter;
-       const gchar *filter_view;
-};
-
-enum {
-       COLUMN_ID,      /* G_TYPE_STRING */
-       COLUMN_TEXT,    /* G_TYPE_STRING */
-       COLUMN_HELP,    /* G_TYPE_STRING */
-       COLUMN_PIXBUF,  /* GDK_TYPE_PIXBUF */
-       COLUMN_PAGE,    /* G_TYPE_INT */
-       COLUMN_SORT     /* G_TYPE_INT */
+       GtkWidget *stack;
+       GtkWidget *listbox;
 };
 
 G_DEFINE_TYPE (
@@ -63,350 +53,268 @@ G_DEFINE_TYPE (
        e_preferences_window,
        GTK_TYPE_WINDOW)
 
-static gboolean
-preferences_window_filter_view (GtkTreeModel *model,
-                                GtkTreeIter *iter,
-                                EPreferencesWindow *window)
-{
-       gchar *str;
-       gboolean visible = FALSE;
-
-       if (!window->priv->filter_view)
-               return TRUE;
-
-       gtk_tree_model_get (model, iter, COLUMN_ID, &str, -1);
-       if (strncmp (window->priv->filter_view, "mail", 4) == 0) {
-               /* Show everything except calendar */
-               if (str && (strncmp (str, "cal", 3) == 0))
-                       visible = FALSE;
-               else
-                       visible = TRUE;
-       } else if (strncmp (window->priv->filter_view, "cal", 3) == 0) {
-               /* Show only calendar and nothing else */
-               if (str && (strncmp (str, "cal", 3) != 0))
-                       visible = FALSE;
-               else
-                       visible = TRUE;
-
-       } else  /* In any other case, show everything */
-               visible = TRUE;
-
-       g_free (str);
-
-       return visible;
-}
+#define E_TYPE_PREFERENCES_WINDOW_ROW e_preferences_window_row_get_type ()
+G_DECLARE_FINAL_TYPE (EPreferencesWindowRow, e_preferences_window_row, E, PREFERENCES_WINDOW_ROW, 
GtkListBoxRow)
 
-static GdkPixbuf *
-preferences_window_load_pixbuf (const gchar *icon_name)
-{
-       GtkIconTheme *icon_theme;
-       GtkIconInfo *icon_info;
-       GdkPixbuf *pixbuf;
-       const gchar *filename;
-       gint size;
-       GError *error = NULL;
+struct _EPreferencesWindowRow {
+       GtkListBoxRow parent_instance;
 
-       icon_theme = gtk_icon_theme_get_default ();
+       gchar *page_name;
+       gchar *caption;
+       gchar *help_target;
+       EPreferencesWindowCreatePageFn create_fn;
+       gint sort_order;
+       GtkWidget *page;
+};
 
-       if (!gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &size, 0))
-               return NULL;
+G_DEFINE_TYPE (
+       EPreferencesWindowRow,
+       e_preferences_window_row,
+       GTK_TYPE_LIST_BOX_ROW)
 
-       icon_info = gtk_icon_theme_lookup_icon (
-               icon_theme, icon_name, size, 0);
+static void
+e_preferences_window_row_finalize (GObject *gobject)
+{
+       EPreferencesWindowRow *row = E_PREFERENCES_WINDOW_ROW (gobject);
 
-       if (icon_info == NULL)
-               return NULL;
+       g_clear_pointer (&row->page_name, g_free);
+       g_clear_pointer (&row->caption, g_free);
+       g_clear_pointer (&row->help_target, g_free);
 
-       filename = gtk_icon_info_get_filename (icon_info);
+       G_OBJECT_CLASS (e_preferences_window_row_parent_class)->finalize (gobject);
+}
 
-       pixbuf = gdk_pixbuf_new_from_file (filename, &error);
+static void
+e_preferences_window_row_class_init (EPreferencesWindowRowClass *class)
+{
+       GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-       gtk_icon_info_free (icon_info);
+       object_class->finalize = e_preferences_window_row_finalize;
+}
 
-       if (error != NULL) {
-               g_warning ("%s", error->message);
-               g_error_free (error);
-       }
+static void
+e_preferences_window_row_init (EPreferencesWindowRow *row)
+{
 
-       if (pixbuf && (gdk_pixbuf_get_width (pixbuf) != size || gdk_pixbuf_get_height (pixbuf) != size)) {
-               GdkPixbuf *scaled;
+}
 
-               scaled = e_icon_factory_pixbuf_scale (pixbuf, size, size);
-               g_object_unref (pixbuf);
+static GtkWidget *
+e_preferences_window_row_new (const gchar *page_name,
+                              const gchar *icon_name,
+                              const gchar *caption,
+                              const gchar *help_target,
+                              EPreferencesWindowCreatePageFn create_fn,
+                              gint sort_order)
+{
+       GtkWidget *hbox, *image, *label;
+       EPreferencesWindowRow *row;
+
+       row = g_object_new (E_TYPE_PREFERENCES_WINDOW_ROW, NULL);
+       row->page_name = g_strdup (page_name);
+       row->caption = g_strdup (caption);
+       row->help_target = g_strdup (help_target);
+       row->create_fn = create_fn;
+       row->sort_order = sort_order;
+
+       g_object_set_data_full (G_OBJECT (row), "page_name", g_strdup (page_name), g_free);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+       gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
+       image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+       g_object_set (G_OBJECT (image),
+               "pixel-size", 24,
+               "use-fallback", TRUE,
+               NULL);
+       gtk_style_context_add_class (gtk_widget_get_style_context (image), "sidebar-icon");
+       label = gtk_label_new (caption);
+       gtk_container_add (GTK_CONTAINER (hbox), image);
+       gtk_container_add (GTK_CONTAINER (hbox), label);
+       gtk_container_add (GTK_CONTAINER (row), hbox);
+       return GTK_WIDGET (row);
+}
 
-               pixbuf = scaled;
-       }
+static GtkWidget *
+e_preferences_window_row_create_page (EPreferencesWindowRow *self,
+                                      EPreferencesWindow *window)
+{
+       g_return_val_if_fail (E_IS_PREFERENCES_WINDOW_ROW (self), NULL);
+       g_return_val_if_fail (E_IS_PREFERENCES_WINDOW (window), NULL);
+       g_return_val_if_fail (self->create_fn != NULL, NULL);
+       g_return_val_if_fail (self->page == NULL, NULL);
 
-       return pixbuf;
+       self->page = self->create_fn (window);
+       return self->page;
 }
 
 static void
 preferences_window_help_clicked_cb (EPreferencesWindow *window)
 {
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       GList *list;
        gchar *help = NULL;
+       GtkListBoxRow *child;
 
        g_return_if_fail (window != NULL);
 
-       model = GTK_TREE_MODEL (window->priv->filter);
-       list = gtk_icon_view_get_selected_items (
-               GTK_ICON_VIEW (window->priv->icon_view));
-
-       if (list != NULL) {
-               gtk_tree_model_get_iter (model, &iter, list->data);
-               gtk_tree_model_get (model, &iter, COLUMN_HELP, &help, -1);
-
-       } else if (gtk_tree_model_get_iter_first (model, &iter)) {
-               gint page_index, current_index;
-
-               current_index = gtk_notebook_get_current_page (
-                       GTK_NOTEBOOK (window->priv->notebook));
-               do {
-                       gtk_tree_model_get (
-                               model, &iter, COLUMN_PAGE, &page_index, -1);
-
-                       if (page_index == current_index) {
-                               gtk_tree_model_get (
-                                       model, &iter, COLUMN_HELP, &help, -1);
-                               break;
-                       }
-               } while (gtk_tree_model_iter_next (model, &iter));
+       child = gtk_list_box_get_selected_row (GTK_LIST_BOX (window->priv->listbox));
+       if (child && E_IS_PREFERENCES_WINDOW_ROW (child)) {
+               EPreferencesWindowRow *row = E_PREFERENCES_WINDOW_ROW (child);
+               help = row->help_target;
        }
 
        e_display_help (GTK_WINDOW (window), help ? help : "index");
-
-       g_free (help);
 }
 
 static void
-preferences_window_selection_changed_cb (EPreferencesWindow *window)
+preferences_window_row_selected (EPreferencesWindow *window,
+                                 GtkListBoxRow *row,
+                                 GtkListBox *box)
 {
-       GtkIconView *icon_view;
-       GtkNotebook *notebook;
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       GList *list;
-       gint page;
-
-       icon_view = GTK_ICON_VIEW (window->priv->icon_view);
-       list = gtk_icon_view_get_selected_items (icon_view);
-       if (list == NULL)
-               return;
-
-       model = GTK_TREE_MODEL (window->priv->filter);
-       gtk_tree_model_get_iter (model, &iter, list->data);
-       gtk_tree_model_get (model, &iter, COLUMN_PAGE, &page, -1);
-
-       notebook = GTK_NOTEBOOK (window->priv->notebook);
-       gtk_notebook_set_current_page (notebook, page);
-
-       g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
-       g_list_free (list);
-
-       gtk_widget_grab_focus (GTK_WIDGET (icon_view));
+       g_signal_emit_by_name (row, "activate", NULL);
 }
 
 static void
-preferences_window_dispose (GObject *object)
+preferences_window_row_activated (EPreferencesWindow *window,
+                                  GtkListBoxRow *row,
+                                  GtkListBox *box)
 {
-       EPreferencesWindowPrivate *priv;
-
-       priv = E_PREFERENCES_WINDOW_GET_PRIVATE (object);
-
-       if (priv->icon_view != NULL) {
-               g_signal_handlers_disconnect_by_func (priv->icon_view,
-                       G_CALLBACK (preferences_window_selection_changed_cb), object);
+       EPreferencesWindowRow *pref_row = E_PREFERENCES_WINDOW_ROW (row);
 
-               g_object_unref (priv->icon_view);
-               priv->icon_view = NULL;
-       }
+       g_return_if_fail (window != NULL);
+       g_return_if_fail (E_IS_PREFERENCES_WINDOW_ROW (row));
 
-       g_clear_object (&priv->notebook);
+       gtk_stack_set_visible_child_name (GTK_STACK (window->priv->stack), pref_row->page_name);
+}
 
-       if (priv->shell) {
-               g_object_remove_weak_pointer (priv->shell, &priv->shell);
-               priv->shell = NULL;
-       }
+static gint
+on_list_box_sort (GtkListBoxRow *row1,
+                  GtkListBoxRow *row2,
+                  gpointer user_data)
+{
+       EPreferencesWindowRow *pref_row1 = E_PREFERENCES_WINDOW_ROW (row1);
+       EPreferencesWindowRow *pref_row2 = E_PREFERENCES_WINDOW_ROW (row2);
 
-       g_hash_table_remove_all (priv->index);
+       if (pref_row1->sort_order != pref_row2->sort_order)
+               return pref_row1->sort_order - pref_row2->sort_order;
 
-       /* Chain up to parent's dispose() method. */
-       G_OBJECT_CLASS (e_preferences_window_parent_class)->dispose (object);
+       return g_utf8_collate (pref_row1->caption, pref_row2->caption);
 }
 
 static void
-preferences_window_finalize (GObject *object)
+e_preferences_window_close (EPreferencesWindow *window)
 {
-       EPreferencesWindowPrivate *priv;
-
-       priv = E_PREFERENCES_WINDOW_GET_PRIVATE (object);
-
-       g_hash_table_destroy (priv->index);
-
-       /* Chain up to parent's finalize() method. */
-       G_OBJECT_CLASS (e_preferences_window_parent_class)->finalize (object);
+       gtk_window_close (GTK_WINDOW (window));
 }
 
 static void
-preferences_window_show (GtkWidget *widget)
+preferences_window_dispose (GObject *object)
 {
        EPreferencesWindowPrivate *priv;
-       GtkIconView *icon_view;
-       GtkTreePath *path;
 
-       priv = E_PREFERENCES_WINDOW_GET_PRIVATE (widget);
-       if (!priv->setup)
-               g_warning ("Preferences window has not been setup correctly");
-
-       icon_view = GTK_ICON_VIEW (priv->icon_view);
-
-       path = gtk_tree_path_new_first ();
-       gtk_icon_view_select_path (icon_view, path);
-       gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0);
-       gtk_tree_path_free (path);
+       priv = E_PREFERENCES_WINDOW_GET_PRIVATE (object);
 
-       gtk_widget_grab_focus (priv->icon_view);
+       if (priv->shell) {
+               g_object_remove_weak_pointer (priv->shell, &priv->shell);
+               priv->shell = NULL;
+       }
 
-       /* Chain up to parent's show() method. */
-       GTK_WIDGET_CLASS (e_preferences_window_parent_class)->show (widget);
+       /* Chain up to parent's dispose() method. */
+       G_OBJECT_CLASS (e_preferences_window_parent_class)->dispose (object);
 }
 
 static void
 e_preferences_window_class_init (EPreferencesWindowClass *class)
 {
        GObjectClass *object_class;
-       GtkWidgetClass *widget_class;
+       GtkBindingSet *binding_set;
 
        g_type_class_add_private (class, sizeof (EPreferencesWindowPrivate));
 
        object_class = G_OBJECT_CLASS (class);
        object_class->dispose = preferences_window_dispose;
-       object_class->finalize = preferences_window_finalize;
 
-       widget_class = GTK_WIDGET_CLASS (class);
-       widget_class->show = preferences_window_show;
+       class->close = e_preferences_window_close;
+
+       /**
+        * EPreferencesWindow::close:
+        *
+        * GtkBindingSignal which gets emitted when the user uses a
+        * keybinding to close the dialog.
+        *
+        * The default binding for this signal is the Escape key.
+        */
+       dialog_signals[CLOSE] =
+               g_signal_new ("close",
+                       G_OBJECT_CLASS_TYPE (class),
+                       G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+                       G_STRUCT_OFFSET (EPreferencesWindowClass, close),
+                       NULL, NULL, NULL,
+                       G_TYPE_NONE, 0);
+
+       binding_set = gtk_binding_set_by_class (class);
+       gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "close", 0);
 }
 
 static void
 e_preferences_window_init (EPreferencesWindow *window)
 {
-       GtkListStore *store;
-       GtkWidget *container;
-       GtkWidget *hbox;
-       GtkWidget *vbox;
+       GtkWidget *header;
        GtkWidget *widget;
-       GHashTable *index;
-       const gchar *title;
-       GtkAccelGroup *accel_group;
-
-       index = g_hash_table_new_full (
-               g_str_hash, g_str_equal,
-               (GDestroyNotify) g_free,
-               (GDestroyNotify) gtk_tree_row_reference_free);
+       GtkWidget *hbox;
 
        window->priv = E_PREFERENCES_WINDOW_GET_PRIVATE (window);
-       window->priv->index = index;
-       window->priv->filter_view = NULL;
-
-       store = gtk_list_store_new (
-               6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-               GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT);
-       gtk_tree_sortable_set_sort_column_id (
-               GTK_TREE_SORTABLE (store), COLUMN_SORT, GTK_SORT_ASCENDING);
-       window->priv->store = store;
-
-       window->priv->filter = (GtkTreeModelFilter *)
-               gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL);
-       gtk_tree_model_filter_set_visible_func (
-               window->priv->filter, (GtkTreeModelFilterVisibleFunc)
-               preferences_window_filter_view, window, NULL);
-
-       title = _("Evolution Preferences");
-       gtk_window_set_title (GTK_WINDOW (window), title);
-       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
-       gtk_container_set_border_width (GTK_CONTAINER (window), 12);
 
-       g_signal_connect (
-               window, "delete-event",
-               G_CALLBACK (gtk_widget_hide_on_delete), NULL);
+       widget = gtk_header_bar_new ();
+       g_object_set (G_OBJECT (widget),
+               "show-close-button", TRUE,
+               "visible", TRUE,
+               NULL);
+       gtk_window_set_titlebar (GTK_WINDOW (window), widget);
+       header = widget;
 
-       widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-       gtk_container_add (GTK_CONTAINER (window), widget);
+       widget = gtk_stack_new ();
        gtk_widget_show (widget);
+       window->priv->stack = widget;
 
-       vbox = widget;
-
-       widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-       gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0);
-       gtk_widget_show (widget);
-
-       hbox = widget;
-
-       widget = gtk_scrolled_window_new (NULL, NULL);
-       gtk_scrolled_window_set_policy (
-               GTK_SCROLLED_WINDOW (widget),
-               GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_scrolled_window_set_shadow_type (
-               GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
-       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, TRUE, 0);
-       window->priv->scroll = widget;
-       gtk_widget_show (widget);
-
-       container = widget;
-
-       widget = gtk_icon_view_new_with_model (
-               GTK_TREE_MODEL (window->priv->filter));
-       gtk_icon_view_set_columns (GTK_ICON_VIEW (widget), 1);
-       gtk_icon_view_set_text_column (GTK_ICON_VIEW (widget), COLUMN_TEXT);
-       gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (widget), COLUMN_PIXBUF);
+       widget = g_object_new (GTK_TYPE_LIST_BOX,
+               "selection-mode", GTK_SELECTION_BROWSE,
+               "visible", TRUE,
+               NULL);
        g_signal_connect_swapped (
-               widget, "selection-changed",
-               G_CALLBACK (preferences_window_selection_changed_cb), window);
-       gtk_container_add (GTK_CONTAINER (container), widget);
-       window->priv->icon_view = g_object_ref (widget);
-       gtk_widget_show (widget);
-       g_object_unref (store);
-
-       widget = gtk_notebook_new ();
-       gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE);
-       gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE);
-       gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
-       window->priv->notebook = g_object_ref (widget);
-       gtk_widget_show (widget);
-
-       widget = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-       gtk_button_box_set_layout (
-               GTK_BUTTON_BOX (widget), GTK_BUTTONBOX_END);
-       gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+               widget, "row-selected",
+               G_CALLBACK (preferences_window_row_selected), window);
+       g_signal_connect_swapped (
+               widget, "row-activated",
+               G_CALLBACK (preferences_window_row_activated), window);
+       gtk_list_box_set_sort_func (GTK_LIST_BOX (widget),
+               on_list_box_sort,
+               NULL, NULL);
+       window->priv->listbox = widget;
+       widget = g_object_new (GTK_TYPE_SCROLLED_WINDOW,
+               "hscrollbar-policy", GTK_POLICY_NEVER,
+               "visible", TRUE,
+               NULL);
+       gtk_container_add (GTK_CONTAINER (widget), window->priv->listbox);
+
+       hbox = g_object_new (GTK_TYPE_BOX,
+               "orientation", GTK_ORIENTATION_HORIZONTAL,
+               "visible", TRUE,
+               NULL);
+       gtk_container_add (GTK_CONTAINER (window), hbox);
+       gtk_container_add (GTK_CONTAINER (hbox), widget);
+       gtk_container_add (GTK_CONTAINER (hbox), window->priv->stack);
+
+       widget = gtk_button_new_from_icon_name ("help-browser", GTK_ICON_SIZE_LARGE_TOOLBAR);
+       gtk_widget_set_tooltip_text (widget, _("Help"));
        gtk_widget_show (widget);
-
-       container = widget;
-
-       widget = e_dialog_button_new_with_icon ("help-browser", _("_Help"));
        g_signal_connect_swapped (
                widget, "clicked",
                G_CALLBACK (preferences_window_help_clicked_cb), window);
-       gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-       gtk_button_box_set_child_secondary (
-               GTK_BUTTON_BOX (container), widget, TRUE);
-       gtk_widget_show (widget);
+       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), widget);
 
-       widget = e_dialog_button_new_with_icon ("window-close", _("_Close"));
-       g_signal_connect_swapped (
-               widget, "clicked",
-               G_CALLBACK (gtk_widget_hide), window);
-       gtk_widget_set_can_default (widget, TRUE);
-       gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-       accel_group = gtk_accel_group_new ();
-       gtk_widget_add_accelerator (
-               widget, "activate", accel_group,
-               GDK_KEY_Escape, (GdkModifierType) 0,
-               GTK_ACCEL_VISIBLE);
-       gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-       gtk_widget_grab_default (widget);
-       gtk_widget_show (widget);
+       gtk_window_set_title (GTK_WINDOW (window), _("Evolution Preferences"));
+       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
+
+       g_signal_connect (
+               window, "delete-event",
+               G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 }
 
 GtkWidget *
@@ -441,16 +349,7 @@ e_preferences_window_add_page (EPreferencesWindow *window,
                                EPreferencesWindowCreatePageFn create_fn,
                                gint sort_order)
 {
-       GtkTreeRowReference *reference;
-       GtkIconView *icon_view;
-       GtkNotebook *notebook;
-       GtkTreeModel *model;
-       GtkTreePath *path;
-       GHashTable *index;
-       GdkPixbuf *pixbuf;
-       GtkTreeIter iter;
-       GtkWidget *align;
-       gint page;
+       GtkWidget *row;
 
        g_return_if_fail (E_IS_PREFERENCES_WINDOW (window));
        g_return_if_fail (create_fn != NULL);
@@ -458,66 +357,29 @@ e_preferences_window_add_page (EPreferencesWindow *window,
        g_return_if_fail (icon_name != NULL);
        g_return_if_fail (caption != NULL);
 
-       icon_view = GTK_ICON_VIEW (window->priv->icon_view);
-       notebook = GTK_NOTEBOOK (window->priv->notebook);
-
-       page = gtk_notebook_get_n_pages (notebook);
-       model = GTK_TREE_MODEL (window->priv->store);
-       pixbuf = preferences_window_load_pixbuf (icon_name);
-
-       gtk_list_store_append (GTK_LIST_STORE (model), &iter);
-
-       gtk_list_store_set (
-               GTK_LIST_STORE (model), &iter,
-               COLUMN_ID, page_name,
-               COLUMN_TEXT, caption,
-               COLUMN_HELP, help_target,
-               COLUMN_PIXBUF, pixbuf,
-               COLUMN_PAGE, page,
-               COLUMN_SORT, sort_order,
-               -1);
-
-       index = window->priv->index;
-       path = gtk_tree_model_get_path (model, &iter);
-       reference = gtk_tree_row_reference_new (model, path);
-       g_hash_table_insert (index, g_strdup (page_name), reference);
-       gtk_tree_path_free (path);
-
-       align = g_object_new (GTK_TYPE_ALIGNMENT, NULL);
-       gtk_widget_show (GTK_WIDGET (align));
-       g_object_set_data (G_OBJECT (align), "create_fn", create_fn);
-       gtk_notebook_append_page (notebook, align, NULL);
-       gtk_container_child_set (
-               GTK_CONTAINER (notebook), align,
-               "tab-fill", FALSE, "tab-expand", FALSE, NULL);
-
-       /* Force GtkIconView to recalculate the text wrap width,
-        * otherwise we get a really narrow icon list on the left
-        * side of the preferences window. */
-       gtk_icon_view_set_item_width (icon_view, -1);
-       gtk_widget_queue_resize (GTK_WIDGET (window));
+       row = e_preferences_window_row_new (page_name, icon_name, caption, help_target, create_fn, 
sort_order);
+       gtk_widget_show_all (row);
+       gtk_container_add (GTK_CONTAINER (window->priv->listbox), row);
 }
 
 void
 e_preferences_window_show_page (EPreferencesWindow *window,
                                 const gchar *page_name)
 {
-       GtkTreeRowReference *reference;
-       GtkIconView *icon_view;
-       GtkTreePath *path;
+       GList *children, *list;
 
        g_return_if_fail (E_IS_PREFERENCES_WINDOW (window));
        g_return_if_fail (page_name != NULL);
-       g_return_if_fail (window->priv->setup);
-
-       icon_view = GTK_ICON_VIEW (window->priv->icon_view);
-       reference = g_hash_table_lookup (window->priv->index, page_name);
-       g_return_if_fail (reference != NULL);
-
-       path = gtk_tree_row_reference_get_path (reference);
-       gtk_icon_view_select_path (icon_view, path);
-       gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0);
-       gtk_tree_path_free (path);
+       g_return_if_fail (window->priv->listbox);
+
+       children = gtk_container_get_children (GTK_CONTAINER (window->priv->listbox));
+       for (list = children; list != NULL; list = list->next) {
+               EPreferencesWindowRow *child = list->data;
+               if (!g_strcmp0 (page_name, child->page_name)) {
+                       gtk_list_box_select_row (GTK_LIST_BOX (window->priv->listbox), GTK_LIST_BOX_ROW 
(child));
+                       break;
+               }
+       }
 }
 
 /*
@@ -526,10 +388,9 @@ e_preferences_window_show_page (EPreferencesWindow *window,
 void
 e_preferences_window_setup (EPreferencesWindow *window)
 {
-       gint i, num;
-       GtkNotebook *notebook;
        EPreferencesWindowPrivate *priv;
-       GSList *children = NULL;
+       GList *children, *list;
+       GSList *slist_children = NULL;
 
        g_return_if_fail (E_IS_PREFERENCES_WINDOW (window));
 
@@ -538,47 +399,28 @@ e_preferences_window_setup (EPreferencesWindow *window)
        if (priv->setup)
                return;
 
-       notebook = GTK_NOTEBOOK (priv->notebook);
-       num = gtk_notebook_get_n_pages (notebook);
-
-       for (i = 0; i < num; i++) {
-               GtkBin *align;
-               GtkWidget *content;
-               EPreferencesWindowCreatePageFn create_fn;
+       children = gtk_container_get_children (GTK_CONTAINER (window->priv->listbox));
+       for (list = children; list != NULL; list = list->next) {
+               EPreferencesWindowRow *child = list->data;
+               GtkWidget *content, *scrolled;
 
-               align = GTK_BIN (gtk_notebook_get_nth_page (notebook, i));
-               create_fn = g_object_get_data (G_OBJECT (align), "create_fn");
-
-               if (!create_fn || gtk_bin_get_child (align))
-                       continue;
-
-               content = create_fn (window);
+               content = e_preferences_window_row_create_page (child, window);
                if (content) {
-                       GtkScrolledWindow *scrolled;
-
-                       children = g_slist_prepend (children, content);
-
-                       scrolled = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL));
-                       gtk_scrolled_window_add_with_viewport (scrolled, content);
-                       gtk_scrolled_window_set_min_content_width (scrolled, 320);
-                       gtk_scrolled_window_set_min_content_height (scrolled, 240);
-                       gtk_scrolled_window_set_policy (scrolled, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-                       gtk_scrolled_window_set_shadow_type (scrolled, GTK_SHADOW_NONE);
-
-                       gtk_viewport_set_shadow_type (
-                               GTK_VIEWPORT (gtk_bin_get_child (GTK_BIN (scrolled))),
-                               GTK_SHADOW_NONE);
-
+                       scrolled = gtk_scrolled_window_new (NULL, NULL);
+                       g_object_set (G_OBJECT (scrolled),
+                               "min-content-width", 320,
+                               "min-content-height", 240,
+                               "hscrollbar-policy", GTK_POLICY_NEVER,
+                               "visible", TRUE,
+                               NULL);
+                       gtk_container_add (GTK_CONTAINER (scrolled), content);
                        gtk_widget_show (content);
-                       gtk_widget_show (GTK_WIDGET (scrolled));
-
-                       gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (scrolled));
+                       gtk_stack_add_named (GTK_STACK (priv->stack), scrolled, child->page_name);
+                       slist_children = g_slist_prepend (slist_children, scrolled);
                }
        }
 
-       e_util_resize_window_for_screen (GTK_WINDOW (window), -1, -1, children);
-
-       g_slist_free (children);
-
+       e_util_resize_window_for_screen (GTK_WINDOW (window), -1, -1, slist_children);
+       g_slist_free (slist_children);
        priv->setup = TRUE;
 }
diff --git a/src/e-util/e-preferences-window.h b/src/e-util/e-preferences-window.h
index c5659fc043..cf31c663e8 100644
--- a/src/e-util/e-preferences-window.h
+++ b/src/e-util/e-preferences-window.h
@@ -59,6 +59,8 @@ struct _EPreferencesWindow {
 
 struct _EPreferencesWindowClass {
        GtkWindowClass parent_class;
+
+       void (*close) (EPreferencesWindow *window);
 };
 
 typedef GtkWidget *
diff --git a/src/modules/addressbook/e-book-shell-backend.c b/src/modules/addressbook/e-book-shell-backend.c
index 31b92658da..cc63532d2f 100644
--- a/src/modules/addressbook/e-book-shell-backend.c
+++ b/src/modules/addressbook/e-book-shell-backend.c
@@ -310,7 +310,7 @@ book_shell_backend_init_preferences (EShell *shell)
        e_preferences_window_add_page (
                E_PREFERENCES_WINDOW (preferences_window),
                "contacts",
-               "preferences-autocompletion",
+               "preferences-contact",
                _("Contacts"),
                "index#contacts",
                autocompletion_config_new,
diff --git a/src/modules/mail/e-mail-shell-backend.c b/src/modules/mail/e-mail-shell-backend.c
index 570be148d1..bcff4d04d6 100644
--- a/src/modules/mail/e-mail-shell-backend.c
+++ b/src/modules/mail/e-mail-shell-backend.c
@@ -997,6 +997,7 @@ mail_shell_backend_create_network_page (EPreferencesWindow *window)
        pango_attr_list_insert (bold, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
 
        vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 4));
+       gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
        widget = gtk_label_new (_("General"));
        g_object_set (G_OBJECT (widget),
diff --git a/src/modules/mail/em-account-prefs.c b/src/modules/mail/em-account-prefs.c
index 641050fa3d..248d4ff36a 100644
--- a/src/modules/mail/em-account-prefs.c
+++ b/src/modules/mail/em-account-prefs.c
@@ -263,7 +263,8 @@ em_account_prefs_new (EPreferencesWindow *window)
        return g_object_new (
                EM_TYPE_ACCOUNT_PREFS,
                "store", account_store,
-               "backend", backend, NULL);
+               "backend", backend,
+               "margin", 12, NULL);
 }
 
 EMailBackend *


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]