From 1bd6dc3c75ffec6e5542fc64dfd635733a81b0b3 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Fri, 25 Dec 2020 12:29:27 +0800
Subject: [PATCH] update

---
 install.sh                                    |   6 +-
 .../gnome-shell/assets-dark/checkbox-off.svg  |   5 +-
 src/assets/gnome-shell/assets-dark/close.svg  |   3 -
 .../gnome-shell/assets-dark/no-events.svg     |   4 +-
 .../assets-dark/no-notifications.svg          |   8 +-
 .../gnome-shell/assets-light/checkbox-off.svg |   5 +-
 src/assets/gnome-shell/assets-light/close.svg |   3 -
 .../gnome-shell/assets-light/no-events.svg    |   4 +-
 .../assets-light/no-notifications.svg         |   8 +-
 .../gnome-shell/common-assets/checkbox.svg    |  79 +++-------
 .../common-assets/more-results.svg            |  77 +---------
 .../gnome-shell/common-assets/toggle-on.svg   | 136 ++----------------
 .../common-assets/window-close-active.svg     | 110 ++------------
 .../common-assets/window-close-hover.svg      | 110 ++------------
 .../common-assets/window-close.svg            | 110 ++------------
 .../{ => scalable/actions}/color-pick.svg     |   0
 .../pointer-double-click-symbolic.svg         |   0
 .../actions}/pointer-drag-symbolic.svg        |   0
 .../pointer-primary-click-symbolic.svg        |   0
 .../pointer-secondary-click-symbolic.svg      |   0
 .../status}/eye-not-looking-symbolic.svg      |   0
 .../eye-open-negative-filled-symbolic.svg     |   0
 .../keyboard-caps-lock-filled-symbolic.svg    |   0
 .../status}/keyboard-enter-symbolic.svg       |   0
 .../status}/keyboard-hide-symbolic.svg        |   0
 .../keyboard-layout-filled-symbolic.svg       |   0
 .../keyboard-shift-filled-symbolic.svg        |   0
 .../status}/message-indicator-symbolic.svg    |   0
 .../gnome-shell-theme.gresource.xml           |  33 +++--
 29 files changed, 105 insertions(+), 596 deletions(-)
 delete mode 100644 src/assets/gnome-shell/assets-dark/close.svg
 delete mode 100644 src/assets/gnome-shell/assets-light/close.svg
 rename src/assets/gnome-shell/icons/{ => scalable/actions}/color-pick.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/actions}/pointer-double-click-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/actions}/pointer-drag-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/actions}/pointer-primary-click-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/actions}/pointer-secondary-click-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/status}/eye-not-looking-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/status}/eye-open-negative-filled-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/status}/keyboard-caps-lock-filled-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/status}/keyboard-enter-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/status}/keyboard-hide-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/status}/keyboard-layout-filled-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/status}/keyboard-shift-filled-symbolic.svg (100%)
 rename src/assets/gnome-shell/icons/{ => scalable/status}/message-indicator-symbolic.svg (100%)

