diff --git a/config/astal/components/QuickActions/modules/Audio/Audio.tsx b/config/astal/components/QuickActions/modules/Audio/Audio.tsx
index 3f2d4b4..a583173 100644
--- a/config/astal/components/QuickActions/modules/Audio/Audio.tsx
+++ b/config/astal/components/QuickActions/modules/Audio/Audio.tsx
@@ -113,6 +113,7 @@ const SinkPicker = (type: AstalWp.MediaClass) => {
         <box vertical>
             <label
                 label={`Available Audio ${type === AstalWp.MediaClass.AUDIO_SPEAKER ? "Output" : type === AstalWp.MediaClass.AUDIO_MICROPHONE ? "Input" : ""} Devices`}
+                cssClasses={[ 'title-2' ]}
             ></label>
             <Gtk.Separator marginBottom={5} marginTop={3}></Gtk.Separator>
             <box vertical cssClasses={["sink-picker"]}>
diff --git a/config/astal/components/bar/bar.scss b/config/astal/components/bar/bar.scss
index 3f13c37..97deb83 100644
--- a/config/astal/components/bar/bar.scss
+++ b/config/astal/components/bar/bar.scss
@@ -61,6 +61,6 @@ window.Bar {
   }
   
   .quick-view-symbol {
-    margin: 2px;
+    margin: 4px;
   }
 }
diff --git a/config/astal/components/bar/modules/Hyprland.tsx b/config/astal/components/bar/modules/Hyprland.tsx
index 823e5aa..01ac80b 100644
--- a/config/astal/components/bar/modules/Hyprland.tsx
+++ b/config/astal/components/bar/modules/Hyprland.tsx
@@ -121,11 +121,15 @@ const WindowPopoverBox = () => {
         <box vertical>
             {bind(hypr, 'clients').as(clients => {
                 return clients.map(client => {
-                    return <box>
-                        <label label={bind(client, 'workspace').as(w => `(WS ${w.name})`)}></label>
-                        <label label={bind(client, 'initialClass').as(c => `[${c}]`)}></label>
-                        <label label={bind(client, 'title')}></label>
-                    </box>
+                    return <button child={
+                        <box>
+                            <label label={bind(client, 'workspace').as(w => `(WS ${w.name})`)}></label>
+                            <label label={bind(client, 'initialClass').as(c => `[${c}]`)}></label>
+                            <label label={bind(client, 'title')}></label>
+                        </box>
+                    }
+                    onClicked={() => client.focus()}
+                    ></button>
                 })
             })}
         </box>
diff --git a/config/astal/components/bar/modules/SystemInfo.tsx b/config/astal/components/bar/modules/SystemInfo.tsx
index d4140f0..0c272cf 100644
--- a/config/astal/components/bar/modules/SystemInfo.tsx
+++ b/config/astal/components/bar/modules/SystemInfo.tsx
@@ -60,18 +60,30 @@ const SystemInfo = () => {
                 onClicked={() => openSysInfo()}
                 child={
                     <box tooltipText={sysinfo.ramUsed(v => v)}>
-                        <image
-                            iconName={"power-profile-performance-symbolic"}
-                            marginEnd={1}
-                        ></image>
-                        <label
-                            label={sysinfo.cpuUtil(util => util)}
-                            marginEnd={5}
-                        ></label>
-                        <image iconName={"histogram-symbolic"}></image>
-                        <label label={sysinfo.ramUtil(util => util)}></label>
-                        <image iconName={"show-gpu-effects-symbolic"}></image>
-                        <label label={sysinfo.gpuUtil(util => util)}></label>
+                        <box
+                            cssClasses={[ 'quick-view-symbol' ]}
+                        >
+                            <image
+                                iconName={"power-profile-performance-symbolic"}
+                                marginEnd={1}
+                            ></image>
+                            <label
+                                label={sysinfo.cpuUtil(util => util)}
+                                marginEnd={5}
+                            ></label>
+                        </box>
+                        <box
+                            cssClasses={[ 'quick-view-symbol' ]}
+                        >
+                            <image iconName={"histogram-symbolic"}></image>
+                            <label label={sysinfo.ramUtil(util => util)}></label>
+                        </box>
+                        <box
+                            cssClasses={[ 'quick-view-symbol' ]}
+                        >
+                            <image iconName={"show-gpu-effects-symbolic"}></image>
+                            <label label={sysinfo.gpuUtil(util => util)}></label>
+                        </box>
                         {panel}
                     </box>
                 }