symbolic: improve drive icons

 - more in-style harddisk icons
 - more distinct usb and zip icon in fallback

7 files changed, 195 insertions, 139 deletions

diff --git a/Adwaita/scalable/devices/drive-harddisk-ieee1394-symbolic.svg b/Adwaita/scalable/devices/drive-harddisk-ieee1394-symbolic.svg
index bc7d3bce1..7ec9672b8 100644
--- a/Adwaita/scalable/devices/drive-harddisk-ieee1394-symbolic.svg
+++ b/Adwaita/scalable/devices/drive-harddisk-ieee1394-symbolic.svg
@@ -1,3 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M3 1.035c-1 0-1 1-1 1v12s0 1 1 1h10s1 0 1-1v-12s0-1-1-1zm5 2a4 4 0 1 1 0 8H4v-4a4 4 0 0 1 4-4zm0 2a2 2 0 1 0 0 4 2 2 0 0 0 0-4z" fill="#474747"/>
+    <g fill="#2e3436">
+        <path d="M8 3a4 4 0 0 1 4 4c0 2.21-1.813 4.312-4 4H4V7a4 4 0 0 1 4-4zm0 2a2 2 0 1 0 0 4 2 2 0 0 0 0-4z"/>
+        <path d="M3.197 0A2.217 2.217 0 0 0 1 2.201V13.8C1 14.999 1.995 16 3.197 16h9.607A2.215 2.215 0 0 0 15 13.799V2.2C15 1.001 14.006 0 12.804 0zm0 2h9.607c.124 0 .196.07.196.201V13.8c0 .13-.072.201-.196.201H3.197C3.073 14 3 13.93 3 13.799V2.2c0-.13.073-.201.197-.201z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
+    </g>
 </svg>
diff --git a/Adwaita/scalable/devices/drive-harddisk-symbolic.svg b/Adwaita/scalable/devices/drive-harddisk-symbolic.svg
index bc7d3bce1..7ec9672b8 100644
--- a/Adwaita/scalable/devices/drive-harddisk-symbolic.svg
+++ b/Adwaita/scalable/devices/drive-harddisk-symbolic.svg
@@ -1,3 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M3 1.035c-1 0-1 1-1 1v12s0 1 1 1h10s1 0 1-1v-12s0-1-1-1zm5 2a4 4 0 1 1 0 8H4v-4a4 4 0 0 1 4-4zm0 2a2 2 0 1 0 0 4 2 2 0 0 0 0-4z" fill="#474747"/>
+    <g fill="#2e3436">
+        <path d="M8 3a4 4 0 0 1 4 4c0 2.21-1.813 4.312-4 4H4V7a4 4 0 0 1 4-4zm0 2a2 2 0 1 0 0 4 2 2 0 0 0 0-4z"/>
+        <path d="M3.197 0A2.217 2.217 0 0 0 1 2.201V13.8C1 14.999 1.995 16 3.197 16h9.607A2.215 2.215 0 0 0 15 13.799V2.2C15 1.001 14.006 0 12.804 0zm0 2h9.607c.124 0 .196.07.196.201V13.8c0 .13-.072.201-.196.201H3.197C3.073 14 3 13.93 3 13.799V2.2c0-.13.073-.201.197-.201z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
+    </g>
 </svg>
diff --git a/Adwaita/scalable/devices/drive-harddisk-system-symbolic.svg b/Adwaita/scalable/devices/drive-harddisk-system-symbolic.svg
index e720577f2..7ec9672b8 100644
--- a/Adwaita/scalable/devices/drive-harddisk-system-symbolic.svg
+++ b/Adwaita/scalable/devices/drive-harddisk-system-symbolic.svg
@@ -1,7 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#474747">
+    <g fill="#2e3436">
+        <path d="M8 3a4 4 0 0 1 4 4c0 2.21-1.813 4.312-4 4H4V7a4 4 0 0 1 4-4zm0 2a2 2 0 1 0 0 4 2 2 0 0 0 0-4z"/>
         <path d="M3.197 0A2.217 2.217 0 0 0 1 2.201V13.8C1 14.999 1.995 16 3.197 16h9.607A2.215 2.215 0 0 0 15 13.799V2.2C15 1.001 14.006 0 12.804 0zm0 2h9.607c.124 0 .196.07.196.201V13.8c0 .13-.072.201-.196.201H3.197C3.073 14 3 13.93 3 13.799V2.2c0-.13.073-.201.197-.201z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
