diff --git a/src/Gui/Icons/AddonManager.svg b/src/Gui/Icons/AddonManager.svg
index 7a823c5f28..14c459fb39 100644
--- a/src/Gui/Icons/AddonManager.svg
+++ b/src/Gui/Icons/AddonManager.svg
@@ -82,7 +82,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -91,14 +90,6 @@
     <g
        id="g3851"
        transform="matrix(1.1386579,0,0,1.1324894,-5.849948,-6.8720445)">
-      <ellipse
-         style="fill:url(#radialGradient3079);fill-opacity:1;stroke:none"
-         id="path3885"
-         transform="matrix(0.98607933,0,0,0.88301034,1.1932644,6.9511055)"
-         cx="32.5"
-         cy="52"
-         rx="28.5"
-         ry="7" />
       <g
          transform="matrix(0.8782269,0,0,0.88301047,5.1375817,7.8341081)"
          id="g3821">
diff --git a/src/Gui/Icons/document-open.svg b/src/Gui/Icons/document-open.svg
index 21d912ec3f..24432dc38c 100644
--- a/src/Gui/Icons/document-open.svg
+++ b/src/Gui/Icons/document-open.svg
@@ -55,6 +55,34 @@
          offset="1"
          id="stop9" />
     </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3774"
+       id="linearGradient5137"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.51964051,0,0,0.50042191,1386.3532,982.21378)"
+       x1="288.11227"
+       y1="358.15811"
+       x2="372.52457"
+       y2="7.5416322" />
+    <linearGradient
+       id="linearGradient3774">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3776" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3778" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath1">
+      <path
+         style="fill:none;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;-inkscape-stroke:none"
+         d="m 1128.2358,1230.7769 47.3569,-44.8156 90.1392,-7.1378 98.3518,-93.074 -122.4881,-129.43385 -196.8251,186.26295 z"
+         id="path2" />
+    </clipPath>
   </defs>
   <metadata
      id="metadata2874">
@@ -88,17 +116,17 @@
   <path
      style="fill:#204a87;fill-opacity:1;stroke:#0c1522;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
      id="path4"
-     d="M 29.921921,12.073012 26.993293,8.1977395 C 26.21651,7.1698698 25.163057,6.5924975 24.064598,6.5924975 H 5.0714589 c -1.1437425,0 -2.0708717,1.2268134 -2.0708717,2.740257 V 60.484215 c 0,0.504481 0.309043,0.913419 0.6902905,0.913419 H 60.294706 c 0.381247,0 0.690291,-0.408938 0.690291,-0.913419 V 14.813269 c 0,-1.513445 -0.927129,-2.740257 -2.070872,-2.740257 z" />
+     d="M 29.921921,12.073012 26.993293,8.1977395 C 26.21651,7.1698698 25.163057,6.5924975 24.064598,6.5924975 H 7.0714589 c -1.1437425,0 -2.0708717,1.2268134 -2.0708717,2.740257 V 58.484215 c 0,0.504481 0.309043,0.913419 0.6902905,0.913419 H 58.294706 c 0.381247,0 0.690291,-0.408938 0.690291,-0.913419 V 14.813269 c 0,-1.513445 -0.927129,-2.740257 -2.070872,-2.740257 z" />
   <path
      style="fill:#204a87;fill-opacity:1;stroke:#3465a4;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
      id="path7"
-     d="M 5.2089844,8.5917969 H 24.064453 c 0.375444,0 0.874561,0.2026195 1.333984,0.8105468 l 3.527344,4.6699223 h 29.84961 c 0.0082,0.01044 0.01784,0.02289 0.02734,0.03711 0.01056,0.0158 0.02193,0.03237 0.0332,0.05273 0.08049,0.145363 0.148438,0.361331 0.148438,0.650391 v 44.58594 H 5 V 9.3320312 C 5,9.0436394 5.0678061,8.828994 5.1484375,8.6835937 c 0.011294,-0.020366 0.022609,-0.038859 0.033203,-0.054687 0.00953,-0.014245 0.019073,-0.026632 0.027344,-0.03711 z" />
+     d="M 7.2089844,8.5917969 H 24.064453 c 0.375444,0 0.874561,0.2026195 1.333984,0.8105468 l 3.527344,4.6699223 h 27.84961 c 0.0082,0.01044 0.01784,0.02289 0.02734,0.03711 0.01056,0.0158 0.02193,0.03237 0.0332,0.05273 0.08049,0.145363 0.148438,0.361331 0.148438,0.650391 v 42.58594 H 7 V 9.3320312 C 7,9.0436394 7.0678061,8.828994 7.1484375,8.6835937 c 0.011294,-0.020366 0.022609,-0.038859 0.033203,-0.054687 0.00953,-0.014245 0.019073,-0.026632 0.027344,-0.03711 z" />
   <g
      id="layer3-3"
      style="display:inline">
     <path
        style="fill:url(#linearGradient3771);fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 11,3 v 58.00002 h 42 v -48 L 43,3 Z"
+       d="m 11,3 v 56.00002 h 42 v -46 L 43,3 Z"
        id="path2991" />
     <path
        style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -112,9 +140,22 @@
   <path
      style="fill:#729fcf;fill-opacity:1;stroke:#0c1522;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
      id="path6"
