diff --git a/config/hypr/scripts/Wlogout.sh b/config/hypr/scripts/Wlogout.sh
index f374653..e212601 100755
--- a/config/hypr/scripts/Wlogout.sh
+++ b/config/hypr/scripts/Wlogout.sh
@@ -10,8 +10,8 @@ A_1600=400
 B_1600=400
 A_1440=350
 B_1440=350
-A_1080=50
-B_1080=50
+A_1080=350
+B_1080=350
 A_720=50
 B_720=50
 
@@ -45,7 +45,7 @@ elif ((resolution >= 1080 && resolution < 1440)); then
     T_val=$(awk "BEGIN {printf \"%.0f\", $A_1080 * 1080 * $hypr_scale / $resolution}")
     B_val=$(awk "BEGIN {printf \"%.0f\", $B_1080 * 1080 * $hypr_scale / $resolution}")
     echo "Setting parameters for resolution >= 1080p and < 2k"
-    wlogout --protocol layer-shell -b 3 -T $T_val -B $B_val &
+    wlogout --protocol layer-shell -b 6 -T $T_val -B $B_val &
 elif ((resolution >= 720 && resolution < 1080)); then
     T_val=$(awk "BEGIN {printf \"%.0f\", $A_720 * 720 * $hypr_scale / $resolution}")
     B_val=$(awk "BEGIN {printf \"%.0f\", $B_720 * 720 * $hypr_scale / $resolution}")
diff --git a/config/waybar/modules b/config/waybar/modules
index 9956e30..e7606c4 100644
--- a/config/waybar/modules
+++ b/config/waybar/modules
@@ -196,17 +196,7 @@
 	"format-full": "{icon} Full",
 	"format-alt": "{icon} {time}",
 	"format-icons": [
-		"󰂎",
-		"󰁺",
-		"󰁻",
-		"󰁼",
-		"󰁽",
-		"󰁾",
-		"󰁿",
-		"󰂀",
-		"󰂁",
-		"󰂂",
-		"󰁹"
+		"󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
 	],
 	"format-time": "{H}h {M}min",
 	"tooltip": true,
@@ -257,14 +247,7 @@
 	"format-alt-click": "click",
 	"format-alt": "{icon0}{icon1}{icon2}{icon3} {usage:>2}% 󰍛",
 	"format-icons": [
-		"▁",
-		"▂",
-		"▃",
-		"▄",
-		"▅",
-		"▆",
-		"▇",
-		"█"
+		"▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"
 	],
 	"on-click-right": "gnome-system-monitor",
 },
@@ -370,11 +353,7 @@
 	"tooltip-format-disconnected": "󰌙 Disconnected",
 	"max-length": 50,
 	"format-icons": [
-		"󰤯",
-		"󰤟",
-		"󰤢",
-		"󰤥",
-		"󰤨"
+		"󰤯", "󰤟", "󰤢", "󰤥", "󰤨"
 	]
 },
 "network#speed": {
@@ -390,11 +369,7 @@
 	"tooltip-format-disconnected": "󰌙 Disconnected",
 	"max-length": 50,
 	"format-icons": [
-		"󰤯",
-		"󰤟",
-		"󰤢",
-		"󰤥",
-		"󰤨"
+		"󰤯", "󰤟", "󰤢", "󰤥", "󰤨"
 	]
 },
 "pulseaudio": {
@@ -409,10 +384,7 @@
 		"portable": "",
 		"car": "",
 		"default": [
-			"",
-			"",
-			"󰕾",
-			""
+			"", "", "󰕾",  ""
 		],
 		"ignored-sinks": [
 			"Easy Effects Sink"
@@ -454,8 +426,8 @@
 	"on-click-right": "kitty --title nvtop sh -c 'nvtop'"
 },
 "tray": {
-	"icon-size": 15,
-	"spacing": 8,
+	"icon-size": 18,
+	"spacing": 4,
 },
 "wireplumber": {
 	"format": "{icon} {volume} %",
@@ -465,10 +437,7 @@
 	"on-scroll-up": "~/.config/hypr/scripts/Volume.sh --inc",
 	"on-scroll-down": "~/.config/hypr/scripts/Volume.sh --dec",
 	"format-icons": [
-		"",
-		"",
-		"󰕾",
-		""
+		"", "", "󰕾", ""
 	],
 },
 "wlr/taskbar": {
@@ -506,7 +475,7 @@
 	"on-click": "~/.config/hypr/scripts/SwitchKeyboardLayout.sh",
 },
 "custom/light_dark": {
-	"format": "{}",
+	"format": "󰔎{}",
 	"exec": "echo ; echo 󰔎 Dark-Light switcher",
 	"on-click": "~/.config/hypr/scripts/DarkLight.sh",
 	"on-click-right": "~/.config/hypr/scripts/WaybarStyles.sh",
@@ -634,21 +603,7 @@
 	"format": "{icon}",
 	//"format-icons": ["󰃞", "󰃟", "󰃠"],
 	"format-icons": [
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		"",
-		""
+		"", "", "", "", "", "", "", "", "", "", "", "", "", "", ""
 	],
 	"on-click": "",
 	"on-click-middle": "",
@@ -699,10 +654,7 @@
 		"portable": "",
 		"car": "",
 		"default": [
-			"",
-			"",
-			"󰕾",
-			""
+			"", "", "󰕾", ""
 		],
 		"tooltip-format": "{icon} {desc} | {volume}%",
 		"ignored-sinks": [