-        <path d="M7.844 3c-.266.01-.545.059-.813.125a3.99 3.99 0 0 0-2.906 4.844 3.985 3.985 0 0 0 4.373 2.994l-.388-2.98A.39.39 0 0 1 8 8a1 1 0 1 1 1-1 .797.797 0 0 1-.073.325l2.701 1.387c.386-.83.47-1.78.247-2.68A3.985 3.985 0 0 0 7.844 3z" style="marker:none" color="#000" overflow="visible"/>
-        <path d="M8.661 8L10 12c.734 2.056 3 .384 1.497-1z" style="marker:none" color="#000" overflow="visible"/>
     </g>
 </svg>
diff --git a/Adwaita/scalable/devices/drive-harddisk-usb-symbolic.svg b/Adwaita/scalable/devices/drive-harddisk-usb-symbolic.svg
index bc7d3bce1..6d2bed149 100644
--- a/Adwaita/scalable/devices/drive-harddisk-usb-symbolic.svg
+++ b/Adwaita/scalable/devices/drive-harddisk-usb-symbolic.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <path d="M3 1.035c-1 0-1 1-1 1v12s0 1 1 1h10s1 0 1-1v-12s0-1-1-1zm5 2a4 4 0 1 1 0 8H4v-4a4 4 0 0 1 4-4zm0 2a2 2 0 1 0 0 4 2 2 0 0 0 0-4z" fill="#474747"/>
+    <path d="M8.5 0h-1l-2 4H7v5H4V7.729A2 2 0 0 0 5 6a2 2 0 1 0-3 1.73V9c0 2 2 2 2 2h3v1.271A2 2 0 0 0 6 14a2 2 0 1 0 3-1.73V11h3s2 0 2-2V8s1.125-.188 1-1V5c.125-1.125-1-1-1-1h-2c-1.063 0-1 1-1 1v2c0 1 1 1 1 1v1H9V4h1.5z" fill="#2e3436" fill-rule="evenodd"/>
 </svg>
diff --git a/Adwaita/scalable/devices/drive-multidisk-symbolic.svg b/Adwaita/scalable/devices/drive-multidisk-symbolic.svg
index d696be585..92c9b496e 100644
--- a/Adwaita/scalable/devices/drive-multidisk-symbolic.svg
+++ b/Adwaita/scalable/devices/drive-multidisk-symbolic.svg
@@ -1,6 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g color="#bebebe" font-weight="400" fill="#474747">
-        <path d="M3.196 0A2.215 2.215 0 0 0 1 2.201V9.8C1 10.999 1.994 12 3.196 12h6.609A2.215 2.215 0 0 0 12 9.799V2.2C12 1.001 11.006 0 9.805 0zM6.5 2C8.421 2 10 3.579 10 5.5S8.421 9 6.5 9H2.994L3 5.5C2.977 3.579 4.58 2 6.5 2zm0 2C5.66 4 5 4.66 5 5.5S5.66 7 6.5 7 8 6.34 8 5.5 7.34 4 6.5 4z" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;isolation:auto;mix-blend-mode:normal;marker:none" font-family="sans-serif" white-space="normal" overflow="visible"/>
+    <g color="#bebebe" font-weight="400" fill="#2e3436">
+        <path d="M3.195 0A2.215 2.215 0 0 0 1 2.201V9.8C1 10.999 1.993 12 3.195 12h6.61A2.215 2.215 0 0 0 12 9.799V2.2C12 1.001 11.006 0 9.804 0zM3.5 2h6c.277 0 .5.223.5.5v7c0 .277-.223.5-.5.5h-6a.499.499 0 0 1-.5-.5v-7c0-.277.223-.5.5-.5z" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;isolation:auto;mix-blend-mode:normal;marker:none" font-family="sans-serif" white-space="normal" overflow="visible"/>
         <path d="M13 4v9.813c0 .13-.064.187-.187.187H6.188C6.064 14 6 13.943 6 13.812V13H4v.813C4 15.012 4.986 16 6.188 16h6.625A2.197 2.197 0 0 0 15 13.812V6.189c0-1.136-.886-2.09-2-2.188z" style="line-height:normal;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration-line:none;text-transform:none;marker:none" font-family="Sans" overflow="visible"/>