diff --git a/install.sh b/install.sh
index 756e0bc..0a3607d 100755
--- a/install.sh
+++ b/install.sh
@@ -118,9 +118,9 @@ install() {
   cp -r ${SRC_DIR}/assets/gnome-shell/activities/activities${icon}.svg                  ${THEME_DIR}/gnome-shell/assets/activities.svg
 
   cd "${THEME_DIR}/gnome-shell"
-  ln -s assets/no-events.svg no-events.svg
-  ln -s assets/process-working.svg process-working.svg
-  ln -s assets/no-notifications.svg no-notifications.svg
+  mv -f assets/no-events.svg no-events.svg
+  mv -f assets/process-working.svg process-working.svg
+  mv -f assets/no-notifications.svg no-notifications.svg
 
   if [[ ${alt} == '-alt' || ${opacity} == '-solid' ]] &&  [[ ${color} == '-light' ]]; then
     cp -r ${SRC_DIR}/assets/gnome-shell/activities-black/activities${icon}.svg          ${THEME_DIR}/gnome-shell/assets/activities.svg
diff --git a/src/assets/gnome-shell/assets-dark/checkbox-off.svg b/src/assets/gnome-shell/assets-dark/checkbox-off.svg
index 0c5e5a0..863d2eb 100644
--- a/src/assets/gnome-shell/assets-dark/checkbox-off.svg
+++ b/src/assets/gnome-shell/assets-dark/checkbox-off.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#FFFFFF" opacity="0.7">
-  <path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+<svg width="24" height="24" opacity=".7" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <rect x="2" y="2" width="20" height="20" rx="4" ry="4" color="#000000" fill="#ffffff" opacity=".12" stroke-width="1.25" style="paint-order:fill markers stroke"/>
+ <rect x="3" y="3" width="18" height="18" rx="3" ry="3" color="#000000" fill="#242424" stroke-width="1.2857" style="paint-order:fill markers stroke"/>
 </svg>
diff --git a/src/assets/gnome-shell/assets-dark/close.svg b/src/assets/gnome-shell/assets-dark/close.svg
deleted file mode 100644
index 984240c..0000000
--- a/src/assets/gnome-shell/assets-dark/close.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#FFFFFF" opacity="0.7">
-  <path d="M 17,8.41 15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 Z"/>
-</svg>
diff --git a/src/assets/gnome-shell/assets-dark/no-events.svg b/src/assets/gnome-shell/assets-dark/no-events.svg
index fd56f6b..3a0fca6 100644
--- a/src/assets/gnome-shell/assets-dark/no-events.svg
+++ b/src/assets/gnome-shell/assets-dark/no-events.svg
@@ -1,4 +1,4 @@
 <svg width="64px" height="64px" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m10 2.3636c-4.2096 0-8 3.3803-8 7.75v44.5c0 4.3696 3.7905 7.75 8 7.75h44c4.2096 0 8-3.3803 8-7.75v-44.5c0-4.3696-3.7905-7.75-8-7.75zm0 20h12.125v8h-12.125zm16.125 0h11.875v8h-11.875zm15.875 0h12v8h-12zm-32 12h12.125v8h-12.125zm16.125 0h11.875v8h-11.875zm15.875 0h12v8h-12zm-32 12h12.125v8h-12.125zm16.125 0h11.875v8h-11.875zm15.875 0h12v8h-12z" fill="#dedede"/>
- <rect x="42" y="34.364" width="12" height="8" fill="#dedede" opacity=".35" stroke-width="4"/>
+ <rect x="44" y="36" width="14" height="8" fill="#dedede" opacity=".1" stroke-width="4.3205"/>
+ <path d="m14 2c-6.648 0-12 5.352-12 12v36c0 6.648 5.352 12 12 12h36c6.648 0 12-5.352 12-12v-36c0-6.648-5.352-12-12-12h-36zm0 20h6v10h-14v-2c0-4.432 3.568-8 8-8zm10 0h16v10h-16v-10zm20 0h6c4.432 0 8 3.568 8 8v2h-14v-10zm-38 14h14v8h-14v-8zm18 0h16v8h-16v-8zm20 0h14v8h-14v-8zm-38 12h14v10h-6c-4.432 0-8-3.568-8-8v-2zm18 0h16v10h-16v-10zm20 0h14v2c0 4.432-3.568 8-8 8h-6v-10z" fill="#dedede" opacity=".35" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:markers stroke fill"/>
 </svg>
diff --git a/src/assets/gnome-shell/assets-dark/no-notifications.svg b/src/assets/gnome-shell/assets-dark/no-notifications.svg
index 7733357..0630181 100644
--- a/src/assets/gnome-shell/assets-dark/no-notifications.svg
+++ b/src/assets/gnome-shell/assets-dark/no-notifications.svg
@@ -1,6 +1,4 @@
-<svg width="64px" height="64px" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#dedede">
-  <path d="m31.769 7.7935c-8.8366 0-13.321 6-16 16l-4 20c-0.43324 2.1662-1.7909 4-4 4v4h48v-4c-2.2092 0-3.5668-1.8338-4-4l-4-20c-2.1213-10-7.1634-16-16-16z"/>
-  <path d="m32.472 55.794a6 6 0 0 0 5.6484 4 6 6 0 0 0 5.6484-4z"/>
- </g>
+<svg width="64" height="64" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m32 2a4 4 0 0 0-3.976 4.4 19.952 19.952 0 0 0-16.024 19.6v18l-8 8v2h56v-2l-8-8v-14.52a16 16 0 0 1-4 0.504v15.704l4 4.312h-40l4-4.312v-19.688a16 16 0 0 1 16-16c0.176 4e-3 0.348 0.012 0.52 0.024a16 16 0 0 1 2.964-5.968 4 4 0 0 0-3.484-2.056zm-6.92 56a8 8 0 0 0 6.92 4 8 8 0 0 0 6.912-4z" fill="#dedede" opacity=".35" stroke-width="4"/>
+ <path d="m60 14a12 12 0 0 1-24 0 12 12 0 1 1 24 0z" fill="#dedede" opacity=".35" stroke-width="4"/>
 </svg>
diff --git a/src/assets/gnome-shell/assets-light/checkbox-off.svg b/src/assets/gnome-shell/assets-light/checkbox-off.svg
index 14ff8d2..024556e 100644
--- a/src/assets/gnome-shell/assets-light/checkbox-off.svg
+++ b/src/assets/gnome-shell/assets-light/checkbox-off.svg
@@ -1,3 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#000000" opacity="0.54">
-  <path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>
+<svg width="24" height="24" fill="#000000" opacity=".54" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <rect x="2" y="2" width="20" height="20" rx="4" ry="4" color="#000000" opacity=".12" stroke-width="1.25" style="paint-order:fill markers stroke"/>
+ <rect x="3" y="3" width="18" height="18" rx="3" ry="3" color="#000000" fill="#ffffff" stroke-width="1.2857" style="paint-order:fill markers stroke"/>
 </svg>
diff --git a/src/assets/gnome-shell/assets-light/close.svg b/src/assets/gnome-shell/assets-light/close.svg
deleted file mode 100644
index 12a0359..0000000
--- a/src/assets/gnome-shell/assets-light/close.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#000000" opacity="0.54">
-  <path d="M 17,8.41 15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12 Z"/>
-</svg>
diff --git a/src/assets/gnome-shell/assets-light/no-events.svg b/src/assets/gnome-shell/assets-light/no-events.svg
index 4339d54..41f0fba 100644
--- a/src/assets/gnome-shell/assets-light/no-events.svg
+++ b/src/assets/gnome-shell/assets-light/no-events.svg
@@ -1,4 +1,4 @@
 <svg width="64px" height="64px" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <path d="m10 2.3636c-4.2096 0-8 3.3803-8 7.75v44.5c0 4.3696 3.7905 7.75 8 7.75h44c4.2096 0 8-3.3803 8-7.75v-44.5c0-4.3696-3.7905-7.75-8-7.75zm0 20h12.125v8h-12.125zm16.125 0h11.875v8h-11.875zm15.875 0h12v8h-12zm-32 12h12.125v8h-12.125zm16.125 0h11.875v8h-11.875zm15.875 0h12v8h-12zm-32 12h12.125v8h-12.125zm16.125 0h11.875v8h-11.875zm15.875 0h12v8h-12z" fill="#363636"/>
- <rect x="42" y="34.364" width="12" height="8" fill="#363636" opacity=".35"/>
+ <rect x="44" y="36" width="14" height="8" fill="#363636" opacity=".1"/>
+ <path d="m14 2c-6.648 0-12 5.352-12 12v36c0 6.648 5.352 12 12 12h36c6.648 0 12-5.352 12-12v-36c0-6.648-5.352-12-12-12h-36zm0 20h6v10h-14v-2c0-4.432 3.568-8 8-8zm10 0h16v10h-16v-10zm20 0h6c4.432 0 8 3.568 8 8v2h-14v-10zm-38 14h14v8h-14v-8zm18 0h16v8h-16v-8zm20 0h14v8h-14v-8zm-38 12h14v10h-6c-4.432 0-8-3.568-8-8v-2zm18 0h16v10h-16v-10zm20 0h14v2c0 4.432-3.568 8-8 8h-6v-10z" fill="#363636" opacity=".35"/>
 </svg>
diff --git a/src/assets/gnome-shell/assets-light/no-notifications.svg b/src/assets/gnome-shell/assets-light/no-notifications.svg
index 498a753..d790627 100644
--- a/src/assets/gnome-shell/assets-light/no-notifications.svg
+++ b/src/assets/gnome-shell/assets-light/no-notifications.svg
@@ -1,6 +1,4 @@
-<svg width="64px" height="64px" version="1.1" xmlns="http://www.w3.org/2000/svg">
- <g fill="#363636">
-  <path d="m31.769 7.7935c-8.8366 0-13.321 6-16 16l-4 20c-0.43324 2.1662-1.7909 4-4 4v4h48v-4c-2.2092 0-3.5668-1.8338-4-4l-4-20c-2.1213-10-7.1634-16-16-16z"/>
-  <path d="m32.472 55.794a6 6 0 0 0 5.6484 4 6 6 0 0 0 5.6484-4z"/>
- </g>
+<svg width="64" height="64" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m32 2a4 4 0 0 0-3.976 4.4 19.952 19.952 0 0 0-16.024 19.6v18l-8 8v2h56v-2l-8-8v-14.52a16 16 0 0 1-4 0.504v15.704l4 4.312h-40l4-4.312v-19.688a16 16 0 0 1 16-16c0.176 4e-3 0.348 0.012 0.52 0.024a16 16 0 0 1 2.964-5.968 4 4 0 0 0-3.484-2.056zm-6.92 56a8 8 0 0 0 6.92 4 8 8 0 0 0 6.912-4z" fill="#363636" opacity=".35" stroke-width="4"/>
+ <path d="m60 14a12 12 0 0 1-24 0 12 12 0 1 1 24 0z" fill="#363636" opacity=".35" stroke-width="4"/>
 </svg>
diff --git a/src/assets/gnome-shell/common-assets/checkbox.svg b/src/assets/gnome-shell/common-assets/checkbox.svg
index 6c0812b..a9cbc9d 100644
--- a/src/assets/gnome-shell/common-assets/checkbox.svg
+++ b/src/assets/gnome-shell/common-assets/checkbox.svg
@@ -1,60 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   fill="#000000"
-   height="24"
-   viewBox="0 0 24 24"
-   width="24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="checkbox.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="714"
-     id="namedview8"
-     showgrid="true"
-     inkscape:zoom="12.050278"
-     inkscape:cx="-16.694894"
-     inkscape:cy="3.1020107"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4140" />
-  </sodipodi:namedview>
-  <path
-     d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"
-     id="path6"
-     style="fill:#315bef;fill-opacity:1" />
+<svg width="24" height="24" fill="#000000" version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient id="ay" x1="18" x2="32" y1="38.362" y2="38.362" gradientTransform="matrix(1.2857 0 0 1.2857 -20.143 -37.323)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#5887fc" offset="0"/>
+  </linearGradient>
+  <linearGradient id="be" x1="24" x2="24" y1="45.362" y2="32.253" gradientTransform="matrix(1.2857 0 0 1.2968 -20.143 -37.826)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#3458c0" offset="0"/>
+   <stop stop-color="#3d67e3" offset="1"/>
+  </linearGradient>
+  <filter id="filter946" x="-.094335" y="-.12629" width="1.1887" height="1.2526" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.39306292"/>
+  </filter>
+ </defs>
+ <rect x="4" y="4" width="16" height="16" color="#000000" fill="none"/>
+ <rect x="2" y="2" width="20" height="20" rx="4" ry="4" color="#000000" opacity=".12" stroke-width="1.25" style="paint-order:fill markers stroke"/>
+ <rect x="3" y="3" width="18" height="18" rx="3" ry="3" color="#000000" fill="url(#ay)" stroke-width="1.2857" style="paint-order:fill markers stroke"/>
+ <rect x="3" y="4" width="18" height="17" rx="3" ry="3" color="#000000" fill="url(#be)" stroke-width="1.2966" style="paint-order:fill markers stroke"/>
+ <rect transform="rotate(45)" x="13.79" y="1.1834" width="3" height="1" fill-opacity="0"/>
+ <path d="m15.806 9.1937c-0.30486 0-0.60961 0.1158-0.84321 0.3494l-4.2161 4.2161-1.7633-1.761c-0.42502-0.42502-1.1424-0.39264-1.6095 0.07454-0.46719 0.46718-0.50189 1.1869-0.076923 1.6119l2.6066 2.6042 0.0768 0.07686c0.42502 0.42502 1.1424 0.39032 1.6095-0.07686l5.0593-5.0593c0.46719-0.46719 0.46719-1.2192 0-1.6865-0.2336-0.2336-0.53836-0.3494-0.84321-0.3494z" fill="#000000" filter="url(#filter946)" opacity=".15" stroke-width="1.1926"/>
+ <path d="m15.806 8.2653c-0.30486 0-0.60961 0.1158-0.84321 0.3494l-4.2161 4.2161-1.7633-1.761c-0.42502-0.42502-1.1424-0.39264-1.6095 0.07454-0.46719 0.46718-0.50189 1.1869-0.076923 1.6119l2.6066 2.6042 0.0768 0.07686c0.42502 0.42502 1.1424 0.39032 1.6095-0.07686l5.0593-5.0593c0.46719-0.46719 0.46719-1.2192 0-1.6865-0.2336-0.2336-0.53836-0.3494-0.84321-0.3494z" fill="#ffffff" stroke-width="1.1926"/>
 </svg>
diff --git a/src/assets/gnome-shell/common-assets/more-results.svg b/src/assets/gnome-shell/common-assets/more-results.svg
index da52d53..c5c4236 100644
--- a/src/assets/gnome-shell/common-assets/more-results.svg
+++ b/src/assets/gnome-shell/common-assets/more-results.svg
@@ -1,73 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   viewBox="0 0 16 16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="more-results.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.78125"
-     inkscape:cx="-2.7381005"
-     inkscape:cy="3.7903354"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     inkscape:window-width="1366"
-     inkscape:window-height="714"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4136" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <circle
-       style="fill:#315bef;fill-opacity:1;stroke:none"
-       id="path4138"
-       cx="8"
-       cy="1044.3622"
-       r="8" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="M 7 4 L 7 7 L 4 7 L 4 9 L 7 9 L 7 12 L 9 12 L 9 9 L 12 9 L 12 7 L 9 7 L 9 4 L 7 4 z "
-       transform="translate(0,1036.3622)"
-       id="rect4136" />
-  </g>
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(0 -1036.4)">
+  <circle cx="8" cy="1044.4" r="8" fill="#0860f2"/>
+  <path transform="translate(0 1036.4)" d="m7 4v3h-3v2h3v3h2v-3h3v-2h-3v-3h-2z" fill="#ffffff"/>
+ </g>
 </svg>
diff --git a/src/assets/gnome-shell/common-assets/toggle-on.svg b/src/assets/gnome-shell/common-assets/toggle-on.svg
index 8ca6b4d..7fdefdc 100644
--- a/src/assets/gnome-shell/common-assets/toggle-on.svg
+++ b/src/assets/gnome-shell/common-assets/toggle-on.svg
@@ -1,123 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
-   height="24"
-   viewBox="0 0 40 24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.5 (unknown)"
-   sodipodi:docname="toggle-on.svg">
-  <defs
-     id="defs4">
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="m"
-       x="-0.096000001"
-       y="-0.096000001"
-       width="1.192"
-       height="1.192">
-      <feGaussianBlur
-         stdDeviation="0.72"
-         id="feGaussianBlur75" />
-    </filter>
-    <linearGradient
-       id="selected_fg_color"
-       osb:paint="solid">
-      <stop
-         stop-color="#ffffffgit"
-         offset="0"
-         id="stop21" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.65625"
-     inkscape:cx="8.7099739"
-     inkscape:cy="14.461601"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     units="px"
-     width="40px"
-     inkscape:window-width="1920"
-     inkscape:window-height="1020"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-global="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4136" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1028.3622)">
-    <g
-       style="display:inline"
-       transform="translate(-6,1094.0002)"
-       id="switch-active">
-      <rect
-         style="opacity:0;stroke-width:0.87706"
-         id="rect524"
-         height="24"
-         width="40"
-         y="-65.638"
-         x="6" />
-      <g
-         id="g532"
-         transform="translate(-172.39,55.298)">
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#315bef;fill-opacity:1"
-           id="path526"
-           d="m 190.39,-119.94 h 16 c 6.094,0 11,4.46 11,10 0,5.54 -4.906,10 -11,10 h -16 c -6.094,0 -11,-4.46 -11,-10 0,-5.54 4.906,-10 11,-10 z" />
-        <circle
-           style="opacity:0.3;filter:url(#m)"
-           id="circle528"
-           r="9"
-           cy="-108.14"
-           cx="221.25999"
-           transform="matrix(0.93214,0,0,0.93214,0.14024,-8.1317)" />
-        <circle
-           style="fill:#ffffff"
-           id="circle530"
-           r="9"
-           cy="-108.14"
-           cx="221.25999"
-           transform="matrix(0.92593,0,0,0.92593,2.1887,-9.8037)" />
-      </g>
-    </g>
+<svg width="40" height="24" version="1.1" viewBox="0 0 40 24" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+ <defs>
+  <filter id="m" x="-.096" y="-.096" width="1.192" height="1.192" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.72"/>
+  </filter>
+ </defs>
+ <g transform="translate(0 -1028.4)">
+  <g id="switch-active" transform="translate(-6 1094)">
+   <rect x="6" y="-65.638" width="40" height="24" opacity="0" stroke-width=".87706"/>
+   <g transform="translate(-172.39,55.298)">
+    <path d="m190.39-119.94h16c6.094 0 11 4.46 11 10s-4.906 10-11 10h-16c-6.094 0-11-4.46-11-10s4.906-10 11-10z" fill="#0860f2"/>
+    <circle transform="matrix(.93214 0 0 .93214 .14024 -8.1317)" cx="221.26" cy="-108.14" r="9" filter="url(#m)" opacity=".3"/>
+    <circle transform="matrix(.92593 0 0 .92593 2.1887 -9.8037)" cx="221.26" cy="-108.14" r="9" fill="#ffffff"/>
+   </g>
   </g>