-     d="m 29.919347,30.419661 -2.927223,3.534545 C 26.215716,34.891703 25.16247,35.41831 24.064012,35.41831 H 3.0000008 l 0.015588,25.156085 c 2.171e-4,0.460126 0.3093777,0.833108 0.6906252,0.833108 h 56.603828 c 0.381248,0 0.690139,-0.372982 0.689957,-0.833108 L 60.983419,32.918986 C 60.982865,31.538609 60.055293,30.419661 58.91155,30.419661 H 29.919344 Z" />
+     d="m 29.919347,30.419661 -2.927223,3.534545 C 26.215716,34.891703 25.16247,35.41831 24.064012,35.41831 H 5.0000008 l 0.015588,23.156085 c 2.171e-4,0.460126 0.3093777,0.833108 0.6906252,0.833108 h 52.603828 c 0.381248,0 0.690139,-0.372982 0.689957,-0.833108 L 58.983419,32.918986 C 58.982865,31.538609 58.055293,30.419661 56.91155,30.419661 H 29.919344 Z" />
   <path
      style="fill:url(#linearGradient9);fill-opacity:1;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
      id="path8"
-     d="m 30.861328,32.419922 h 28.050781 c 0,0 0.07225,0.463543 0.07227,0.5 L 59,59.408203 H 5.015625 L 5,37.417969 h 19.064453 c 1.756119,0 3.349555,-0.836095 4.46875,-2.1875 z" />
+     d="m 30.861328,32.419922 h 26.050781 c 0,0 0.07225,0.463543 0.07227,0.5 L 57,57.408203 H 7.015625 L 7,37.417969 h 17.064453 c 1.756119,0 3.349555,-0.836095 4.46875,-2.1875 z" />
+  <g
+     transform="matrix(0.12325184,0.1166378,-0.1166378,0.12325184,16.17342,-248.81778)"
+     id="g4218"
+     clip-path="url(#clipPath1)">
+    <path
+       style="opacity:1;fill:#8ae234;fill-opacity:1;stroke:#172a04;stroke-width:14.7326;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1145.5648,1074.1543 c 18.5937,-18.383 48.2169,-28.9064 88.8688,-31.5737 v -37.4326 c 0,-4.0003 1.9294,-6.80966 5.7868,-8.43006 4.0547,-1.61639 7.5171,-0.95178 10.3849,2.00121 l 75.9581,73.15065 c 1.8799,1.8121 2.8184,3.9543 2.8184,6.4303 0,2.4767 -0.9389,4.6185 -2.8184,6.429 l -75.9602,73.1502 c -1.7833,1.81 -4.0064,2.7148 -6.6772,2.7148 -1.1865,0 -2.4222,-0.2382 -3.7083,-0.7141 -3.8572,-1.6204 -5.7882,-4.4273 -5.7882,-8.4296 v -35.8618 c -15.9228,1.2386 -29.1503,3.7387 -39.6881,7.5008 -10.5331,3.7627 -18.9637,9.0247 -25.2946,15.7879 -14.738,15.7158 -19.9806,42.6214 -15.7274,80.7237 0.1953,2.4775 -0.9389,4.0963 -3.4125,4.858 -0.2967,0.097 -0.7414,0.142 -1.3349,0.142 -1.9778,0 -3.361,-0.8095 -4.154,-2.4285 l -2.9667,-5.7148 c -1.3832,-2.6676 -3.3858,-6.9784 -6.007,-12.9313 -2.6194,-5.9556 -4.9969,-11.9071 -7.1237,-17.8612 -2.1269,-5.9515 -4.0298,-12.5235 -5.7119,-19.7147 -1.6805,-7.194 -2.5219,-13.5508 -2.5219,-19.074 0,-32.0039 8.3606,-56.2428 25.078,-72.7222 z"
+       id="path4228" />
+    <path
+       id="path5135"
+       d="m 1252.6459,1025.0625 c 18.4441,17.7617 37.1632,35.1962 55.3062,53.3235 -19.0906,18.0067 -37.542,36.7844 -56.7747,54.6184 -0.018,-12.2743 -0.087,-24.5491 0.032,-36.8231 -26.4463,1.6409 -53.9694,3.575 -77.8197,17.2303 -17.0095,9.5803 -28.4884,27.8106 -34.5388,47.088 -3.5743,-21.5969 -1.2897,-45.3408 10.607,-63.6609 11.0273,-16.9013 29.5358,-25.7267 47.629,-30.3404 14.7839,-4.3279 30.2561,-4.0127 45.1276,-7.7257 7.8392,-4.3982 10.4187,-14.9284 9.2176,-23.8416 -0.062,-3.7919 -0.2886,-7.6325 -0.4323,-11.451 0.5488,0.5275 1.0977,1.055 1.6465,1.5825 z"
+       style="opacity:1;fill:url(#linearGradient5137);fill-opacity:1;stroke:none;stroke-width:34.7533;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
 </svg>
diff --git a/src/Gui/Icons/document-package.svg b/src/Gui/Icons/document-package.svg
index 2cdc9d8c34..5db68c89ec 100644
--- a/src/Gui/Icons/document-package.svg
+++ b/src/Gui/Icons/document-package.svg
@@ -145,14 +145,6 @@
       <g
          id="g3851"
          transform="matrix(0.60559561,0,0,0.60231489,11.869492,12.886321)">
-        <ellipse
-           style="fill:url(#radialGradient3079);fill-opacity:1;stroke:none"
-           id="path3885"
-           transform="matrix(0.98607933,0,0,0.88301034,1.1932644,6.9511055)"
-           cx="32.5"
-           cy="52"
-           rx="28.5"
-           ry="7" />
         <g
            transform="matrix(0.8782269,0,0,0.88301047,5.1375817,7.8341081)"
            id="g3821">