+        <path d="M6.496 3.004c-1.371 0-2.515 1.127-2.498 2.498L3.994 8h2.502a2.51 2.51 0 0 0 2.498-2.498 2.509 2.509 0 0 0-2.498-2.498zM6.5 4.5a1 1 0 0 1 1 1 1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1z" style="line-height:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;isolation:auto;mix-blend-mode:normal;marker:none" font-family="sans-serif" white-space="normal" overflow="visible"/>
     </g>
 </svg>
diff --git a/Adwaita/scalable/devices/media-zip-symbolic.svg b/Adwaita/scalable/devices/media-zip-symbolic.svg
index e720577f2..1bee5aba3 100644
--- a/Adwaita/scalable/devices/media-zip-symbolic.svg
+++ b/Adwaita/scalable/devices/media-zip-symbolic.svg
@@ -1,7 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-    <g fill="#474747">
-        <path d="M3.197 0A2.217 2.217 0 0 0 1 2.201V13.8C1 14.999 1.995 16 3.197 16h9.607A2.215 2.215 0 0 0 15 13.799V2.2C15 1.001 14.006 0 12.804 0zm0 2h9.607c.124 0 .196.07.196.201V13.8c0 .13-.072.201-.196.201H3.197C3.073 14 3 13.93 3 13.799V2.2c0-.13.073-.201.197-.201z" style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;text-transform:none;text-orientation:mixed;shape-padding:0;isolation:auto;mix-blend-mode:normal;marker:none" color="#bebebe" font-weight="400" font-family="sans-serif" white-space="normal" overflow="visible"/>
-        <path d="M7.844 3c-.266.01-.545.059-.813.125a3.99 3.99 0 0 0-2.906 4.844 3.985 3.985 0 0 0 4.373 2.994l-.388-2.98A.39.39 0 0 1 8 8a1 1 0 1 1 1-1 .797.797 0 0 1-.073.325l2.701 1.387c.386-.83.47-1.78.247-2.68A3.985 3.985 0 0 0 7.844 3z" style="marker:none" color="#000" overflow="visible"/>
-        <path d="M8.661 8L10 12c.734 2.056 3 .384 1.497-1z" style="marker:none" color="#000" overflow="visible"/>
+    <g fill="#2e3436">
+        <path d="M3 1S1 1 1 3v11c0 .554.446 1 1 1h12c.554 0 1-.446 1-1V3s0-2-2-2h-1v2h1v10H3V3h1V1z"/>
+        <path d="M5.5 1h5c.277 0 .5.223.5.5v3c0 .277-.223.5-.5.5h-5a.499.499 0 0 1-.5-.5v-3c0-.277.223-.5.5-.5z"/>
     </g>
 </svg>
diff --git a/src/symbolic/gnome-stencils.svg b/src/symbolic/gnome-stencils.svg
index 37ec5c1e6..b7f82e0bd 100644
--- a/src/symbolic/gnome-stencils.svg
+++ b/src/symbolic/gnome-stencils.svg
@@ -33,13 +33,13 @@
      inkscape:window-height="1016"
      id="namedview88"
      showgrid="false"
-     inkscape:zoom="4"
-     inkscape:cx="101.24921"
-     inkscape:cy="311.57299"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-250.4067"
+     inkscape:cy="620.76003"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer4"
+     inkscape:current-layer="layer2"
      showborder="false"
      inkscape:snap-nodes="true"
      inkscape:snap-bbox="true"
@@ -11488,40 +11488,6 @@
     </g>
     <g
        style="display:inline;"
