diff --git a/appIcons.js b/appIcons.js
index a45f336..f08406f 100644
--- a/appIcons.js
+++ b/appIcons.js
@@ -135,6 +135,10 @@ var taskbarAppIcon = new Lang.Class({
         this._dotsContainer = new St.Widget({ layout_manager: new Clutter.BinLayout() });
 
         this.actor.remove_actor(this._iconContainer);
+        
+        let iconContainer = new St.Widget({ name: 'icon-container', layout_manager: new Clutter.BinLayout() });
+        
+        iconContainer.add_child(this._iconContainer);
 
         if (appInfo.window) {
             let box = new St.BoxLayout();
@@ -150,12 +154,12 @@ var taskbarAppIcon = new Lang.Class({
 
             this._scaleFactorChangedId = St.ThemeContext.get_for_stage(global.stage).connect('changed', () => this._updateWindowTitleStyle());
 
-            box.add_child(this._iconContainer);
+            box.add_child(iconContainer);
             box.add_child(this._windowTitle);
 
             this._dotsContainer.add_child(box);
         } else {
-            this._dotsContainer.add_child(this._iconContainer);
+            this._dotsContainer.add_child(iconContainer);
         }
 
         this._container.add_child(this._dotsContainer);
diff --git a/stylesheet.css b/stylesheet.css
index af1d3f9..f7b6d08 100644
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -21,23 +21,23 @@
  * Some code was also adapted from the upstream Gnome Shell source code.
  */
 
- #dashtopanelScrollview .app-well-app .overview-icon {
+#dashtopanelScrollview .app-well-app .overview-icon {
 	border-radius: 0;
 	border: none;
-	padding: 2px 6px;
+	padding: 2px;
+}
+
+#dashtopanelScrollview .app-well-app #icon-container {
+	padding: 0 4px 0 6px;
 }
 
 #dashtopanelScrollview .app-well-app .overview-label {
 	padding-right: 8px;
 }
 
-#show-apps-btn {
-	margin: 0;
-	padding: 0;
-}
-
-#show-apps-btn .overview-icon {
-	padding: 2px 8px;
+#show-apps-btn, #show-apps-btn .overview-icon {
+	margin: 0px;
+	padding: 0px;
 }
 
 #dashtopanelScrollview .app-well-app:hover .overview-icon,