diff --git a/debian/changelog b/debian/changelog
index dce6705..f8e1ddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-shell-extension-zorin-taskbar (68.8) noble; urgency=medium
+
+  * Fixed app grid icon styling and rebased on upstream commit
+    4787d12180462f0c1c90d3f38ece5921e7e31b7a
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Fri, 05 Sep 2025 17:44:41 +0100
+
 gnome-shell-extension-zorin-taskbar (68.7) noble; urgency=medium
 
   * Adjusted window preview margin and rounding
diff --git a/metadata.json b/metadata.json
index 6066023..902a54d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -3,7 +3,7 @@
   "uuid": "zorin-taskbar@zorinos.com",
   "name": "Zorin Taskbar",
   "description": "A taskbar extension for the Zorin OS desktop.",
-  "shell-version": [ "46", "47", "48" ],
+  "shell-version": [ "46", "47", "48", "49" ],
   "gettext-domain": "zorin-taskbar",
   "settings-schema": "org.gnome.shell.extensions.zorin-taskbar",
   "version": 68
diff --git a/src/panelManager.js b/src/panelManager.js
index 1ddcb6b..9991a2d 100644
--- a/src/panelManager.js
+++ b/src/panelManager.js
@@ -43,6 +43,7 @@ import Meta from 'gi://Meta'
 import Shell from 'gi://Shell'
 import St from 'gi://St'
 
+import * as AppDisplay from 'resource:///org/gnome/shell/ui/appDisplay.js'
 import * as BoxPointer from 'resource:///org/gnome/shell/ui/boxpointer.js'
 import * as LookingGlass from 'resource:///org/gnome/shell/ui/lookingGlass.js'
 import * as Main from 'resource:///org/gnome/shell/ui/main.js'
@@ -63,6 +64,11 @@ export const PanelManager = class {
   }
 
   enable(reset) {
+    // g-s version 49 switched to clutter gestures
+    if (!AppDisplay.AppIcon.prototype._removeMenuTimeout)
+      AppDisplay.AppIcon.prototype._setPopupTimeout =
+        AppDisplay.AppIcon.prototype._removeMenuTimeout = () => {}
+
     this.allPanels = []
     this.dtpPrimaryMonitor = Main.layoutManager.primaryMonitor // The real primary monitor should always have the main panel
     this.proximityManager = new Proximity.ProximityManager()
diff --git a/src/stylesheet.css b/src/stylesheet.css
index eed3d52..be061a8 100644
--- a/src/stylesheet.css
+++ b/src/stylesheet.css
@@ -38,10 +38,6 @@
 	text-align: left;
 }
 
-.zorintaskbarMainPanel .dash-item-container .show-apps .overview-icon {
-	color: #FFF;
-}
-
 #zorintaskbarTaskbar .dash-item-container .overview-tile:hover,
 #zorintaskbarTaskbar .dash-item-container .overview-tile .dtp-container .overview-icon,
 .zorintaskbarMainPanel .dash-item-container .show-apps:hover .overview-icon {
diff --git a/src/transparency.js b/src/transparency.js
index b5d9af9..9c72a3c 100644
--- a/src/transparency.js
+++ b/src/transparency.js
@@ -201,7 +201,6 @@ export const DynamicTransparency = class {
         this._backgroundStyle +
         this._borderStyle,
     )
-    console.log('Set DTP Panel style to', this._dtpPanel.panel.get_style())
   }
 
   _getThemeBackground(reload) {