-       inkscape:label="media-zip"
-       transform="translate(-468.9998,-119)"
-       id="g22988">
-      <rect
-         y="447"
-         x="181"
-         height="16"
-         width="16"
-         id="rect12954"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.51464431;fill:none;stroke:none;stroke-width:3;marker:none;enable-background:accumulate;" />
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate;"
-         id="rect12956"
-         width="12"
-         height="14"
-         x="183"
-         y="448"
-         rx="1.1962026"
-         ry="1.2011019" />
-      <path
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;"
-         d="m 188.84375,450 c -0.26556,0.0109 -0.54445,0.0586 -0.8125,0.125 -2.14441,0.53085 -3.4371,2.69934 -2.90625,4.84375 0.4498,1.81699 2.07532,3.0225 3.86571,3.02533 0.16806,2.7e-4 0.33757,-0.0101 0.5077,-0.0315 l -0.3888,-2.97965 c -0.0347,0.01 -0.0704,0.017 -0.10961,0.017 -0.55254,0 -1,-0.44746 -1,-1 0,-0.55254 0.44746,-1 1,-1 0.55254,0 1,0.44746 1,1 0,0.11765 -0.0285,0.22486 -0.0726,0.32494 l 2.70058,1.38685 c 0.38616,-0.83016 0.46978,-1.78065 0.24701,-2.68054 -0.46449,-1.87636 -2.1723,-3.10719 -4.03125,-3.03125 z"
-         id="path12958"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccssccssssccssc" />
-      <path
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;"
-         d="M 189.66095,455 191,459 c 0.73426,2.05595 3,0.38433 1.4966,-1 z"
-         id="path12960"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <g
-       style="display:inline;"
        inkscape:label="colorimeter-colorhug"
        id="g22992"
        transform="translate(-508.9998,-119)">
@@ -12120,40 +12086,6 @@
          sodipodi:nodetypes="ccccccccccc" />
     </g>
     <g
-       style="display:inline;"
-       inkscape:label="drive-harddisk"
-       id="use22935"
-       transform="translate(104.0002,-30)">
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.51464431;fill:none;stroke:none;stroke-width:3;marker:none;enable-background:accumulate;"
-         id="rect12918"
-         width="16"
-         height="16"
-         x="48"
-         y="398" />
-      <path
-         sodipodi:nodetypes="sccscscssssscsssssss"
-         inkscape:connector-curvature="0"
-         id="rect8476"
-         d="m 50.999776,399.03456 c -1,0 -1,1 -1,1 v 12 c 0,0 0,1 1,1 h 10 c 0,0 1,0 1,-1 v -12 c 0,0 0,-1 -1,-1 z m 5,2 c 2.20914,0 4,1.79086 4,4 0,2.20914 -1.79086,4 -4,4 h -4 v -4 c 0,-2.20914 1.79086,-4 4,-4 z m 0,2 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
-         style="fill:#2e3436;fill-opacity:1;stroke:none;" />
-    </g>
-    <g
-       style="display:inline;"
-       id="g27129"
-       transform="translate(-207.9998,-22)"
-       inkscape:label="drive-harddisk-ieee1394">
-      <use
-         transform="translate(-212.0004,-18)"
-         id="use27127"
-         xlink:href="#use22935"
-         y="0"
-         x="0"
-         width="1"
-         height="1"
-         style="fill:#2e3436;fill-opacity:1;" />
-    </g>
-    <g
        transform="translate(124.0002,-30)"
        id="g27153"
        inkscape:label="drive-harddisk-solidstate"
@@ -12316,40 +12248,25 @@
          y="401" />
     </g>
     <g
-       style="display:inline;"
-       id="g15085"
-       inkscape:label="drive-harddisk-usb"
-       transform="translate(-187.9998,-22)">
-      <use
-         transform="translate(-212.0004,-18)"
-         height="100%"
-         width="100%"
-         id="use15083"
-         xlink:href="#use22935"
-         y="0"
-         x="0"
-         style="fill:#2e3436;fill-opacity:1;" />
-    </g>
-    <g
-       style="display:inline;"
+       style="display:inline"
        id="g13130-4"