diff --git a/src/Gui/Icons/preferences-display.svg b/src/Gui/Icons/preferences-display.svg
index 7af66a7b22..471d178621 100644
--- a/src/Gui/Icons/preferences-display.svg
+++ b/src/Gui/Icons/preferences-display.svg
@@ -135,11 +135,11 @@
      id="layer3"
      style="display:inline">
     <path
-       d="M 9.3847656,12 H 54.615234 C 54.87116,12 55,12.185226 55,12.271484 V 41.728516 C 55,41.814774 54.87116,42 54.615234,42 H 9.3847656 C 9.1285378,42 9,41.814956 9,41.728516 V 12.271484 C 9,12.185044 9.1285378,12 9.3847656,12 Z"
+       d="M 11.384766,14 H 52.615234 C 52.87116,14 53,14.185226 53,14.271484 V 39.728516 C 53,39.814774 52.87116,40 52.615234,40 H 11.384766 C 11.128538,40 11,39.814956 11,39.728516 V 14.271484 C 11,14.185044 11.128538,14 11.384766,14 Z"
        style="fill:url(#linearGradient64);stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round"
        id="path63" />
     <path
-       d="M 58.615747,6.0000001 H 5.3842534 c -1.3114226,0 -2.3842525,1.022419 -2.3842525,2.2720244 V 24.549146 32.372152 47.727975 C 3.0000009,48.97758 4.0728308,50 5.3842534,50 H 26.81767 c 0,0 0.909231,-0.0036 0.69584,0.608757 l -1.29308,3.710916 C 26.083279,54.713273 26.187617,55 25.675014,55 H 14 c -1.430336,0 -2.590019,1.105018 -2.590019,2.467932 0,1.363122 1.159683,2.467934 2.590019,2.467934 h 35.999833 c 1.43034,0 2.59002,-1.104812 2.59002,-2.467934 C 52.589853,56.105018 51.430173,55 49.999833,55 H 38.265898 c -0.377712,0 -0.409376,-0.229909 -0.486493,-0.470346 L 36.486658,50.499076 C 36.331212,50.01442 36.986296,50 36.986296,50 h 21.629283 c 1.311423,0 2.38442,-1.02242 2.38442,-2.272025 V 8.2720245 C 61.000167,7.0224191 59.927169,6.0000001 58.615747,6.0000001 Z M 57,41.727976 C 57,42.977581 55.927002,44 54.615747,44 H 9.3842526 C 8.07283,44 7.0000002,42.977581 7.0000002,41.727976 V 12.272024 C 7.0000002,11.022419 8.07283,10 9.3842526,10 H 54.615747 C 55.927002,10 57,11.022419 57,12.272024 Z"
+       d="M 58.615747,6.0000001 H 5.3842534 c -1.3114226,0 -2.3842525,1.022419 -2.3842525,2.2720244 V 24.549146 32.372152 47.727975 C 3.0000009,48.97758 4.0728308,50 5.3842534,50 H 26.81767 c 0,0 0.909231,-0.0036 0.69584,0.608757 l -1.29308,3.710916 C 26.083279,54.713273 26.187617,55 25.675014,55 H 14 c -1.430336,0 -2.590019,1.105018 -2.590019,2.467932 0,1.363122 1.159683,2.467934 2.590019,2.467934 h 35.999833 c 1.43034,0 2.59002,-1.104812 2.59002,-2.467934 C 52.589853,56.105018 51.430173,55 49.999833,55 H 38.265898 c -0.377712,0 -0.409376,-0.229909 -0.486493,-0.470346 L 36.486658,50.499076 C 36.331212,50.01442 36.986296,50 36.986296,50 h 21.629283 c 1.311423,0 2.38442,-1.02242 2.38442,-2.272025 V 8.2720245 C 61.000167,7.0224191 59.927169,6.0000001 58.615747,6.0000001 Z M 55,39.727976 C 55,40.977581 53.927002,42 52.615747,42 H 11.384253 C 10.07283,42 9.0000002,40.977581 9.0000002,39.727976 V 14.272024 C 9.0000002,13.022419 10.07283,12 11.384253,12 H 52.615747 C 53.927002,12 55,13.022419 55,14.272024 Z"
        id="path3"
        style="fill:url(#linearGradient66);stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none" />
   </g>
diff --git a/src/Gui/Icons/preferences-import-export.svg b/src/Gui/Icons/preferences-import-export.svg
index 667005b383..54fe3a85a5 100644
--- a/src/Gui/Icons/preferences-import-export.svg
+++ b/src/Gui/Icons/preferences-import-export.svg
@@ -15,6 +15,75 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs2871">
+    <linearGradient
+       id="linearGradient5">
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1;"
+         offset="0"
+         id="stop19" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:0;"
+         offset="1"
+         id="stop20" />
+    </linearGradient>
+    <linearGradient
+       id="swatch18">
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1;"
+         offset="0"
+         id="stop18" />
+    </linearGradient>
+    <linearGradient
+       id="swatch15">
+      <stop
+         style="stop-color:#3d0000;stop-opacity:1;"
+         offset="0"
+         id="stop15" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5-1">
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1;"
+         offset="0"
+         id="stop5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:0;"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1;"
+         offset="1"
+         id="stop2" />
+    </linearGradient>
     <linearGradient
        xlink:href="#linearGradient3765"
        id="linearGradient3771"
@@ -36,43 +105,54 @@
          id="stop3769" />
     </linearGradient>
     <linearGradient
