@@ -24,10 +24,11 @@ "grey": "#868686"
   }
   property var fontsize: {
     "topbar_text": 16,
-    "topbar_icon": 12,
-    "bottombar_text": 16,
+    "topbar_icon": 14,
+    "workspace_icon": 10,
+    "bottombar_text": 10,
     "bottombar_icon": 10,
-    "moonphase": 24
+    "moonphase": 24,
   }
 }
 

@@ -14,7 +14,9 @@ }
   margins {
     left: 0
     right:8
+    top: 0
+    bottom: 0
   }
-  implicitHeight: 24
+  height: 24
   color: Resources.palette.bg
 }

@@ -8,7 +8,7 @@
 Text {
   font.pixelSize: Resources.fontsize.bottombar_text
   color: Resources.palette.fg
-  font.family: font_proggy.name
-  renderType: Text.NativeRendering
+  // font.family: font_proggy.name
+  // renderType: Text.NativeRendering
 
 }

@@ -15,6 +15,7 @@ text: modelData.percentage*100+"%"
       color:  (modelData.percentage*100 < 20)
               ? Resources.palette.scarlet
               : Resources.palette.fg
+
       }
     Class.BottombarIcon {
       text: modelData.isLaptopBattery
@@ -23,6 +24,7 @@ : {
                 "Jupiter of the Monkey": Icons.devices.headphones,
                 "mix4": Icons.devices.mewi,
               }[modelData.model] ?? modelData.model
+
 
       color:
         ({

@@ -6,7 +6,14 @@ import Quickshell.Services.UPower
 import "../.."
 import "../classes" as Class
 
-Class.BottombarIcon {
-  text: Icons.network.crossed_empty +" MI_10023"
-  color: Resources.palette.grey
+RowLayout {
+  spacing: 2
+  Class.BottombarIcon {
+    text: Icons.network.crossed_empty + " MI_10023"
+    color: Resources.palette.grey
+  }
+  // Class.BottombarText {
+  //   text:"MI_10023"
+  //   color: Resources.palette.grey
+  // }
 }

@@ -1,12 +1,15 @@
-import Quickshell
 import QtQuick
-import Quickshell.I3
 import QtQuick.Controls.Basic
 import QtQuick.Layouts
+import Quickshell
+import Quickshell.I3
+import Quickshell.Widgets
 import "../classes" as Class
 import "../../"
+
 RowLayout {
   spacing: 0
+  Layout.maximumHeight:24
   id: workspaces
   property var ws_focused: I3.focusedWorkspace?.number
   Repeater {
@@ -15,24 +18,33 @@ Button {
       padding: 2
       onClicked: I3.dispatch(`workspace number `+modelData.number);
       background: Rectangle {
-        implicitWidth: 6
-        implicitHeight: 8
-        color: (modelData.name == ws_focused) ? Resources.palette.orange : Resources.palette.bg
+        width:16
+        height: 24
+        anchors.centerIn: parent
+        color: (modelData.name == ws_focused)
+          ? Resources.palette.orange
+          : Resources.palette.bg
       }
       contentItem: Text {
         id: wsLabel
+        property var ws_special: (modelData.number > 10)
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
         text: ({
           "11": Icons.workspaces.download,
           "12": Icons.workspaces.volume_mixer
-        })[modelData.name] ?? modelData.name
-        color: (modelData.name == ws_focused) ? Resources.palette.bg : Resources.palette.fg
-        font.family: (modelData.name == "11"|| modelData.name == "12") ? font_icon.name : font_proggy.name
-        font.pixelSize: (modelData.name == "11"|| modelData.name == "12") ? Resources.fontsize.topbar_icon : Resources.fontsize.topbar_text
+        }) [modelData.name] ?? modelData.name
+        padding: 0
+        color: (modelData.name == ws_focused)
+          ? Resources.palette.bg
+          : Resources.palette.fg
+        font.family: ws_special
+          ? font_icon.name
+          : font_proggy.name
+        font.pixelSize: ws_special
+          ? Resources.fontsize.workspace_icon
+          : Resources.fontsize.topbar_text
         renderType: Text.NativeRendering
-
-
       }
     }
   }

@@ -15,5 +15,9 @@ FontLoader {
     id: font_icon
     source: "fonts/SymbolsNerdFontMono-Regular.ttf"
   }
+  FontLoader {
+    id: font_XXX
+    source: "fonts/XXX"
+  }
   Bar {}
 }