-       transform="translate(52.0004,-149)"
-       inkscape:label="drive-multidisk">
+       transform="translate(-227.9996,-149)"
+       inkscape:label="drive-multidisk-old">
       <rect
          y="517"
          x="180"
          height="16"
          width="16"
          id="rect42759-9"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.51464431;fill:none;stroke:none;stroke-width:3;marker:none;enable-background:accumulate;" />
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.51464431;fill:none;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
       <path
          inkscape:connector-curvature="0"
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;"
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
          d="m -736.80469,270 c -1.20159,0 -2.19531,1.00125 -2.19531,2.20117 v 7.59766 c 0,1.19992 0.99372,2.20117 2.19531,2.20117 h 6.60938 c 1.20159,0 2.19531,-1.00125 2.19531,-2.20117 v -7.59766 C -728,271.00125 -728.99372,270 -730.19531,270 Z m 3.30469,2 c 1.92115,0 3.5,1.57885 3.5,3.5 0,1.92115 -1.57885,3.49958 -3.5,3.5 h -3.50586 l 0.006,-3.5 c -0.0237,-1.921 1.57885,-3.5 3.5,-3.5 z m 0,2 c -0.84027,0 -1.5,0.65973 -1.5,1.5 0,0.84027 0.65973,1.5 1.5,1.5 0.84027,0 1.5,-0.65973 1.5,-1.5 0,-0.84027 -0.65973,-1.5 -1.5,-1.5 z"
          transform="translate(920.0002,247)"
          id="rect42761-1" />
       <path
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.99999976;marker:none;enable-background:accumulate;"
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.99999976;marker:none;enable-background:accumulate"
          d="m 193.0002,521 v 2.1875 6.8125 0.8125 c 0,0.1309 -0.0637,0.1875 -0.1875,0.1875 h -6.625 c -0.1238,0 -0.1875,-0.0566 -0.1875,-0.1875 V 530 h -2 v 0.8125 c 0,1.19992 0.9859,2.1875 2.1875,2.1875 h 6.625 c 1.2016,0 2.1875,-0.98758 2.1875,-2.1875 v -7.625 c 0,-1.13596 -0.88628,-2.08992 -2,-2.1875 z"
          id="rect42761-1-8"
          inkscape:connector-curvature="0" />
@@ -12429,40 +12346,6 @@
          d="m 128.42882,477.46208 c 0.97712,1.36356 2.99179,2.46435 4.83654,2.2121"
          style="display:inline;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#2e3436;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;" />
     </g>
-    <g
-       id="g5776"
-       transform="translate(-488.9998,-119)"
-       inkscape:label="drive-harddisk-system"
-       style="display:inline;">
-      <rect
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.51464431;fill:none;stroke:none;stroke-width:3;marker:none;enable-background:accumulate;"
-         id="rect5768"
-         width="16"
-         height="16"
-         x="181"
-         y="447" />
-      <rect
-         ry="1.2011019"
-         rx="1.1962026"
-         y="448"
-         x="183"
-         height="14"
-         width="12"
-         id="rect5770"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate;" />
-      <path
-         sodipodi:nodetypes="ccssccssssccssc"
-         inkscape:connector-curvature="0"
-         id="path5772"
-         d="m 188.84375,450 c -0.26556,0.0109 -0.54445,0.0586 -0.8125,0.125 -2.14441,0.53085 -3.4371,2.69934 -2.90625,4.84375 0.4498,1.81699 2.07532,3.0225 3.86571,3.02533 0.16806,2.7e-4 0.33757,-0.0101 0.5077,-0.0315 l -0.3888,-2.97965 c -0.0347,0.01 -0.0704,0.017 -0.10961,0.017 -0.55254,0 -1,-0.44746 -1,-1 0,-0.55254 0.44746,-1 1,-1 0.55254,0 1,0.44746 1,1 0,0.11765 -0.0285,0.22486 -0.0726,0.32494 l 2.70058,1.38685 c 0.38616,-0.83016 0.46978,-1.78065 0.24701,-2.68054 -0.46449,-1.87636 -2.1723,-3.10719 -4.03125,-3.03125 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path5774"
-         d="M 189.66095,455 191,459 c 0.73426,2.05595 3,0.38433 1.4966,-1 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;" />
-    </g>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:125%;font-family:'Droid Sans';text-align:start;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;"
@@ -12817,6 +12700,174 @@
          d="m 256,452 c -2,0 -2,2 -2,2 v 12 c 0,2 2,2 2,2 h 8 c 0,0 2,0 2,-2 v -12 c 0,-2 -2,-2 -2,-2 z m 1.50781,2.97656 c 0.28227,-0.004 0.51224,0.22554 0.50781,0.50782 v 3.53124 h 1 v -4.03124 h 3 v 4.03124 h 0.51172 c 0.67616,-0.01 0.67616,1.00957 0,1 h -1.51172 v -4.03124 h -1 v 4.03124 h -3 v -4.53124 c -0.004,-0.27614 0.21604,-0.50351 0.49219,-0.50782 z"
          style="display:inline;fill:#2e3436;fill-opacity:1;stroke:none;enable-background:new;" />
     </g>