-       xlink:href="#linearGradient3765"
-       id="linearGradient9"
+       xlink:href="#linearGradient3806"
+       id="linearGradient3012"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-60,-988.36218)"
-       x1="98"
-       y1="1047.3622"
-       x2="81"
-       y2="993.36218" />
+       gradientTransform="matrix(0.73269922,0,0,0.5925111,13.613318,24.513214)"
+       x1="48.014042"
+       y1="26.323408"
+       x2="43.478561"
+       y2="42.076672" />
     <linearGradient
-       xlink:href="#linearGradient2380-9"
-       id="linearGradient3034"
-       gradientUnits="userSpaceOnUse"
-       x1="41.791897"
-       y1="20.134634"
-       x2="23.705669"
-       y2="34.083359"
-       gradientTransform="matrix(-1.0920707,-0.91483206,-0.92266756,1.0827966,27.239264,-8.2358044)" />
-    <linearGradient
-       id="linearGradient2380-9">
+       id="linearGradient3806">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         style="stop-color:#ef2929;stop-opacity:1"
          offset="0"
-         id="stop2382-4" />
+         id="stop3808" />
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         style="stop-color:#a40000;stop-opacity:1"
          offset="1"
-         id="stop2384-6" />
+         id="stop3810" />
     </linearGradient>
     <linearGradient
-       xlink:href="#linearGradient2380-9"
-       id="linearGradient3034-4"
+       xlink:href="#linearGradient3806-2"
+       id="linearGradient3012-0"
        gradientUnits="userSpaceOnUse"
-       x1="26.221533"
-       y1="31.125586"
-       x2="46.731483"
-       y2="21.766298"
-       gradientTransform="matrix(1.0920707,0.91483206,0.92266756,-1.0827966,-95.708634,29.081796)" />
+       gradientTransform="matrix(0.73269922,0,0,0.5925111,-11.267912,24.513214)"
+       x1="48.014042"
+       y1="26.323408"
+       x2="43.478561"
+       y2="42.076672" />
+    <linearGradient
+       id="linearGradient3806-2">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3808-1" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1"
+         id="stop3810-8" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3806-2"
+       id="linearGradient4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.73269922,0,0,0.5925111,-11.267912,24.513214)"
+       x1="80.383858"
+       y1="22.940084"
+       x2="69.464722"
+       y2="38.488976" />
   </defs>
   <metadata
      id="metadata2874">
@@ -103,91 +183,40 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <path
+     style="fill:url(#linearGradient3771);fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="m 11,3 v 58.00002 h 42 v -48 L 43,3 Z"
+     id="path2991" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 13,5 V 59.00002 H 51 V 13.81392 L 41.99741,5 Z"
+     id="path3763" />
+  <path
+     style="fill:#2e3436;fill-opacity:0.392157;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="M 43,3 V 13.00002 H 53 Z"
+     id="path2993" />
   <g
-     id="layer3"
-     style="display:inline">
-    <g
-       id="g5"
-       transform="matrix(0.88681323,0,0,0.88889159,10.527509,0.33465048)"
-       style="stroke-width:1.12632">
-      <path
-         style="fill:url(#linearGradient3771);fill-opacity:1;stroke:#2e3436;stroke-width:2.25263;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 11,3 v 58.00002 h 42 v -48 L 43,3 Z"
-         id="path2991" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:2.25263;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 13,5 V 59.00002 H 51 V 13.81392 L 41.99741,5 Z"
-         id="path3763" />
-      <path
-         style="fill:#2e3436;fill-opacity:0.392157;stroke:#2e3436;stroke-width:2.25263;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="M 43,3 V 13.00002 H 53 Z"
-         id="path2993" />
-    </g>
-    <g
-       id="g9"
-       transform="matrix(0.88681323,0,0,0.88889159,-3.283556,6.77627)"
-       style="stroke-width:1.12632">
-      <path
-         style="fill:url(#linearGradient9);fill-opacity:1;stroke:#2e3436;stroke-width:2.25263;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 11,3 v 58.00002 h 42 v -48 L 43,3 Z"
-         id="path7" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:2.25263;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 13,5 V 59.00002 H 51 V 13.81392 L 41.99741,5 Z"
-         id="path8" />
-      <path
-         style="fill:#2e3436;fill-opacity:0.392157;stroke:#2e3436;stroke-width:2.25263;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="M 43,3 V 13.00002 H 53 Z"
-         id="path9" />
-    </g>
+     id="g1"
+     transform="translate(-0.754626,-1.7650705)">
+    <path
+       style="display:inline;fill:#ef2929;fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 45.628392,34.16514 v 5.682261 H 29.628021 v 9.470435 h 16.000371 v 5.682261 L 59.881299,44.582619 Z"
+       id="path3343" />
+    <path
+       style="display:inline;fill:url(#linearGradient3012);fill-opacity:1;fill-rule:evenodd;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 47.629277,38.105469 v 3.742187 H 31.628392 v 5.470703 h 16.000885 v 3.742188 l 8.863281,-6.478516 z"
+       id="path1" />
   </g>
   <g
