diff --git a/modules/Tray.qml b/modules/Tray.qml
index 55f9894..3c1d4bc 100644
--- a/modules/Tray.qml
+++ b/modules/Tray.qml
@@ -24,8 +24,8 @@ RowLayout {
             property bool _hovered: false
             property real _pulseOpacity: 1
 
-            implicitWidth: 18
-            implicitHeight: 18
+            implicitWidth: M.Theme.fontSize + 4
+            implicitHeight: M.Theme.fontSize + 4
 
             SequentialAnimation {
                 running: iconItem._needsAttention
diff --git a/modules/Workspaces.qml b/modules/Workspaces.qml
index e16b54c..ee7df9b 100644
--- a/modules/Workspaces.qml
+++ b/modules/Workspaces.qml
@@ -86,8 +86,8 @@ Row {
                 }
             }
 
-            width: 20
-            height: 20
+            width: M.Theme.fontSize + 4
+            height: M.Theme.fontSize + 4
             radius: M.Theme.radius
             color: pill.active ? M.Theme.base0D : (pill._hovered ? M.Theme.base03 : M.Theme.base02)
             Behavior on color {