diff --git a/install.sh b/install.sh
index 85a7ee7..d9b483b 100755
--- a/install.sh
+++ b/install.sh
@@ -21,8 +21,8 @@ COLOR_VARIANTS=('' '-light' '-dark')
 SIZE_VARIANTS=('' '-compact')
 
 if [[ "$(command -v gnome-shell)" ]]; then
-  SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -2)"
-  if [[ "${SHELL_VERSION:-}" == '40.0' ]]; then
+  SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
+  if [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
     GS_VERSION="new"
   else
     GS_VERSION="old"
diff --git a/src/gnome-shell/sass/widgets/_panel.scss b/src/gnome-shell/sass/widgets/_panel.scss
index 606b2df..30648c5 100644
--- a/src/gnome-shell/sass/widgets/_panel.scss
+++ b/src/gnome-shell/sass/widgets/_panel.scss
@@ -98,7 +98,25 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
     }
 
     &#panelActivities {
-      -natural-hpadding: $container_padding * 3;
+      $size_suffix: if($laptop == 'true', '-small', '');
+      -natural-hpadding: $container_padding;
+      background-image: url("assets/activities#{$size_suffix}.svg");
+      background-position: center center;
+      background-repeat: no-repeat;
+      background-size: auto;
+      color: transparent;
+      background-color: transparent;
+      box-shadow: none;
+
+      &:hover {
+        background-image: url("assets/activities-active#{$size_suffix}.svg");
+      }
+
+      &:hover, &:active, &:overview, &:focus, &:checked {
+        color: transparent;
+        background-color: transparent;
+        box-shadow: none;
+      }
     }
   }
 
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-compact.css
index f2a8be4..a25b682 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css
index ffa1ea7..9c7f377 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-dark-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-dark.css
index b80d68b..df9686a 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-dark.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-green-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-green-compact.css
index c6e4536..e00ea5e 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-green-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-green-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-green-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-green-dark-compact.css
index a6fc617..4184679 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-green-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-green-dark-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-green-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-green-dark.css
index 6132632..d756665 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-green-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-green-dark.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-green.css b/src/gnome-shell/shell-40-0/gnome-shell-green.css
index 0f0efe2..1aa5f59 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-green.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-green.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-grey-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-grey-compact.css
index dd1dd6b..6d49aea 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-grey-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-grey-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-grey-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-grey-dark-compact.css
index e514479..ddccb19 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-grey-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-grey-dark-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-grey-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-grey-dark.css
index 263c6a7..7fc51cb 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-grey-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-grey-dark.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-grey.css b/src/gnome-shell/shell-40-0/gnome-shell-grey.css
index 3f37df6..7fa1f2b 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-grey.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-grey.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-orange-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-orange-compact.css
index d7fc61f..c0bb528 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-orange-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-orange-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-orange-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-orange-dark-compact.css
index 69490aa..cb23d89 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-orange-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-orange-dark-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-orange-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-orange-dark.css
index 3edaf95..21b8860 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-orange-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-orange-dark.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-orange.css b/src/gnome-shell/shell-40-0/gnome-shell-orange.css
index b7c9372..54c4b78 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-orange.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-orange.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-pink-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-pink-compact.css
index 7225a81..636dfc2 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-pink-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-pink-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-pink-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-pink-dark-compact.css
index a5be376..3101945 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-pink-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-pink-dark-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-pink-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-pink-dark.css
index 382a080..ff7c005 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-pink-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-pink-dark.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-pink.css b/src/gnome-shell/shell-40-0/gnome-shell-pink.css
index 4d59e07..32a6f51 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-pink.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-pink.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-purple-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-purple-compact.css
index 8b4f335..4d1afe6 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-purple-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-purple-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-purple-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-purple-dark-compact.css
index dafe5a7..5abfd95 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-purple-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-purple-dark-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-purple-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-purple-dark.css
index b43ce2d..916da9f 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-purple-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-purple-dark.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-purple.css b/src/gnome-shell/shell-40-0/gnome-shell-purple.css
index d456620..2f00ecd 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-purple.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-purple.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-red-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-red-compact.css
index f29aa5f..edc2fae 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-red-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-red-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-red-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-red-dark-compact.css
index 65b18bc..93c30ee 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-red-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-red-dark-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-red-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-red-dark.css
index 0ecb0be..fba84ad 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-red-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-red-dark.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-red.css b/src/gnome-shell/shell-40-0/gnome-shell-red.css
index 1f4c612..cfa73eb 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-red.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-red.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-yellow-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-yellow-compact.css
index 3e0923f..5f0842a 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-yellow-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-yellow-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-yellow-dark-compact.css b/src/gnome-shell/shell-40-0/gnome-shell-yellow-dark-compact.css
index fe4373f..cdfd180 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-yellow-dark-compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-yellow-dark-compact.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 12px;
+  -natural-hpadding: 4px;
+  background-image: url("assets/activities-small.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active-small.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-yellow-dark.css b/src/gnome-shell/shell-40-0/gnome-shell-yellow-dark.css
index 6f64669..041a689 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-yellow-dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-yellow-dark.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-yellow.css b/src/gnome-shell/shell-40-0/gnome-shell-yellow.css
index 84db5c7..d9a0df1 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-yellow.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-yellow.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css
index bfe3b31..5abd1a2 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -1850,7 +1850,24 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 #panel #panelActivities.panel-button {
-  -natural-hpadding: 18px;
+  -natural-hpadding: 6px;
+  background-image: url("assets/activities.svg");
+  background-position: center center;
+  background-repeat: no-repeat;
+  background-size: auto;
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
+}
+
+#panel #panelActivities.panel-button:hover {
+  background-image: url("assets/activities-active.svg");
+}
+
+#panel #panelActivities.panel-button:hover, #panel #panelActivities.panel-button:active, #panel #panelActivities.panel-button:overview, #panel #panelActivities.panel-button:focus, #panel #panelActivities.panel-button:checked {
+  color: transparent;
+  background-color: transparent;
+  box-shadow: none;
 }
 
 #panel.unlock-screen .panel-button:hover, #panel.unlock-screen .panel-button:active, #panel.unlock-screen .panel-button:overview, #panel.unlock-screen .panel-button:focus, #panel.unlock-screen .panel-button:checked, #panel.login-screen .panel-button:hover, #panel.login-screen .panel-button:active, #panel.login-screen .panel-button:overview, #panel.login-screen .panel-button:focus, #panel.login-screen .panel-button:checked, #panel:overview .panel-button:hover, #panel:overview .panel-button:active, #panel:overview .panel-button:overview, #panel:overview .panel-button:focus, #panel:overview .panel-button:checked {
diff --git a/test.sh b/test.sh
index 020bd47..cd47456 100755
--- a/test.sh
+++ b/test.sh
@@ -21,8 +21,8 @@ COLOR_VARIANTS=('' '-light' '-dark')
 SASSC_OPT=('-M' '-t' 'expanded')
 
 if [[ "$(command -v gnome-shell)" ]]; then
-  SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -2)"
-  if [[ "${SHELL_VERSION:-}" == '40.0' ]]; then
+  SHELL_VERSION="$(gnome-shell --version | cut -d ' ' -f 3 | cut -d . -f -1)"
+  if [[ "${SHELL_VERSION:-}" -ge "40" ]]; then
     GS_VERSION="new"
   else
     GS_VERSION="old"