-     id="g3736"
-     transform="matrix(-0.75949461,0,0,0.75949461,2.473047,24.083793)"
-     style="stroke-width:1.32907;stroke-miterlimit:4;stroke-dasharray:none">
-    <g
-       id="g4"
-       transform="matrix(0.63333334,0,0,0.63333334,-18.823923,-11.822269)">
-      <path
-         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient3034);fill-opacity:1;fill-rule:nonzero;stroke:#0c1522;stroke-width:2.63333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-         d="M -67.492186,5.6194719 C -74.415153,-26.922386 -39.372522,-39.148414 -8.8224541,-15.252726 L 0.18155165,-25.053772 0.00103161,6.9828324 -28.216657,6.9540251 c 0,0 9.392192,-10.4688903 9.392192,-10.4688903 -21.485153,-16.1443798 -49.001796,-14.9358308 -48.667721,9.1343371 z"
-         id="path1880-7" />
-      <path
-         id="path2807"
-         d="m -64.60658,-9.9436216 c 2.430008,-12.4350654 27.163115,-25.7184254 55.9936034,-1.4513424 l 6.0419677,-6.362253 -0.2556042,21.9817337 -19.2225819,0.00619 7.286947,-7.9311949 C -32.570149,-17.995717 -54.846819,-21.865686 -64.60658,-9.9436216 Z"
-         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;stroke:#729fcf;stroke-width:2.63333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
-    </g>
-    <g
-       id="g6"
-       transform="matrix(0.63333334,0,0,0.63333334,-18.823923,19.168122)">
-      <path
-         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient3034-4);fill-opacity:1;fill-rule:nonzero;stroke:#0c1522;stroke-width:2.63333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-         d="M -0.97718465,15.226518 C 5.945782,47.768375 -29.096848,59.994404 -59.646916,36.098716 l -9.004006,9.801047 0.18052,-32.036605 28.217689,0.02881 c 0,0 -9.392193,10.468891 -9.392193,10.468891 21.485154,16.14438 49.00179745,14.93583 48.66772135,-9.134338 z"
-         id="path1880-2" />
-      <path
-         id="path2807-5"
-         d="m -3.862789,30.789612 c -1.8217732,12.739136 -27.163116,25.718425 -55.993604,1.451342 l -6.041968,6.362253 0.255604,-21.981734 19.222582,-0.0062 -7.286947,7.931195 c 17.807901,14.295225 40.08457,18.165192 49.844333,6.243129 z"
-         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;stroke:#729fcf;stroke-width:2.63333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
-    </g>
-  </g>
-  <g
-     id="g2"
-     transform="translate(13.585508,20.676908)">
+     id="g4"
+     transform="translate(-24.754625,-23.400167)">
     <path
-       d="m 22,3.9997423 -3.999742,4.0002581 h -8 V 10.999806 H 14 v 4.000259 h -3.999742 v 4.999678 L 5.9999997,24 h 4.0503843 c 0.30326,-1e-6 0.571883,-0.195269 0.66559,-0.48369 l 0.723985,-2.22828 c 0.06925,-0.213087 0.236489,-0.379833 0.449583,-0.449065 l 0.556553,-0.180868 c 0.213108,-0.06926 0.446577,-0.03248 0.627866,0.09922 l 1.894968,1.377173 c 0.245331,0.178232 0.57787,0.178229 0.823203,0 l 1.698598,-1.234547 c 0.245363,-0.178242 0.347963,-0.493948 0.254247,-0.782378 l -0.723984,-2.22828 c -0.06926,-0.213109 -0.03197,-0.446575 0.09974,-0.627866 l 0.344164,-0.473355 c 0.131697,-0.181276 0.34179,-0.288856 0.565855,-0.28887 l 2.343001,5.1e-4 c 0.303278,10e-6 0.571885,-0.19577 0.66559,-0.484207 l 0.649054,-1.996771 c 0.0937,-0.288413 -0.0089,-0.60465 -0.254247,-0.782895 L 19.538664,11.858666 C 19.357381,11.726957 19.250306,11.516889 19.250311,11.292812 V 10.70732 c 1.9e-5,-0.224072 0.107062,-0.434681 0.288353,-0.566372 L 21.711646,8.5622376 C 21.892924,8.4305313 21.999999,8.219938 22,7.9958659 Z"
-       style="fill:#418fde;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.64567;stroke-linecap:square"
-       id="path8-9" />
-    <path
-       id="path7-7"
-       style="display:inline;fill:#ff585d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.64567;stroke-linecap:square"
-       d="m 18,0 -4,4 h 4 V 8 L 22,4 V 0 Z M 6,16 2,20 v 4 h 4 l 4,-4 H 6 Z" />
-    <path
-       d="M 6,0 2,4 V 20 L 6,16 V 4 h 8 l 4,-4 z"
-       style="fill:#cb333b;fill-rule:evenodd;stroke-width:2.64567;stroke-linecap:square"
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:#8ae234;fill-opacity:1;fill-rule:evenodd;stroke:#17230b;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+       d="m 45.628392,34.16514 v 5.682261 H 29.628021 v 9.470435 h 16.000371 v 5.682261 L 59.881299,44.582619 Z"
        id="path3" />
     <path
-       d="M 5.9999997,19.999743 H 10.000258 V 15.000065 H 14 V 10.999806 H 10.000258 V 8.0000004 h 8 V 3.9997423 H 5.9999997 Z"
-       style="fill:#fefefe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.64567;stroke-linecap:square"
-       id="path9-3" />
+       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient4);fill-opacity:1;fill-rule:evenodd;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+       d="m 47.629277,38.105469 v 3.742187 H 31.628392 v 5.470703 h 16.000885 v 3.742188 l 8.863281,-6.478516 z"
+       id="path4" />
   </g>
 </svg>
