diff --git a/src/panel.js b/src/panel.js
index 7bc99d0..fdab618 100644
--- a/src/panel.js
+++ b/src/panel.js
@@ -755,7 +755,7 @@ export const Panel = GObject.registerClass(
       else if (!isVertical && panelSize - topBottomPadding * 2 < MIN_PANEL_SIZE)
         topBottomPadding = (panelSize - MIN_PANEL_SIZE) * 0.5
 
-      iconSize = innerSize = outerSize = panelSize
+      iconSize = innerSize = outerSize = panelSize * scaleFactor
 
       if (
         SETTINGS.get_boolean('stockgs-keep-top-panel') &&
diff --git a/src/taskbar.js b/src/taskbar.js
index 92e07bc..8003a05 100644
--- a/src/taskbar.js
+++ b/src/taskbar.js
@@ -1014,7 +1014,7 @@ export const Taskbar = class extends EventEmitter {
   }
 
   _adjustIconSize() {
-    let panelSize = this.dtpPanel.geom.iconSize
+    let panelSize = this.dtpPanel.geom.iconSize / Utils.getScaleFactor()
     let availSize = panelSize - SETTINGS.get_int('appicon-padding') * 2
     let minIconSize = MIN_ICON_SIZE + (panelSize % 2)