+ </g>
 </svg>
diff --git a/src/assets/gnome-shell/common-assets/window-close-active.svg b/src/assets/gnome-shell/common-assets/window-close-active.svg
index a31d8f7..0dde2b9 100644
--- a/src/assets/gnome-shell/common-assets/window-close-active.svg
+++ b/src/assets/gnome-shell/common-assets/window-close-active.svg
@@ -1,100 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="Foreground"
-   x="0px"
-   y="0px"
-   width="26"
-   height="26"
-   viewBox="0 0 18.909091 18.909091"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="close-active.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata2399"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs2397" /><sodipodi:namedview
-     inkscape:window-height="720"
-     inkscape:window-width="1364"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#3e3e3e"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="6.9788731"
-     inkscape:cy="7.4229136"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:current-layer="Foreground"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"><inkscape:grid
-       type="xygrid"
-       id="grid11246"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-3.6363603"
-       originy="-2.9090857" /></sodipodi:namedview><g
-     id="g3175-4"
-     transform="translate(1.8442616,0.64207471)"
-     style="opacity:0.8"><g
-       id="g3172-6" /></g><circle
-     style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:#f70505;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path3808-4"
-     cx="9.4545488"
-     cy="10.181814"
-     r="8" /><circle
-     style="opacity:1;fill:#d8354a;fill-opacity:1;stroke:#f70505;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path3808"
-     cx="9.4545488"
-     cy="9.454545"
-     r="8" /><g
-     inkscape:label="window-close"
-     id="g27275-6-6-6"
-     style="display:inline;fill:#000000;fill-opacity:1"
-     transform="matrix(0.72727272,0,0,0.72727272,4.1762041,2.78384)"><g
-       transform="translate(-41,-760)"
-       id="g27277-1-1-2"
-       style="display:inline;fill:#000000;fill-opacity:1" /></g><g
-     inkscape:label="window-close"
-     id="g27275-6-6"
-     style="display:inline;fill:#ffffff;fill-opacity:1"
-     transform="matrix(0.72727273,0,0,0.72727273,4.2045495,3.5383247)"><g
-       transform="translate(-41,-760)"
-       id="g27277-1-1"
-       style="display:inline;fill:#ffffff;fill-opacity:1"><path
-         d="m 44.226475,764.17222 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 l 2.28125,2.28125 2.3125,-2.28125 c 0.265625,-0.2305 0.446672,-0.3055 0.6875,-0.3125 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 c 0.188188,0.18817 0.281242,0.45345 0.28125,0.71875 l 0,1 -1,0 c -0.265301,-1e-5 -0.530586,-0.0931 -0.71875,-0.28125 l -2.28125,-2.28125 -2.28125,2.28125 c -0.188164,0.18819 -0.45346,0.28125 -0.71875,0.28125 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 -2.28125,-2.28125 c -0.210742,-0.19463 -0.30316,-0.46925 -0.28125,-0.75 l 0,-1 z"
-         inkscape:connector-curvature="0"
-         id="path27279-0-5"
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new"
-         sodipodi:nodetypes="ccsccccccccccccccccccccccc" /></g></g></svg>
+<svg id="Foreground" width="26" height="26" enable-background="new 0 0 16 16" version="1.0" viewBox="0 0 18.909 18.909" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter839" x="-.048" y="-.048" width="1.096" height="1.096" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.32"/>
+  </filter>
+ </defs>
+ <circle cx="9.4545" cy="10.182" r="8" fill="#000000" filter="url(#filter839)" opacity=".1" stroke-width="0"/>
+ <circle cx="9.4545" cy="9.4545" r="8" fill="#d8354a" stroke-width="0"/>
+ <path d="m6.1115 5.7478c-0.092952 1e-7 -0.18588 0.035309-0.2571 0.10653-0.14245 0.14245-0.14245 0.37175 0 0.5142l3.0852 3.0866-3.0852 3.0852c-0.14245 0.14245-0.14245 0.37175 0 0.5142 0.14245 0.14245 0.37317 0.14245 0.51562 0l3.0852-3.0852 3.0852 3.0852c0.14245 0.14245 0.37175 0.14245 0.5142 0 0.14245-0.14245 0.14245-0.37175 0-0.5142l-3.0852-3.0852 3.0852-3.0866c0.14245-0.14245 0.14245-0.37175 0-0.5142-0.14245-0.14245-0.37175-0.14245-0.5142 0l-3.0852 3.0852-3.0852-3.0852c-0.071224-0.071224-0.16557-0.10653-0.25852-0.10653z" fill="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.3606" style="paint-order:markers stroke fill"/>
+</svg>
diff --git a/src/assets/gnome-shell/common-assets/window-close-hover.svg b/src/assets/gnome-shell/common-assets/window-close-hover.svg
index 1211884..37f8806 100644
--- a/src/assets/gnome-shell/common-assets/window-close-hover.svg
+++ b/src/assets/gnome-shell/common-assets/window-close-hover.svg
@@ -1,100 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="Foreground"
-   x="0px"
-   y="0px"
-   width="26"
-   height="26"
-   viewBox="0 0 18.909091 18.909091"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="close-hover.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata2399"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs2397" /><sodipodi:namedview
-     inkscape:window-height="720"
-     inkscape:window-width="1364"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#3e3e3e"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="6.9788731"
-     inkscape:cy="7.4229136"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:current-layer="Foreground"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"><inkscape:grid
-       type="xygrid"
-       id="grid11246"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-3.6363603"
-       originy="-2.9090857" /></sodipodi:namedview><g
-     id="g3175-4"
-     transform="translate(1.8442616,0.64207471)"
-     style="opacity:0.8"><g
-       id="g3172-6" /></g><circle
-     style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:#f70505;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path3808-4"
-     cx="9.4545488"
-     cy="10.181814"
-     r="8" /><circle
-     style="opacity:1;fill:#ff7a80;fill-opacity:1;stroke:#f70505;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path3808"
-     cx="9.4545488"
-     cy="9.454545"
-     r="8" /><g
-     inkscape:label="window-close"
-     id="g27275-6-6-6"
-     style="display:inline;fill:#000000;fill-opacity:1"
-     transform="matrix(0.72727272,0,0,0.72727272,4.1762041,2.78384)"><g
-       transform="translate(-41,-760)"
-       id="g27277-1-1-2"
-       style="display:inline;fill:#000000;fill-opacity:1" /></g><g
-     inkscape:label="window-close"
-     id="g27275-6-6"
-     style="display:inline;fill:#ffffff;fill-opacity:1"
-     transform="matrix(0.72727273,0,0,0.72727273,4.2045495,3.5383247)"><g
-       transform="translate(-41,-760)"
-       id="g27277-1-1"
-       style="display:inline;fill:#ffffff;fill-opacity:1"><path
-         d="m 44.226475,764.17222 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 l 2.28125,2.28125 2.3125,-2.28125 c 0.265625,-0.2305 0.446672,-0.3055 0.6875,-0.3125 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 c 0.188188,0.18817 0.281242,0.45345 0.28125,0.71875 l 0,1 -1,0 c -0.265301,-1e-5 -0.530586,-0.0931 -0.71875,-0.28125 l -2.28125,-2.28125 -2.28125,2.28125 c -0.188164,0.18819 -0.45346,0.28125 -0.71875,0.28125 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 -2.28125,-2.28125 c -0.210742,-0.19463 -0.30316,-0.46925 -0.28125,-0.75 l 0,-1 z"
-         inkscape:connector-curvature="0"
-         id="path27279-0-5"
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new"
-         sodipodi:nodetypes="ccsccccccccccccccccccccccc" /></g></g></svg>
+<svg id="Foreground" width="26" height="26" enable-background="new 0 0 16 16" version="1.0" viewBox="0 0 18.909 18.909" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter839" x="-.048" y="-.048" width="1.096" height="1.096" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.32"/>
+  </filter>
+ </defs>
+ <circle cx="9.4545" cy="10.182" r="8" fill="#000000" filter="url(#filter839)" opacity=".1" stroke-width="0"/>
+ <circle cx="9.4545" cy="9.4545" r="8" fill="#ff7a80" stroke-width="0"/>
+ <path d="m6.1115 5.7478c-0.092952 1e-7 -0.18588 0.035309-0.2571 0.10653-0.14245 0.14245-0.14245 0.37175 0 0.5142l3.0852 3.0866-3.0852 3.0852c-0.14245 0.14245-0.14245 0.37175 0 0.5142 0.14245 0.14245 0.37317 0.14245 0.51562 0l3.0852-3.0852 3.0852 3.0852c0.14245 0.14245 0.37175 0.14245 0.5142 0 0.14245-0.14245 0.14245-0.37175 0-0.5142l-3.0852-3.0852 3.0852-3.0866c0.14245-0.14245 0.14245-0.37175 0-0.5142-0.14245-0.14245-0.37175-0.14245-0.5142 0l-3.0852 3.0852-3.0852-3.0852c-0.071224-0.071224-0.16557-0.10653-0.25852-0.10653z" fill="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.3606" style="paint-order:markers stroke fill"/>
+</svg>
diff --git a/src/assets/gnome-shell/common-assets/window-close.svg b/src/assets/gnome-shell/common-assets/window-close.svg
index 3694958..5dcc697 100644
--- a/src/assets/gnome-shell/common-assets/window-close.svg
+++ b/src/assets/gnome-shell/common-assets/window-close.svg
@@ -1,100 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-
-<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="Foreground"
-   x="0px"
-   y="0px"
-   width="26"
-   height="26"
-   viewBox="0 0 18.909091 18.909091"
-   enable-background="new 0 0 16 16"
-   xml:space="preserve"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="close.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-     id="metadata2399"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs2397" /><sodipodi:namedview
-     inkscape:window-height="720"
-     inkscape:window-width="1364"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#3e3e3e"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="6.9788731"
-     inkscape:cy="7.4229136"
-     inkscape:window-x="0"
-     inkscape:window-y="23"
-     inkscape:current-layer="Foreground"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"><inkscape:grid
-       type="xygrid"
-       id="grid11246"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-3.6363603"
-       originy="-2.9090857" /></sodipodi:namedview><g
-     id="g3175-4"
-     transform="translate(1.8442616,0.64207471)"
-     style="opacity:0.8"><g
-       id="g3172-6" /></g><circle
-     style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:#f70505;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path3808-4"
-     cx="9.4545488"
-     cy="10.181814"
-     r="8" /><circle
-     style="opacity:1;fill:#f75a61;fill-opacity:1;stroke:#f70505;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path3808"
-     cx="9.4545488"
-     cy="9.454545"
-     r="8" /><g
-     inkscape:label="window-close"
-     id="g27275-6-6-6"
-     style="display:inline;fill:#000000;fill-opacity:1"
-     transform="matrix(0.72727272,0,0,0.72727272,4.1762041,2.78384)"><g
-       transform="translate(-41,-760)"
-       id="g27277-1-1-2"
-       style="display:inline;fill:#000000;fill-opacity:1" /></g><g
-     inkscape:label="window-close"
-     id="g27275-6-6"
-     style="display:inline;fill:#ffffff;fill-opacity:1"
-     transform="matrix(0.72727273,0,0,0.72727273,4.2045495,3.5383247)"><g
-       transform="translate(-41,-760)"
-       id="g27277-1-1"
-       style="display:inline;fill:#ffffff;fill-opacity:1"><path
-         d="m 44.226475,764.17222 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 l 2.28125,2.28125 2.3125,-2.28125 c 0.265625,-0.2305 0.446672,-0.3055 0.6875,-0.3125 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 c 0.188188,0.18817 0.281242,0.45345 0.28125,0.71875 l 0,1 -1,0 c -0.265301,-1e-5 -0.530586,-0.0931 -0.71875,-0.28125 l -2.28125,-2.28125 -2.28125,2.28125 c -0.188164,0.18819 -0.45346,0.28125 -0.71875,0.28125 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 -2.28125,-2.28125 c -0.210742,-0.19463 -0.30316,-0.46925 -0.28125,-0.75 l 0,-1 z"
-         inkscape:connector-curvature="0"
-         id="path27279-0-5"
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new"
-         sodipodi:nodetypes="ccsccccccccccccccccccccccc" /></g></g></svg>
+<svg id="Foreground" width="26" height="26" enable-background="new 0 0 16 16" version="1.0" viewBox="0 0 18.909 18.909" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter879" x="-.048" y="-.048" width="1.096" height="1.096" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.32"/>
+  </filter>
+ </defs>
+ <circle cx="9.4545" cy="10.182" r="8" fill="#000000" filter="url(#filter879)" opacity=".1" stroke-width="0"/>
+ <circle cx="9.4545" cy="9.4545" r="8" fill="#f75a61" stroke-width="0"/>
+ <path d="m6.1115 5.7478c-0.092952 1e-7 -0.18588 0.035309-0.2571 0.10653-0.14245 0.14245-0.14245 0.37175 0 0.5142l3.0852 3.0866-3.0852 3.0852c-0.14245 0.14245-0.14245 0.37175 0 0.5142 0.14245 0.14245 0.37317 0.14245 0.51562 0l3.0852-3.0852 3.0852 3.0852c0.14245 0.14245 0.37175 0.14245 0.5142 0 0.14245-0.14245 0.14245-0.37175 0-0.5142l-3.0852-3.0852 3.0852-3.0866c0.14245-0.14245 0.14245-0.37175 0-0.5142-0.14245-0.14245-0.37175-0.14245-0.5142 0l-3.0852 3.0852-3.0852-3.0852c-0.071224-0.071224-0.16557-0.10653-0.25852-0.10653z" fill="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.3606" style="paint-order:markers stroke fill"/>
+</svg>
diff --git a/src/assets/gnome-shell/icons/color-pick.svg b/src/assets/gnome-shell/icons/scalable/actions/color-pick.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/color-pick.svg
rename to src/assets/gnome-shell/icons/scalable/actions/color-pick.svg
diff --git a/src/assets/gnome-shell/icons/pointer-double-click-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/pointer-double-click-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/pointer-double-click-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/actions/pointer-double-click-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/pointer-drag-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/pointer-drag-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/pointer-drag-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/actions/pointer-drag-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/pointer-primary-click-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/pointer-primary-click-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/pointer-primary-click-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/actions/pointer-primary-click-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/pointer-secondary-click-symbolic.svg b/src/assets/gnome-shell/icons/scalable/actions/pointer-secondary-click-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/pointer-secondary-click-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/actions/pointer-secondary-click-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/eye-not-looking-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/eye-not-looking-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/eye-not-looking-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/status/eye-not-looking-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/eye-open-negative-filled-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/eye-open-negative-filled-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/eye-open-negative-filled-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/status/eye-open-negative-filled-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/keyboard-caps-lock-filled-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/keyboard-caps-lock-filled-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/keyboard-enter-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/keyboard-enter-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/keyboard-enter-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/status/keyboard-enter-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/keyboard-hide-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/keyboard-hide-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/keyboard-hide-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/status/keyboard-hide-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/keyboard-layout-filled-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/keyboard-layout-filled-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/keyboard-layout-filled-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/status/keyboard-layout-filled-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/keyboard-shift-filled-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/keyboard-shift-filled-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/keyboard-shift-filled-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/status/keyboard-shift-filled-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/message-indicator-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/message-indicator-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/message-indicator-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/status/message-indicator-symbolic.svg
diff --git a/src/main/gnome-shell/gnome-shell-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
index 7ffd3d5..c982bb9 100644
--- a/src/main/gnome-shell/gnome-shell-theme.gresource.xml
+++ b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
@@ -6,7 +6,6 @@
     <file>assets/calendar-today.svg</file>
     <file>assets/checkbox.svg</file>
     <file>assets/checkbox-off.svg</file>