diff --git a/src/Gui/Icons/preferences-workbenches.svg b/src/Gui/Icons/preferences-workbenches.svg
index 3765f184d3..af42a7c1b5 100644
--- a/src/Gui/Icons/preferences-workbenches.svg
+++ b/src/Gui/Icons/preferences-workbenches.svg
@@ -145,14 +145,6 @@
       <g
          id="g3851-1"
          transform="matrix(0.60559561,0,0,0.60231489,11.869492,12.886321)">
-        <ellipse
-           style="fill:url(#radialGradient3079);fill-opacity:1;stroke:none"
-           id="path3885"
-           transform="matrix(0.98607933,0,0,0.88301034,1.1932644,6.9511055)"
-           cx="32.5"
-           cy="52"
-           rx="28.5"
-           ry="7" />
         <g
            transform="matrix(0.8782269,0,0,0.88301047,5.1375817,7.8341081)"
            id="g3821-0">
diff --git a/src/Gui/Icons/tree-sync-view.svg b/src/Gui/Icons/tree-sync-view.svg
index b2b56014c8..7610025401 100644
--- a/src/Gui/Icons/tree-sync-view.svg
+++ b/src/Gui/Icons/tree-sync-view.svg
@@ -2,26 +2,19 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="view-sync.svg"
-   inkscape:version="0.91 r13725"
-   sodipodi:version="0.32"
    id="svg11300"
    height="64"
    width="64"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs3">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3873">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
@@ -33,7 +26,6 @@
          id="stop3877" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3863">
       <stop
          style="stop-color:#34e0e2;stop-opacity:1"
@@ -56,7 +48,6 @@
          id="stop3257" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3253"
        id="radialGradient3270"
        gradientUnits="userSpaceOnUse"
@@ -77,13 +68,6 @@
          offset="1"
          id="stop11983" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective5736" />
     <linearGradient
        id="linearGradient2846">
       <stop
@@ -156,8 +140,7 @@
        cy="35.127438"
        cx="23.070683"
        id="radialGradient2097"
-       xlink:href="#linearGradient2091"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2091" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
        y2="34.976799"
@@ -165,8 +148,7 @@
        y1="22.851799"
        x1="16.874998"
        id="linearGradient7922"
-       xlink:href="#linearGradient7916"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7916" />
     <linearGradient
        y2="50.939667"
        x2="45.380436"
@@ -174,8 +156,7 @@
        x1="46.834816"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7186"
-       xlink:href="#linearGradient2871"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2871" />
     <linearGradient
        y2="26.649363"
        x2="53.588623"
@@ -183,8 +164,7 @@
        x1="18.935766"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7184"
-       xlink:href="#linearGradient2402"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2402" />
     <linearGradient
        y2="50.939667"
        x2="45.380436"
@@ -192,8 +172,7 @@
        x1="46.834816"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7182"
-       xlink:href="#linearGradient2871"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2871" />
     <linearGradient
        y2="20.60858"
        x2="15.984863"
@@ -201,8 +180,7 @@
        x1="62.513836"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7180"
-       xlink:href="#linearGradient2380"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2380" />
     <linearGradient
        gradientTransform="matrix(-1,0,0,-1,47.93934,50.02474)"
        y2="23.554308"
@@ -211,8 +189,7 @@
        x1="13.435029"
        gradientUnits="userSpaceOnUse"
        id="linearGradient7189"
-       xlink:href="#linearGradient7179"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7179" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
        y2="23.554308"
@@ -220,8 +197,7 @@
        y1="13.604306"
        x1="13.435029"
        id="linearGradient7185"
-       xlink:href="#linearGradient7179"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient7179" />
     <linearGradient
        gradientTransform="translate(-18.01785,-13.57119)"
        gradientUnits="userSpaceOnUse"
@@ -230,8 +206,7 @@
        y1="36.422989"
        x1="34.892849"
        id="linearGradient4975"
-       xlink:href="#linearGradient1322"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient1322" />
     <linearGradient
        id="linearGradient1322">
       <stop
@@ -255,8 +230,7 @@
          style="stop-color:#ffffff;stop-opacity:0.65979379;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient7179"
-       inkscape:collect="always">
+       id="linearGradient7179">
       <stop
          id="stop7181"
          offset="0"
@@ -273,11 +247,9 @@
        x1="5.9649177"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1491"
-       xlink:href="#linearGradient2797"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2797" />
     <linearGradient
-       id="linearGradient2797"
-       inkscape:collect="always">
+       id="linearGradient2797">
       <stop
          id="stop2799"
          offset="0"
@@ -294,8 +266,7 @@
        x1="5.9649177"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1493"
-       xlink:href="#linearGradient2797"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2797" />
     <linearGradient
        id="linearGradient2402">
       <stop
@@ -308,8 +279,7 @@
          style="stop-color:#528ac5;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient2871"
-       inkscape:collect="always">
+       id="linearGradient2871">
       <stop
          id="stop2873"
          offset="0"
@@ -327,11 +297,9 @@
        y1="30.748846"
        x1="32.647972"
        id="linearGradient2696"
-       xlink:href="#linearGradient2690"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2690" />
     <linearGradient
-       id="linearGradient2690"
-       inkscape:collect="always">
+       id="linearGradient2690">
       <stop
          id="stop2692"
          offset="0"
@@ -349,8 +317,7 @@
        y1="31.455952"
        x1="36.713837"
        id="linearGradient2688"
-       xlink:href="#linearGradient2682"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2682" />
     <linearGradient
        id="linearGradient2682">
       <stop
@@ -381,8 +348,7 @@
        gradientTransform="translate(-48.30498,-6.043298)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1486"
-       xlink:href="#linearGradient2831"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2831" />
     <linearGradient
        id="linearGradient2831">
       <stop