+    <g
+       transform="translate(-75.9998,-30)"
+       id="g3880"
+       inkscape:label="drive-harddisk-old"
+       style="display:inline">
+      <rect
+         y="398"
+         x="48"
+         height="16"
+         width="16"
+         id="rect3872"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.51464431;fill:none;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
+      <path
+         style="fill:#2e3436;fill-opacity:1;stroke:none"
+         d="m 50.999776,399.03456 c -1,0 -1,1 -1,1 v 12 c 0,0 0,1 1,1 h 10 c 0,0 1,0 1,-1 v -12 c 0,0 0,-1 -1,-1 z m 5,2 c 2.20914,0 4,1.79086 4,4 0,2.20914 -1.79086,4 -4,4 h -4 v -4 c 0,-2.20914 1.79086,-4 4,-4 z m 0,2 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+         id="path3878"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sccscscssssscsssssss" />
+    </g>
+    <g
+       id="g3943"
+       inkscape:label="drive-harddisk">
+      <path
+         sodipodi:nodetypes="ssscsssssss"
+         inkscape:connector-curvature="0"
+         id="rect8476"
+         d="m 159.99998,371 c 2.20914,0 4,1.79086 4,4 0,2.20914 -1.81306,4.31242 -4,4 H 156 l -2e-5,-4 c -1e-5,-2.20914 1.79086,-4 4,-4 z m 0,2 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+         style="fill:#2e3436;fill-opacity:1;stroke:none" />
+      <rect
+         ry="1.2011019"
+         rx="1.1962026"
+         y="369"
+         x="154.0002"
+         height="14"
+         width="12.0002"
+         id="rect3884"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         y="368"
+         x="152.0004"
+         height="16"
+         width="16"
+         id="rect3929"
+         style="opacity:0.02000002;fill:none;stroke:none" />
+    </g>
+    <g
+       id="g3981"
+       inkscape:label="drive-multidisk">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.51464431;fill:none;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
+         id="rect3950"
+         width="16"
+         height="16"
+         x="232.0004"
+         y="368" />
+      <path
+         id="path3952"
+         transform="translate(0,-64)"
+         d="M 235.19531 432 C 233.99372 432 233 433.00125 233 434.20117 L 233 441.79883 C 233 442.99875 233.99372 444 235.19531 444 L 241.80469 444 C 243.00628 444 244 442.99875 244 441.79883 L 244 434.20117 C 244 433.00125 243.00628 432 241.80469 432 L 235.19531 432 z M 235.5 434 L 241.5 434 C 241.777 434 242 434.223 242 434.5 L 242 441.5 C 242 441.777 241.777 442 241.5 442 L 235.5 442 C 235.223 442 235 441.777 235 441.5 L 235 434.5 C 235 434.223 235.223 434 235.5 434 z "
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3954"
+         d="m 245.0006,372 v 2.1875 6.8125 0.8125 c 0,0.1309 -0.0637,0.1875 -0.1875,0.1875 h -6.625 c -0.1238,0 -0.1875,-0.0566 -0.1875,-0.1875 V 381 h -2 v 0.8125 c 0,1.19992 0.9859,2.1875 2.1875,2.1875 h 6.625 c 1.2016,0 2.1875,-0.98758 2.1875,-2.1875 v -7.625 c 0,-1.13596 -0.88628,-2.08992 -2,-2.1875 z"
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1.99999976;marker:none;enable-background:accumulate" />
+      <path
+         id="path3962"
+         transform="translate(0,-64)"
+         d="M 238.49609 435.00391 C 237.12499 435.00391 235.98115 436.13095 235.99805 437.50195 L 235.99414 440 L 238.49609 440 C 239.86719 439.9997 240.99414 438.87305 240.99414 437.50195 C 240.99414 436.13084 239.86719 435.00391 238.49609 435.00391 z M 238.5 436.5 A 1 1 0 0 1 239.5 437.5 A 1 1 0 0 1 238.5 438.5 A 1 1 0 0 1 237.5 437.5 A 1 1 0 0 1 238.5 436.5 z "
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+    <g
+       id="g4094"
+       inkscape:label="drive-harddisk-usb"
+       transform="translate(-20)">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.51464431;fill:none;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
+         id="rect3910"
+         width="16"
+         height="16"
+         x="-248"
+         y="328" />
+      <path
+         style="display:inline;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;enable-background:new"
+         sodipodi:nodetypes="ccccccccsccsccccscccccccccccccccccc"
+         id="path10932"
+         d="m -239.5,328 h -1 l -2,4 h 1.5 v 5 h -3 v -1.27148 c 0.61771,-0.35663 0.99874,-1.01525 1,-1.72852 0,-1.10457 -0.89543,-2 -2,-2 -1.10457,0 -2,0.89543 -2,2 5.6e-4,0.71397 0.38169,1.37349 1,1.73047 V 337 c 0,2 2,2 2,2 h 3 v 1.27148 c -0.61771,0.35663 -0.99874,1.01525 -1,1.72852 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 -5.6e-4,-0.71397 -0.38169,-1.37349 -1,-1.73047 V 339 h 3 c 0,0 2,0 2,-2 v -1 c 0,0 1.125,-0.1875 1,-1 v -2 c 0.125,-1.125 -1,-1 -1,-1 h -2 c -1.0625,0 -1,1 -1,1 v 2 c 0,1 1,1 1,1 v 1 h -3 v -5 h 1.5 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g4152"
+       inkscape:label="media-zip"
+       transform="translate(40,-40)">
+      <rect
+         y="368"
+         x="-287.99979"
+         height="16"
+         width="16"
+         id="rect12954"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.51464431;fill:none;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7007"
+         d="m -285,369 c 0,0 -2,0 -2,2 v 11 c 0,0.554 0.446,1 1,1 h 12 c 0.554,0 1,-0.446 1,-1 v -11 c 0,0 0,-2 -2,-2 h -1 v 2 h 1 v 10 h -10 v -10 h 1 v -2 z"
+         style="display:inline;fill:#2e3436;fill-opacity:1;stroke:none;enable-background:new" />
+      <rect
+         ry="0.5"
+         y="369"
+         x="-283"
+         height="4"
+         width="6"
+         id="rect4143"
+         style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:56;stroke-opacity:1" />
+    </g>
+    <g
+       inkscape:label="drive-harddisk-system"
+       id="g4189"
+       transform="translate(-460,-40)">
+      <path
+         style="fill:#2e3436;fill-opacity:1;stroke:none"
+         d="m 159.99998,371 c 2.20914,0 4,1.79086 4,4 0,2.20914 -1.81306,4.31242 -4,4 H 156 l -2e-5,-4 c -1e-5,-2.20914 1.79086,-4 4,-4 z m 0,2 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+         id="path4183"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssscsssssss" />
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="rect4185"
+         width="12.0002"
+         height="14"
+         x="154.0002"
+         y="369"
+         rx="1.1962026"
+         ry="1.2011019" />
+      <rect
+         style="opacity:0.02000002;fill:none;stroke:none"
+         id="rect4187"
+         width="16"
+         height="16"
+         x="152.0004"
+         y="368" />
+    </g>
+    <g
+       transform="translate(-440,-40)"
+       id="g4198"
+       inkscape:label="drive-harddisk-ieee1394">
+      <path
+         sodipodi:nodetypes="ssscsssssss"
+         inkscape:connector-curvature="0"
+         id="path4191"
+         d="m 159.99998,371 c 2.20914,0 4,1.79086 4,4 0,2.20914 -1.81306,4.31242 -4,4 H 156 l -2e-5,-4 c -1e-5,-2.20914 1.79086,-4 4,-4 z m 0,2 c -1.10457,0 -2,0.89543 -2,2 0,1.10457 0.89543,2 2,2 1.10457,0 2,-0.89543 2,-2 0,-1.10457 -0.89543,-2 -2,-2 z"
+         style="fill:#2e3436;fill-opacity:1;stroke:none" />
+      <rect
+         ry="1.2011019"
+         rx="1.1962026"
+         y="369"
+         x="154.0002"
+         height="14"
+         width="12.0002"
+         id="rect4193"
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <rect
+         y="368"
+         x="152.0004"
+         height="16"
+         width="16"
+         id="rect4196"
+         style="opacity:0.02000002;fill:none;stroke:none" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"