-    <file>assets/close.svg</file>
     <file>assets/dash-placeholder.svg</file>
     <file>assets/more-results.svg</file>
     <file>assets/noise-texture.svg</file>
@@ -17,22 +16,22 @@
     <file>assets/window-close-active.svg</file>
     <file>assets/activities.svg</file>
     <file>assets/background.jpg</file>
-    <file>icons/color-pick.svg</file>
-    <file>icons/eye-not-looking-symbolic.svg</file>
-    <file>icons/eye-open-negative-filled-symbolic.svg</file>
-    <file>icons/keyboard-caps-lock-filled-symbolic.svg</file>
-    <file>icons/keyboard-enter-symbolic.svg</file>
-    <file>icons/keyboard-hide-symbolic.svg</file>
-    <file>icons/keyboard-layout-filled-symbolic.svg</file>
-    <file>icons/keyboard-shift-filled-symbolic.svg</file>
-    <file>icons/message-indicator-symbolic.svg</file>
-    <file>icons/pointer-double-click-symbolic.svg</file>
-    <file>icons/pointer-drag-symbolic.svg</file>
-    <file>icons/pointer-primary-click-symbolic.svg</file>
-    <file>icons/pointer-secondary-click-symbolic.svg</file>
+    <file>icons/scalable/actions/color-pick.svg</file>
+    <file>icons/scalable/status/eye-not-looking-symbolic.svg</file>
+    <file>icons/scalable/status/eye-open-negative-filled-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-caps-lock-filled-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-enter-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-hide-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-layout-filled-symbolic.svg</file>
+    <file>icons/scalable/status/keyboard-shift-filled-symbolic.svg</file>
+    <file>icons/scalable/status/message-indicator-symbolic.svg</file>
+    <file>icons/scalable/actions/pointer-double-click-symbolic.svg</file>
+    <file>icons/scalable/actions/pointer-drag-symbolic.svg</file>
+    <file>icons/scalable/actions/pointer-primary-click-symbolic.svg</file>
+    <file>icons/scalable/actions/pointer-secondary-click-symbolic.svg</file>
     <file>gnome-shell.css</file>
-    <file alias="assets/no-events.svg">no-events.svg</file>
-    <file alias="assets/no-notifications.svg">no-notifications.svg</file>
-    <file alias="assets/process-working.svg">process-working.svg</file>
+    <file>no-events.svg</file>
+    <file>no-notifications.svg</file>
+    <file>process-working.svg</file>
   </gresource>
 </gresources>