@@ -406,11 +372,9 @@
        gradientTransform="matrix(-1,0,0,-1,-1.24248,40.0817)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient1488"
-       xlink:href="#linearGradient2847"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient2847" />
     <linearGradient
-       id="linearGradient2847"
-       inkscape:collect="always">
+       id="linearGradient2847">
       <stop
          id="stop2849"
          offset="0"
@@ -429,11 +393,9 @@
        gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient1503"
-       xlink:href="#linearGradient8662"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient8662" />
     <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
+       id="linearGradient8662">
       <stop
          id="stop8664"
          offset="0"
@@ -455,8 +417,7 @@
          style="stop-color:#ffffff;stop-opacity:0.34020618;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient2091"
-       inkscape:collect="always">
+       id="linearGradient2091">
       <stop
          id="stop2093"
          offset="0"
@@ -467,7 +428,6 @@
          style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3253"
        id="radialGradient2695"
        gradientUnits="userSpaceOnUse"
@@ -478,7 +438,6 @@
        fy="6.4023118"
        r="27.986706" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3857"
        id="radialGradient3163"
        gradientUnits="userSpaceOnUse"
@@ -489,7 +448,6 @@
        fy="41.446495"
        r="12.458333" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3857">
       <stop
          style="stop-color:#34e0e2;stop-opacity:1"
@@ -501,7 +459,6 @@
          id="stop3861" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3863"
        id="linearGradient3869"
        x1="139.61827"
@@ -510,7 +467,6 @@
        y2="44.079514"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient8662"
        id="radialGradient1503-3"
        gradientUnits="userSpaceOnUse"
@@ -521,7 +477,6 @@
        fy="36.421127"
        r="15.644737" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3063-2"
        id="linearGradient4587"
        gradientUnits="userSpaceOnUse"
@@ -541,7 +496,6 @@
          style="stop-color:#204a87;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3873"
        id="linearGradient3034"
        gradientUnits="userSpaceOnUse"
@@ -561,7 +515,6 @@
          id="stop2384-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3873"
        id="linearGradient3034-4"
        gradientUnits="userSpaceOnUse"
@@ -570,7 +523,6 @@
        x2="46.731483"
        y2="21.766298" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3063-2"
        id="linearGradient4321"
        gradientUnits="userSpaceOnUse"
@@ -579,38 +531,6 @@
        x2="26.605606"
        y2="33.634254" />
   </defs>
-  <sodipodi:namedview
-     stroke="#3465a4"
-     inkscape:window-y="24"
-     inkscape:window-x="65"
-     inkscape:window-height="876"
-     inkscape:window-width="1375"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="true"
-     inkscape:current-layer="g3157"
-     inkscape:cy="28.87983"
-     inkscape:cx="-51.951967"
-     inkscape:zoom="2.828427"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#729fcf"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3070"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -627,7 +547,6 @@
         <dc:source>http://commons.wikimedia.org/wiki/Tango_icon</dc:source>
         <cc:license
            rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
-        <dc:title></dc:title>
       </cc:Work>
       <cc:License
          rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
@@ -647,44 +566,29 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
      id="layer1"
      transform="translate(0,16)">
     <g
        id="g3157"
        transform="matrix(1.7932228,0,0,1.7932228,-206.36667,-43.04439)">
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="rect3057"
          d="m 133,36.999994 4,-4 12,12.000016 -4,3.999987 z"
          style="fill:url(#linearGradient3869);fill-opacity:1;stroke:#042a2a;stroke-width:1.11531043000000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:2.04000000000000004" />
       <path
-         inkscape:connector-curvature="0"
          id="path3865"
          d="m 147.80553,45.380783 -10,-9.999995"
          style="fill:none;stroke:#34e0e2;stroke-width:1.11531043;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          transform="matrix(1.0183269,0,0,1.0183268,80.09464,-16.850374)"
          d="M 59,44.5 A 11.5,11.5 0 0 1 47.5,56 11.5,11.5 0 0 1 36,44.5 11.5,11.5 0 0 1 47.5,33 11.5,11.5 0 0 1 59,44.5 Z"
-         sodipodi:ry="11.5"
-         sodipodi:rx="11.5"
-         sodipodi:cy="44.5"
-         sodipodi:cx="47.5"
          id="path3055"
-         style="fill:url(#radialGradient3163);fill-opacity:1;stroke:#042a2a;stroke-width:1.09523809000000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000004"
-         sodipodi:type="arc" />
+         style="fill:url(#radialGradient3163);fill-opacity:1;stroke:#042a2a;stroke-width:1.09523809000000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000004" />
       <path
          transform="matrix(0.92134334,0,0,0.92134334,84.70136,-12.53461)"
          d="M 59,44.5 A 11.5,11.5 0 0 1 47.5,56 11.5,11.5 0 0 1 36,44.5 11.5,11.5 0 0 1 47.5,33 11.5,11.5 0 0 1 59,44.5 Z"
-         sodipodi:ry="11.5"
-         sodipodi:rx="11.5"
-         sodipodi:cy="44.5"
-         sodipodi:cx="47.5"
          id="path3055-1"
-         style="fill:none;stroke:#34e0e2;stroke-width:1.21052635;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04"
-         sodipodi:type="arc" />
+         style="fill:none;stroke:#34e0e2;stroke-width:1.21052635;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" />
       <ellipse
          ry="3.0896015"
          rx="8.6368198"
