diff --git a/desktopenvs/hyprlua/eww-touch/eww.scss b/desktopenvs/hyprlua/eww-touch/eww.scss
index da979e2..9e31306 100644
--- a/desktopenvs/hyprlua/eww-touch/eww.scss
+++ b/desktopenvs/hyprlua/eww-touch/eww.scss
@@ -58,21 +58,26 @@ tooltip {
     background: #1a1a1a;
     color: #5018dd;
 
-    padding-top:5px;
-    margin-top:1px;
+    padding: 5px;
+    margin: 1px 4px;
 
-    padding-bottom:5px;
-    margin-bottom:1px;
-    
-    padding-left:5px;
-    margin-left:4px;
-
-    padding-right:5px;
-    margin-right:4px;
-    
     border-radius: 25px;
 }
 
+.icon-btn {
+    border: solid;
+    border-width: 3px;
+    background: #1a1a1a;
+    color: #5018dd;
+
+    padding: 5px;
+    margin: 1px 4px;
+
+    border-radius: 50%;
+    min-width: 28px;
+    min-height: 28px;
+}
+
 .workspace-active {
     color: #E40046;
   
diff --git a/desktopenvs/hyprlua/eww-touch/eww.yuck b/desktopenvs/hyprlua/eww-touch/eww.yuck
index f023a65..70a0fce 100644
--- a/desktopenvs/hyprlua/eww-touch/eww.yuck
+++ b/desktopenvs/hyprlua/eww-touch/eww.yuck
@@ -26,7 +26,7 @@
 	(box :orientation "h" :space-evenly false :halign "start"
 		(osk)
 		(box :class "music" {"${battery}"})
-		(button :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/drawer.sh" :class "music" {""})
+		(button :onclick "~/Dotfiles/desktopenvs/hyprland/scripts/drawer.sh" :class "icon-btn" {""})
 		(metric :label "󰓃 "
 		:value volume
 		:onchange "pactl set-sink-volume @DEFAULT_SINK@ {}%"
@@ -44,29 +44,29 @@
 
 (defwidget screenrotate []
 (box :orientation "h" :space-evenly false :halign "center"
-    (button :class "music"
+    (button :class "icon-btn"
        :orientation "h"
        :space-evenly false
        :halign "center"
-       :onclick "~/.config/scripts/workspacefocus/focusright.sh"
+       :onclick "~/.config/scripts/workspacefocus/focusleft.sh"
        {""}
     )
 
-    (button :class "music"
+    (button :class "icon-btn"
        :orientation "h"
        :space-evenly false
        :halign "center"
        :onclick "~/.config/scripts/screenrotationacw.sh"
        {"󱞧"}
     )
-    (button :class "music"
+    (button :class "icon-btn"
        :orientation "h"
        :space-evenly false
        :halign "center"
        :onclick "hyprctl dispatch killactive"
        {""}
     )
-    (button :class "music"
+    (button :class "icon-btn"
        :orientation "h"
        :space-evenly false
        :halign "center"
@@ -74,7 +74,7 @@
        {"󱞫"}
     )
 
-    (button :class "music"
+    (button :class "icon-btn"
        :orientation "h"
        :space-evenly false
        :halign "center"
@@ -93,7 +93,7 @@
     {music != "" ? " ${music}" : " None"}))
 
 (defwidget osk []
-    (button :class "music"
+    (button :class "icon-btn"
        :orientation "h"
        :space-evenly false
        :halign "center"