@@ -692,71 +596,46 @@
          cx="-128.1102"
          transform="scale(-1,-1)"
          id="path8660"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.38333333;fill:url(#radialGradient1503-3);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.38333333;fill:url(#radialGradient1503-3);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none" />
       <g
          id="g4346"
-         transform="translate(0.09858045,-0.29574134)">
+         transform="matrix(1.086755,0,0,1.0862006,-10.804533,-2.6448999)"
+         style="stroke-width:0.920404">
         <g
-           style="fill:url(#linearGradient4321);fill-opacity:1;stroke:#204a87;stroke-width:0.73280919;stroke-opacity:1"
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
+           style="fill:url(#linearGradient4321);fill-opacity:1;stroke:#204a87;stroke-width:0.674482;stroke-opacity:1"
            transform="matrix(-0.21458192,-0.17978428,-0.18129574,0.21279294,140.23095,24.974324)"
            id="g1878-1">
           <path
-             inkscape:connector-curvature="0"
-             inkscape:r_cy="true"
-             inkscape:r_cx="true"
-             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient3034);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:3.26039815;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient3034);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:3.00089;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
              d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.113843,3.1515478 7.6245439,20.496754 22.714328,33.219189 c 0,0 -0.251917,-9.88122 -0.251917,-9.88122 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
-             id="path1880-27"
-             sodipodi:nodetypes="ccccccc" />
+             id="path1880-27" />
         </g>
         <g
            id="g2805-0"
            transform="matrix(-0.18845081,-0.15789058,-0.15921799,0.18687969,138.79509,24.993869)"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true"
-           style="fill:none;stroke:#f0f0f0;stroke-width:0.73280919;stroke-opacity:1">
+           style="fill:none;stroke:#f0f0f0;stroke-width:0.674482;stroke-opacity:1">
           <path
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc"
              id="path2807-9"
              d="M 52.368857,42.344789 C 57.336994,33.465615 49.176003,12.601866 19.05552,12.672851 L 18.677956,5.6633463 7.4378077,19.282655 19.129354,29.167094 18.807724,20.554957 c 18.244937,0.381972 33.804002,9.457851 33.561133,21.789832 z"
-             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;stroke:#f0f0f0;stroke-width:2.20148993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
+             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;stroke:#f0f0f0;stroke-width:2.02626;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
         </g>
         <g
-           style="fill:url(#linearGradient4587);fill-opacity:1;stroke:#204a87;stroke-width:0.73280919;stroke-opacity:1"
-           inkscape:r_cy="true"
-           inkscape:r_cx="true"
+           style="fill:url(#linearGradient4587);fill-opacity:1;stroke:#204a87;stroke-width:0.674482;stroke-opacity:1"
            transform="matrix(0.21458192,0.17978428,0.18129574,-0.21279294,116.07282,32.308039)"
            id="g1878-6">
           <path
-             inkscape:connector-curvature="0"
-             inkscape:r_cy="true"
-             inkscape:r_cx="true"
-             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient3034-4);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:3.26039815;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient3034-4);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:3.00089;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
              d="M 44.306783,50.229694 C 62.821497,35.818859 49.664587,13.411704 22.462411,12.49765 L 22.113843,3.1515478 7.6245439,20.496754 22.714328,33.219189 c 0,0 -0.251917,-9.88122 -0.251917,-9.88122 18.82976,0.998977 32.981627,14.071729 21.844372,26.891725 z"
-             id="path1880-2"
-             sodipodi:nodetypes="ccccccc" />
+             id="path1880-2" />
         </g>
         <g
            id="g2805-4"
            transform="matrix(0.18845081,0.15789058,0.15921799,-0.18687969,117.50868,32.288494)"
-           inkscape:r_cx="true"
-           inkscape:r_cy="true"
-           style="fill:none;stroke:#f0f0f0;stroke-width:0.73280919;stroke-opacity:1">
+           style="fill:none;stroke:#f0f0f0;stroke-width:0.674482;stroke-opacity:1">
           <path
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccccc"
              id="path2807-5"
              d="M 52.368857,42.344789 C 57.864671,33.591679 49.176003,12.601866 19.05552,12.672851 L 18.677956,5.6633463 7.4378077,19.282655 19.129354,29.167094 18.807724,20.554957 c 18.244937,0.381972 33.804002,9.457851 33.561133,21.789832 z"
-             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;stroke:#f0f0f0;stroke-width:2.20148993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-             inkscape:r_cx="true"
-             inkscape:r_cy="true" />
+             style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;stroke:#f0f0f0;stroke-width:2.02626;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
         </g>
       </g>
     </g>
diff --git a/src/Gui/Icons/zoom-all.svg b/src/Gui/Icons/zoom-all.svg
index 0828ebca2d..f563e42423 100644
--- a/src/Gui/Icons/zoom-all.svg
+++ b/src/Gui/Icons/zoom-all.svg
@@ -152,11 +152,11 @@
        style="fill:none;stroke:#34e0e2;stroke-width:1.21052635;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" />
     <path
        style="fill:url(#linearGradient4221);fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 19,0 5,-9 5,9 z M 16,13 7,8 16,3 Z"
+       d="M 17,2 24,-9 31,2 Z M 18,15 7,8 18,1 Z"
        id="rect3871" />
     <path
        style="fill:url(#linearGradient1);fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 29,16 -5,9 -5,-9 z m 3,-13 9,5 -9,5 z"
+       d="M 31,14 24,25 17,14 Z M 30,1 41,8 30,15 Z"
        id="rect3871-7" />
   </g>
 </svg>