From 4c06fef35d14627e2bde8f52a89ceba54311c895 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Sat, 20 Dec 2025 19:32:24 +0900
Subject: [PATCH] support svgs with currentColor

---
 wgui/src/renderer_vk/text/custom_glyph.rs          | 9 +++++++--
 wlx-overlay-s/src/assets/edit/3d.svg               | 2 +-
 wlx-overlay-s/src/assets/edit/3d_bottomtop.svg     | 2 +-
 wlx-overlay-s/src/assets/edit/3d_leftright.svg     | 2 +-
 wlx-overlay-s/src/assets/edit/3d_rightleft.svg     | 2 +-
 wlx-overlay-s/src/assets/edit/3d_topbottom.svg     | 2 +-
 wlx-overlay-s/src/assets/edit/add.svg              | 2 +-
 wlx-overlay-s/src/assets/edit/anchor.svg           | 2 +-
 wlx-overlay-s/src/assets/edit/background-off.svg   | 2 +-
 wlx-overlay-s/src/assets/edit/background.svg       | 2 +-
 wlx-overlay-s/src/assets/edit/cancel.svg           | 2 +-
 wlx-overlay-s/src/assets/edit/checkbox-checked.svg | 2 +-
 wlx-overlay-s/src/assets/edit/checkbox.svg         | 2 +-
 wlx-overlay-s/src/assets/edit/close.svg            | 2 +-
 wlx-overlay-s/src/assets/edit/curve.svg            | 2 +-
 wlx-overlay-s/src/assets/edit/delete.svg           | 2 +-
 wlx-overlay-s/src/assets/edit/disable-grab.svg     | 2 +-
 wlx-overlay-s/src/assets/edit/fade.svg             | 2 +-
 wlx-overlay-s/src/assets/edit/flip180.svg          | 2 +-
 wlx-overlay-s/src/assets/edit/flip270.svg          | 2 +-
 wlx-overlay-s/src/assets/edit/flip90.svg           | 2 +-
 wlx-overlay-s/src/assets/edit/flipped.svg          | 2 +-
 wlx-overlay-s/src/assets/edit/float.svg            | 2 +-
 wlx-overlay-s/src/assets/edit/grabbable.svg        | 2 +-
 wlx-overlay-s/src/assets/edit/grid.svg             | 2 +-
 wlx-overlay-s/src/assets/edit/inout.svg            | 2 +-
 wlx-overlay-s/src/assets/edit/lock.svg             | 2 +-
 wlx-overlay-s/src/assets/edit/lock_open.svg        | 2 +-
 wlx-overlay-s/src/assets/edit/mirror.svg           | 2 +-
 wlx-overlay-s/src/assets/edit/mouse.svg            | 2 +-
 wlx-overlay-s/src/assets/edit/mouse_lock.svg       | 2 +-
 wlx-overlay-s/src/assets/edit/move-all.svg         | 2 +-
 wlx-overlay-s/src/assets/edit/move-horizontal.svg  | 2 +-
 wlx-overlay-s/src/assets/edit/normal.svg           | 2 +-
 wlx-overlay-s/src/assets/edit/panel.svg            | 2 +-
 wlx-overlay-s/src/assets/edit/pin.svg              | 2 +-
 wlx-overlay-s/src/assets/edit/resize.svg           | 2 +-
 wlx-overlay-s/src/assets/edit/rotate180.svg        | 2 +-
 wlx-overlay-s/src/assets/edit/rotate270.svg        | 2 +-
 wlx-overlay-s/src/assets/edit/rotate90.svg         | 2 +-
 wlx-overlay-s/src/assets/edit/screen-add.svg       | 2 +-
 wlx-overlay-s/src/assets/edit/screen-options.svg   | 2 +-
 wlx-overlay-s/src/assets/edit/screen-remove.svg    | 2 +-
 wlx-overlay-s/src/assets/edit/screen.svg           | 2 +-
 wlx-overlay-s/src/assets/edit/wayvr.svg            | 2 +-
 wlx-overlay-s/src/assets/icons/bell.svg            | 2 +-
 wlx-overlay-s/src/assets/keyboard/backspace.svg    | 2 +-
 wlx-overlay-s/src/assets/keyboard/down.svg         | 2 +-
 wlx-overlay-s/src/assets/keyboard/left.svg         | 2 +-
 wlx-overlay-s/src/assets/keyboard/menu.svg         | 2 +-
 wlx-overlay-s/src/assets/keyboard/return.svg       | 2 +-
 wlx-overlay-s/src/assets/keyboard/right.svg        | 2 +-
 wlx-overlay-s/src/assets/keyboard/shift.svg        | 2 +-
 wlx-overlay-s/src/assets/keyboard/super.svg        | 2 +-
 wlx-overlay-s/src/assets/keyboard/swap.svg         | 2 +-
 wlx-overlay-s/src/assets/keyboard/tab.svg          | 2 +-
 wlx-overlay-s/src/assets/keyboard/up.svg           | 2 +-
 wlx-overlay-s/src/assets/watch/controller_r.svg    | 2 +-
 wlx-overlay-s/src/assets/watch/display.svg         | 2 +-
 wlx-overlay-s/src/assets/watch/edit.svg            | 2 +-
 wlx-overlay-s/src/assets/watch/fix-floor.svg       | 2 +-
 wlx-overlay-s/src/assets/watch/hmd.svg             | 2 +-
 wlx-overlay-s/src/assets/watch/home.svg            | 2 +-
 wlx-overlay-s/src/assets/watch/keyboard.svg        | 2 +-
 wlx-overlay-s/src/assets/watch/mirror-off.svg      | 2 +-
 wlx-overlay-s/src/assets/watch/recenter.svg        | 2 +-
 wlx-overlay-s/src/assets/watch/restart.svg         | 2 +-
 wlx-overlay-s/src/assets/watch/set2.svg            | 2 +-
 wlx-overlay-s/src/assets/watch/settings.svg        | 2 +-
 wlx-overlay-s/src/assets/watch/track.svg           | 2 +-
 wlx-overlay-s/src/assets/watch/track2.svg          | 2 +-
 wlx-overlay-s/src/assets/watch/track3.svg          | 2 +-
 72 files changed, 78 insertions(+), 73 deletions(-)

diff --git a/wgui/src/renderer_vk/text/custom_glyph.rs b/wgui/src/renderer_vk/text/custom_glyph.rs
index 59318aa..ed4fd57 100644
--- a/wgui/src/renderer_vk/text/custom_glyph.rs
+++ b/wgui/src/renderer_vk/text/custom_glyph.rs
@@ -1,8 +1,8 @@
 use std::{
 	f32,
 	sync::{
-		Arc,
 		atomic::{AtomicUsize, Ordering},
+		Arc,
 	},
 };
 
@@ -23,7 +23,12 @@ pub enum CustomGlyphContent {
 
 impl CustomGlyphContent {
 	pub fn from_bin_svg(data: &[u8]) -> anyhow::Result<Self> {
-		let tree = Tree::from_data(data, &Options::default())?;
+		let options = Options {
+			style_sheet: Some("svg { color: white }".into()),
+			..Options::default()
+		};
+
+		let tree = Tree::from_data(data, &options)?;
 		Ok(Self::Svg(Box::new(tree)))
 	}
 
diff --git a/wlx-overlay-s/src/assets/edit/3d.svg b/wlx-overlay-s/src/assets/edit/3d.svg
index 6d69642..0ff2ec4 100644
--- a/wlx-overlay-s/src/assets/edit/3d.svg
+++ b/wlx-overlay-s/src/assets/edit/3d.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M13 15h3q.825 0 1.413-.587T18 13v-2q0-.825-.587-1.412T16 9h-3zm1.5-1.5v-3H16q.2 0 .35.15t.15.35v2q0 .2-.15.35t-.35.15zm-8 1.5H10q.425 0 .713-.288T11 14v-1q0-.425-.288-.712T10 12q.425 0 .713-.288T11 11v-1q0-.425-.288-.712T10 9H6.5v1.5h3v.75h-2v1.5h2v.75h-3zM4 20q-.825 0-1.412-.587T2 18V6q0-.825.588-1.412T4 4h16q.825 0 1.413.588T22 6v12q0 .825-.587 1.413T20 20z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M13 15h3q.825 0 1.413-.587T18 13v-2q0-.825-.587-1.412T16 9h-3zm1.5-1.5v-3H16q.2 0 .35.15t.15.35v2q0 .2-.15.35t-.35.15zm-8 1.5H10q.425 0 .713-.288T11 14v-1q0-.425-.288-.712T10 12q.425 0 .713-.288T11 11v-1q0-.425-.288-.712T10 9H6.5v1.5h3v.75h-2v1.5h2v.75h-3zM4 20q-.825 0-1.412-.587T2 18V6q0-.825.588-1.412T4 4h16q.825 0 1.413.588T22 6v12q0 .825-.587 1.413T20 20z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/3d_bottomtop.svg b/wlx-overlay-s/src/assets/edit/3d_bottomtop.svg
index 7797220..10eed2a 100644
--- a/wlx-overlay-s/src/assets/edit/3d_bottomtop.svg
+++ b/wlx-overlay-s/src/assets/edit/3d_bottomtop.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M5 21q-.825 0-1.412-.587T3 19v-4q0-.825.588-1.412T5 13h14q.825 0 1.413.588T21 15v4q0 .825-.587 1.413T19 21zm0-10q-.825 0-1.412-.587T3 9V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v4q0 .825-.587 1.413T19 11zm14-6H5v4h14z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M5 21q-.825 0-1.412-.587T3 19v-4q0-.825.588-1.412T5 13h14q.825 0 1.413.588T21 15v4q0 .825-.587 1.413T19 21zm0-10q-.825 0-1.412-.587T3 9V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v4q0 .825-.587 1.413T19 11zm14-6H5v4h14z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/3d_leftright.svg b/wlx-overlay-s/src/assets/edit/3d_leftright.svg
index db72c9a..12c5e1e 100644
--- a/wlx-overlay-s/src/assets/edit/3d_leftright.svg
+++ b/wlx-overlay-s/src/assets/edit/3d_leftright.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h4q.825 0 1.413.588T11 5v14q0 .825-.587 1.413T9 21zm10 0q-.825 0-1.412-.587T13 19V5q0-.825.588-1.412T15 3h4q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm4-16h-4v14h4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h4q.825 0 1.413.588T11 5v14q0 .825-.587 1.413T9 21zm10 0q-.825 0-1.412-.587T13 19V5q0-.825.588-1.412T15 3h4q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm4-16h-4v14h4z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/3d_rightleft.svg b/wlx-overlay-s/src/assets/edit/3d_rightleft.svg
index f14ba93..9e2255f 100644
--- a/wlx-overlay-s/src/assets/edit/3d_rightleft.svg
+++ b/wlx-overlay-s/src/assets/edit/3d_rightleft.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M15 21q-.825 0-1.412-.587T13 19V5q0-.825.588-1.412T15 3h4q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zM5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h4q.825 0 1.413.588T11 5v14q0 .825-.587 1.413T9 21zM5 5v14h4V5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M15 21q-.825 0-1.412-.587T13 19V5q0-.825.588-1.412T15 3h4q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zM5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h4q.825 0 1.413.588T11 5v14q0 .825-.587 1.413T9 21zM5 5v14h4V5z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/3d_topbottom.svg b/wlx-overlay-s/src/assets/edit/3d_topbottom.svg
index 2064d35..4921ab2 100644
--- a/wlx-overlay-s/src/assets/edit/3d_topbottom.svg
+++ b/wlx-overlay-s/src/assets/edit/3d_topbottom.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M5 11q-.825 0-1.412-.587T3 9V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v4q0 .825-.587 1.413T19 11zm0 10q-.825 0-1.412-.587T3 19v-4q0-.825.588-1.412T5 13h14q.825 0 1.413.588T21 15v4q0 .825-.587 1.413T19 21zm0-2h14v-4H5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M5 11q-.825 0-1.412-.587T3 9V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v4q0 .825-.587 1.413T19 11zm0 10q-.825 0-1.412-.587T3 19v-4q0-.825.588-1.412T5 13h14q.825 0 1.413.588T21 15v4q0 .825-.587 1.413T19 21zm0-2h14v-4H5z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/add.svg b/wlx-overlay-s/src/assets/edit/add.svg
index ea95303..d36b786 100644
--- a/wlx-overlay-s/src/assets/edit/add.svg
+++ b/wlx-overlay-s/src/assets/edit/add.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M11 17h2v-4h4v-2h-4V7h-2v4H7v2h4zm-6 4q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M11 17h2v-4h4v-2h-4V7h-2v4H7v2h4zm-6 4q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/anchor.svg b/wlx-overlay-s/src/assets/edit/anchor.svg
index 9a501ce..0f8d692 100644
--- a/wlx-overlay-s/src/assets/edit/anchor.svg
+++ b/wlx-overlay-s/src/assets/edit/anchor.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M12 22q-1.525 0-3.125-.55t-2.9-1.5t-2.137-2.225T3 15v-3l4 3l-1.55 1.55q.725 1.275 2.3 2.2T11 19.925V11H8V9h3V7.825q-.875-.325-1.437-1.088T9 5q0-1.25.875-2.125T12 2t2.125.875T15 5q0 .975-.562 1.738T13 7.825V9h3v2h-3v8.925q1.675-.25 3.25-1.175t2.3-2.2L17 15l4-3v3q0 1.45-.837 2.725t-2.138 2.225t-2.9 1.5T12 22m0-16q.425 0 .713-.287T13 5t-.288-.712T12 4t-.712.288T11 5t.288.713T12 6"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M12 22q-1.525 0-3.125-.55t-2.9-1.5t-2.137-2.225T3 15v-3l4 3l-1.55 1.55q.725 1.275 2.3 2.2T11 19.925V11H8V9h3V7.825q-.875-.325-1.437-1.088T9 5q0-1.25.875-2.125T12 2t2.125.875T15 5q0 .975-.562 1.738T13 7.825V9h3v2h-3v8.925q1.675-.25 3.25-1.175t2.3-2.2L17 15l4-3v3q0 1.45-.837 2.725t-2.138 2.225t-2.9 1.5T12 22m0-16q.425 0 .713-.287T13 5t-.288-.712T12 4t-.712.288T11 5t.288.713T12 6"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/background-off.svg b/wlx-overlay-s/src/assets/edit/background-off.svg
index b757f50..c48eab4 100644
--- a/wlx-overlay-s/src/assets/edit/background-off.svg
+++ b/wlx-overlay-s/src/assets/edit/background-off.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M7.5 18q.625 0 1.063-.437T9 16.5t-.437-1.062T7.5 15t-1.062.438T6 16.5t.438 1.063T7.5 18m0-9q.625 0 1.063-.437T9 7.5t-.437-1.062T7.5 6t-1.062.438T6 7.5t.438 1.063T7.5 9m0 4.5q.625 0 1.063-.437T9 12t-.437-1.062T7.5 10.5t-1.062.438T6 12t.438 1.063T7.5 13.5m9 4.5q.625 0 1.063-.437T18 16.5t-.437-1.062T16.5 15t-1.062.438T15 16.5t.438 1.063T16.5 18m0-9q.625 0 1.063-.437T18 7.5t-.437-1.062T16.5 6t-1.062.438T15 7.5t.438 1.063T16.5 9M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm0-2h14V5H5zM5 5v14zm11.5 8.5q.625 0 1.063-.437T18 12t-.437-1.062T16.5 10.5t-1.062.438T15 12t.438 1.063t1.062.437M12 9q.625 0 1.063-.437T13.5 7.5t-.437-1.062T12 6t-1.062.438T10.5 7.5t.438 1.063T12 9m0 9q.625 0 1.063-.437T13.5 16.5t-.437-1.062T12 15t-1.062.438T10.5 16.5t.438 1.063T12 18m0-4.5q.625 0 1.063-.437T13.5 12t-.437-1.062T12 10.5t-1.062.438T10.5 12t.438 1.063T12 13.5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M7.5 18q.625 0 1.063-.437T9 16.5t-.437-1.062T7.5 15t-1.062.438T6 16.5t.438 1.063T7.5 18m0-9q.625 0 1.063-.437T9 7.5t-.437-1.062T7.5 6t-1.062.438T6 7.5t.438 1.063T7.5 9m0 4.5q.625 0 1.063-.437T9 12t-.437-1.062T7.5 10.5t-1.062.438T6 12t.438 1.063T7.5 13.5m9 4.5q.625 0 1.063-.437T18 16.5t-.437-1.062T16.5 15t-1.062.438T15 16.5t.438 1.063T16.5 18m0-9q.625 0 1.063-.437T18 7.5t-.437-1.062T16.5 6t-1.062.438T15 7.5t.438 1.063T16.5 9M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm0-2h14V5H5zM5 5v14zm11.5 8.5q.625 0 1.063-.437T18 12t-.437-1.062T16.5 10.5t-1.062.438T15 12t.438 1.063t1.062.437M12 9q.625 0 1.063-.437T13.5 7.5t-.437-1.062T12 6t-1.062.438T10.5 7.5t.438 1.063T12 9m0 9q.625 0 1.063-.437T13.5 16.5t-.437-1.062T12 15t-1.062.438T10.5 16.5t.438 1.063T12 18m0-4.5q.625 0 1.063-.437T13.5 12t-.437-1.062T12 10.5t-1.062.438T10.5 12t.438 1.063T12 13.5"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/background.svg b/wlx-overlay-s/src/assets/edit/background.svg
index 0b2f756..4b97ee1 100644
--- a/wlx-overlay-s/src/assets/edit/background.svg
+++ b/wlx-overlay-s/src/assets/edit/background.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M7.5 18q.625 0 1.063-.437T9 16.5t-.437-1.062T7.5 15t-1.062.438T6 16.5t.438 1.063T7.5 18m0-9q.625 0 1.063-.437T9 7.5t-.437-1.062T7.5 6t-1.062.438T6 7.5t.438 1.063T7.5 9m0 4.5q.625 0 1.063-.437T9 12t-.437-1.062T7.5 10.5t-1.062.438T6 12t.438 1.063T7.5 13.5m9 4.5q.625 0 1.063-.437T18 16.5t-.437-1.062T16.5 15t-1.062.438T15 16.5t.438 1.063T16.5 18m0-9q.625 0 1.063-.437T18 7.5t-.437-1.062T16.5 6t-1.062.438T15 7.5t.438 1.063T16.5 9M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm11.5-7.5q.625 0 1.063-.437T18 12t-.437-1.062T16.5 10.5t-1.062.438T15 12t.438 1.063t1.062.437M12 9q.625 0 1.063-.437T13.5 7.5t-.437-1.062T12 6t-1.062.438T10.5 7.5t.438 1.063T12 9m0 9q.625 0 1.063-.437T13.5 16.5t-.437-1.062T12 15t-1.062.438T10.5 16.5t.438 1.063T12 18m0-4.5q.625 0 1.063-.437T13.5 12t-.437-1.062T12 10.5t-1.062.438T10.5 12t.438 1.063T12 13.5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M7.5 18q.625 0 1.063-.437T9 16.5t-.437-1.062T7.5 15t-1.062.438T6 16.5t.438 1.063T7.5 18m0-9q.625 0 1.063-.437T9 7.5t-.437-1.062T7.5 6t-1.062.438T6 7.5t.438 1.063T7.5 9m0 4.5q.625 0 1.063-.437T9 12t-.437-1.062T7.5 10.5t-1.062.438T6 12t.438 1.063T7.5 13.5m9 4.5q.625 0 1.063-.437T18 16.5t-.437-1.062T16.5 15t-1.062.438T15 16.5t.438 1.063T16.5 18m0-9q.625 0 1.063-.437T18 7.5t-.437-1.062T16.5 6t-1.062.438T15 7.5t.438 1.063T16.5 9M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm11.5-7.5q.625 0 1.063-.437T18 12t-.437-1.062T16.5 10.5t-1.062.438T15 12t.438 1.063t1.062.437M12 9q.625 0 1.063-.437T13.5 7.5t-.437-1.062T12 6t-1.062.438T10.5 7.5t.438 1.063T12 9m0 9q.625 0 1.063-.437T13.5 16.5t-.437-1.062T12 15t-1.062.438T10.5 16.5t.438 1.063T12 18m0-4.5q.625 0 1.063-.437T13.5 12t-.437-1.062T12 10.5t-1.062.438T10.5 12t.438 1.063T12 13.5"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/cancel.svg b/wlx-overlay-s/src/assets/edit/cancel.svg
index 1bcb38e..c067f17 100644
--- a/wlx-overlay-s/src/assets/edit/cancel.svg
+++ b/wlx-overlay-s/src/assets/edit/cancel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m8.4 17l3.6-3.6l3.6 3.6l1.4-1.4l-3.6-3.6L17 8.4L15.6 7L12 10.6L8.4 7L7 8.4l3.6 3.6L7 15.6zm3.6 5q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m8.4 17l3.6-3.6l3.6 3.6l1.4-1.4l-3.6-3.6L17 8.4L15.6 7L12 10.6L8.4 7L7 8.4l3.6 3.6L7 15.6zm3.6 5q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/checkbox-checked.svg b/wlx-overlay-s/src/assets/edit/checkbox-checked.svg
index c29bcad..e8a9045 100644
--- a/wlx-overlay-s/src/assets/edit/checkbox-checked.svg
+++ b/wlx-overlay-s/src/assets/edit/checkbox-checked.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m10.6 16.2l7.05-7.05l-1.4-1.4l-5.65 5.65l-2.85-2.85l-1.4 1.4zM5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m10.6 16.2l7.05-7.05l-1.4-1.4l-5.65 5.65l-2.85-2.85l-1.4 1.4zM5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/checkbox.svg b/wlx-overlay-s/src/assets/edit/checkbox.svg
index 39b464f..b7fe5c3 100644
--- a/wlx-overlay-s/src/assets/edit/checkbox.svg
+++ b/wlx-overlay-s/src/assets/edit/checkbox.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm0-2h14V5H5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21zm0-2h14V5H5z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/close.svg b/wlx-overlay-s/src/assets/edit/close.svg
index 1aeb398..93886b9 100644
--- a/wlx-overlay-s/src/assets/edit/close.svg
+++ b/wlx-overlay-s/src/assets/edit/close.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24">
-  <path fill="white" d="M8.4 17L7 15.6l3.6-3.6L7 8.425l1.4-1.4l3.6 3.6l3.575-3.6l1.4 1.4l-3.6 3.575l3.6 3.6l-1.4 1.4L12 13.4z" />
+  <path fill="currentColor" d="M8.4 17L7 15.6l3.6-3.6L7 8.425l1.4-1.4l3.6 3.6l3.575-3.6l1.4 1.4l-3.6 3.575l3.6 3.6l-1.4 1.4L12 13.4z" />
 </svg>
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/edit/curve.svg b/wlx-overlay-s/src/assets/edit/curve.svg
index 2429dc1..01b1674 100644
--- a/wlx-overlay-s/src/assets/edit/curve.svg
+++ b/wlx-overlay-s/src/assets/edit/curve.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M2.025 20.5V3.475q1.875.875 4.5 1.45t5.5.575t5.5-.575t4.5-1.45V20.5q-1.875-.875-4.5-1.437t-5.5-.563t-5.5.563t-4.5 1.437"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M2.025 20.5V3.475q1.875.875 4.5 1.45t5.5.575t5.5-.575t4.5-1.45V20.5q-1.875-.875-4.5-1.437t-5.5-.563t-5.5.563t-4.5 1.437"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/delete.svg b/wlx-overlay-s/src/assets/edit/delete.svg
index a24e916..4266338 100644
--- a/wlx-overlay-s/src/assets/edit/delete.svg
+++ b/wlx-overlay-s/src/assets/edit/delete.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M7 21q-.825 0-1.412-.587T5 19V6H4V4h5V3h6v1h5v2h-1v13q0 .825-.587 1.413T17 21zm2-4h2V8H9zm4 0h2V8h-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M7 21q-.825 0-1.412-.587T5 19V6H4V4h5V3h6v1h5v2h-1v13q0 .825-.587 1.413T17 21zm2-4h2V8H9zm4 0h2V8h-2z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/disable-grab.svg b/wlx-overlay-s/src/assets/edit/disable-grab.svg
index 81ee4cd..ed18c17 100644
--- a/wlx-overlay-s/src/assets/edit/disable-grab.svg
+++ b/wlx-overlay-s/src/assets/edit/disable-grab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m2.1 2.075l19.8 19.8l-1.425 1.425l-1.1-1.1q-.5.375-1.1.588T17 23h-6.95q-.75 0-1.4-.337T7.575 21.7L1.2 12.375l.6-.575q.475-.475 1.125-.55t1.175.3L7 13.575v-3.75L.675 3.5zM21 18.15l-6-5.975V3q0-.425.288-.712T16 2t.713.288T17 3v9.175h2V5q0-.425.288-.712T20 4t.713.288T21 5zm-8-8l-2-2V2q0-.425.288-.712T12 1t.713.288T13 2zm-4-4l-2-2V4q0-.425.288-.712T8 3t.713.288T9 4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m2.1 2.075l19.8 19.8l-1.425 1.425l-1.1-1.1q-.5.375-1.1.588T17 23h-6.95q-.75 0-1.4-.337T7.575 21.7L1.2 12.375l.6-.575q.475-.475 1.125-.55t1.175.3L7 13.575v-3.75L.675 3.5zM21 18.15l-6-5.975V3q0-.425.288-.712T16 2t.713.288T17 3v9.175h2V5q0-.425.288-.712T20 4t.713.288T21 5zm-8-8l-2-2V2q0-.425.288-.712T12 1t.713.288T13 2zm-4-4l-2-2V4q0-.425.288-.712T8 3t.713.288T9 4z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/fade.svg b/wlx-overlay-s/src/assets/edit/fade.svg
index 492cc33..fbe539c 100644
--- a/wlx-overlay-s/src/assets/edit/fade.svg
+++ b/wlx-overlay-s/src/assets/edit/fade.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h5v18zm7 0q-.425 0-.712-.288T11 20t.288-.712T12 19t.713.288T13 20t-.288.713T12 21m0-4q-.425 0-.712-.288T11 16t.288-.712T12 15t.713.288T13 16t-.288.713T12 17m0-4q-.425 0-.712-.288T11 12t.288-.712T12 11t.713.288T13 12t-.288.713T12 13m0-4q-.425 0-.712-.288T11 8t.288-.712T12 7t.713.288T13 8t-.288.713T12 9m0-4q-.425 0-.712-.288T11 4t.288-.712T12 3t.713.288T13 4t-.288.713T12 5m2 14q-.425 0-.712-.288T13 18t.288-.712T14 17t.713.288T15 18t-.288.713T14 19m0-4q-.425 0-.712-.288T13 14t.288-.712T14 13t.713.288T15 14t-.288.713T14 15m0-4q-.425 0-.712-.288T13 10t.288-.712T14 9t.713.288T15 10t-.288.713T14 11m0-4q-.425 0-.712-.288T13 6t.288-.712T14 5t.713.288T15 6t-.288.713T14 7m2 14q-.425 0-.712-.288T15 20t.288-.712T16 19t.713.288T17 20t-.288.713T16 21m0-4q-.425 0-.712-.288T15 16t.288-.712T16 15t.713.288T17 16t-.288.713T16 17m0-4q-.425 0-.712-.288T15 12t.288-.712T16 11t.713.288T17 12t-.288.713T16 13m0-4q-.425 0-.712-.288T15 8t.288-.712T16 7t.713.288T17 8t-.288.713T16 9m0-4q-.425 0-.712-.288T15 4t.288-.712T16 3t.713.288T17 4t-.288.713T16 5m2 14q-.425 0-.712-.288T17 18t.288-.712T18 17t.713.288T19 18t-.288.713T18 19m0-4q-.425 0-.712-.288T17 14t.288-.712T18 13t.713.288T19 14t-.288.713T18 15m0-4q-.425 0-.712-.288T17 10t.288-.712T18 9t.713.288T19 10t-.288.713T18 11m0-4q-.425 0-.712-.288T17 6t.288-.712T18 5t.713.288T19 6t-.288.713T18 7m2 14q-.425 0-.712-.288T19 20t.288-.712T20 19t.713.288T21 20t-.288.713T20 21m0-4q-.425 0-.712-.288T19 16t.288-.712T20 15t.713.288T21 16t-.288.713T20 17m0-4q-.425 0-.712-.288T19 12t.288-.712T20 11t.713.288T21 12t-.288.713T20 13m0-4q-.425 0-.712-.288T19 8t.288-.712T20 7t.713.288T21 8t-.288.713T20 9m0-4q-.425 0-.712-.288T19 4t.288-.712T20 3t.713.288T21 4t-.288.713T20 5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h5v18zm7 0q-.425 0-.712-.288T11 20t.288-.712T12 19t.713.288T13 20t-.288.713T12 21m0-4q-.425 0-.712-.288T11 16t.288-.712T12 15t.713.288T13 16t-.288.713T12 17m0-4q-.425 0-.712-.288T11 12t.288-.712T12 11t.713.288T13 12t-.288.713T12 13m0-4q-.425 0-.712-.288T11 8t.288-.712T12 7t.713.288T13 8t-.288.713T12 9m0-4q-.425 0-.712-.288T11 4t.288-.712T12 3t.713.288T13 4t-.288.713T12 5m2 14q-.425 0-.712-.288T13 18t.288-.712T14 17t.713.288T15 18t-.288.713T14 19m0-4q-.425 0-.712-.288T13 14t.288-.712T14 13t.713.288T15 14t-.288.713T14 15m0-4q-.425 0-.712-.288T13 10t.288-.712T14 9t.713.288T15 10t-.288.713T14 11m0-4q-.425 0-.712-.288T13 6t.288-.712T14 5t.713.288T15 6t-.288.713T14 7m2 14q-.425 0-.712-.288T15 20t.288-.712T16 19t.713.288T17 20t-.288.713T16 21m0-4q-.425 0-.712-.288T15 16t.288-.712T16 15t.713.288T17 16t-.288.713T16 17m0-4q-.425 0-.712-.288T15 12t.288-.712T16 11t.713.288T17 12t-.288.713T16 13m0-4q-.425 0-.712-.288T15 8t.288-.712T16 7t.713.288T17 8t-.288.713T16 9m0-4q-.425 0-.712-.288T15 4t.288-.712T16 3t.713.288T17 4t-.288.713T16 5m2 14q-.425 0-.712-.288T17 18t.288-.712T18 17t.713.288T19 18t-.288.713T18 19m0-4q-.425 0-.712-.288T17 14t.288-.712T18 13t.713.288T19 14t-.288.713T18 15m0-4q-.425 0-.712-.288T17 10t.288-.712T18 9t.713.288T19 10t-.288.713T18 11m0-4q-.425 0-.712-.288T17 6t.288-.712T18 5t.713.288T19 6t-.288.713T18 7m2 14q-.425 0-.712-.288T19 20t.288-.712T20 19t.713.288T21 20t-.288.713T20 21m0-4q-.425 0-.712-.288T19 16t.288-.712T20 15t.713.288T21 16t-.288.713T20 17m0-4q-.425 0-.712-.288T19 12t.288-.712T20 11t.713.288T21 12t-.288.713T20 13m0-4q-.425 0-.712-.288T19 8t.288-.712T20 7t.713.288T21 8t-.288.713T20 9m0-4q-.425 0-.712-.288T19 4t.288-.712T20 3t.713.288T21 4t-.288.713T20 5"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/flip180.svg b/wlx-overlay-s/src/assets/edit/flip180.svg
index 7705399..bc5bf5b 100644
--- a/wlx-overlay-s/src/assets/edit/flip180.svg
+++ b/wlx-overlay-s/src/assets/edit/flip180.svg
@@ -33,7 +33,7 @@
      inkscape:current-layer="svg1" />
   <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
   <path
-     fill="white"
+     fill="currentColor"
      d="M 12,22 C 10.616667,22 9.3166667,21.737333 8.1,21.212 6.8833333,20.686667 5.825,19.974333 4.925,19.075 4.025,18.175667 3.3126667,17.117333 2.788,15.9 2.2633333,14.682667 2.0006667,13.382667 2,12 1.9993333,10.617333 2.262,9.3173333 2.788,8.1 3.314,6.8826667 4.0263333,5.8243333 4.925,4.925 5.8236667,4.0256667 6.882,3.3133333 8.1,2.788 9.318,2.2626667 10.618,2 12,2 c 1.382,0 2.682,0.2626667 3.9,0.788 1.218,0.5253333 2.276333,1.2376667 3.175,2.137 0.898667,0.8993333 1.611333,1.9576667 2.138,3.175 0.526667,1.2173333 0.789,2.517333 0.787,3.9 -0.002,1.382667 -0.264667,2.682667 -0.788,3.9 -0.523333,1.217333 -1.235667,2.275667 -2.137,3.175 -0.901333,0.899333 -1.959667,1.612 -3.175,2.138 C 14.684667,21.739 13.384667,22.001333 12,22 m 0,-2 c 2.233333,0 4.125,-0.775 5.675,-2.325 C 19.225,16.125 20,14.233333 20,12 20,9.9778321 19.418096,8.0680972 17.675,6.325 15.931904,4.5819028 14.232703,3.7451172 12.00586,3.7451172 c 0,3.1215572 -0.0031,8.2546878 -0.0031,8.2546878 C 12.002734,11.999805 12,20 12,20"
      id="path1"
      sodipodi:nodetypes="csssssssssssssssccsszccc" />
diff --git a/wlx-overlay-s/src/assets/edit/flip270.svg b/wlx-overlay-s/src/assets/edit/flip270.svg
index c91dfe6..f593645 100644
--- a/wlx-overlay-s/src/assets/edit/flip270.svg
+++ b/wlx-overlay-s/src/assets/edit/flip270.svg
@@ -33,7 +33,7 @@
      inkscape:current-layer="svg1" />
   <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
   <path
-     fill="white"
+     fill="currentColor"
      d="M 12,22 C 10.616667,22 9.3166667,21.737333 8.1,21.212 6.8833333,20.686667 5.825,19.974333 4.925,19.075 4.025,18.175667 3.3126667,17.117333 2.788,15.9 2.2633333,14.682667 2.0006667,13.382667 2,12 1.9993333,10.617333 2.262,9.3173333 2.788,8.1 3.314,6.8826667 4.0263333,5.8243333 4.925,4.925 5.8236667,4.0256667 6.882,3.3133333 8.1,2.788 9.318,2.2626667 10.618,2 12,2 c 1.382,0 2.682,0.2626667 3.9,0.788 1.218,0.5253333 2.276333,1.2376667 3.175,2.137 0.898667,0.8993333 1.611333,1.9576667 2.138,3.175 0.526667,1.2173333 0.789,2.517333 0.787,3.9 -0.002,1.382667 -0.264667,2.682667 -0.788,3.9 -0.523333,1.217333 -1.235667,2.275667 -2.137,3.175 -0.901333,0.899333 -1.959667,1.612 -3.175,2.138 C 14.684667,21.739 13.384667,22.001333 12,22 m 0,-2 c 2.233333,0 4.125,-0.775 5.675,-2.325 C 19.225,16.125 20,14.233333 20,12 20,9.9778321 19.418096,8.0680972 17.675,6.325 15.931904,4.5819028 14.232703,3.7451172 12.00586,3.7451172 c 0,3.1215572 -0.0031,8.2546878 -0.0031,8.2546878 C 12.002734,11.999805 6.7304687,12 4,12 4,14.233333 4.775,16.125 6.325,17.675 7.875,19.225 9.7666667,20 12,20"
      id="path1"
      sodipodi:nodetypes="csssssssssssssssccsszcccsc" />
diff --git a/wlx-overlay-s/src/assets/edit/flip90.svg b/wlx-overlay-s/src/assets/edit/flip90.svg
index 1b39320..3d8bbe0 100644
--- a/wlx-overlay-s/src/assets/edit/flip90.svg
+++ b/wlx-overlay-s/src/assets/edit/flip90.svg
@@ -33,7 +33,7 @@
      inkscape:current-layer="svg1" />
   <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
   <path
-     fill="white"
+     fill="currentColor"
      d="M 12,22 C 10.616667,22 9.3166667,21.737333 8.1,21.212 6.8833333,20.686667 5.825,19.974333 4.925,19.075 4.025,18.175667 3.3126667,17.117333 2.788,15.9 2.2633333,14.682667 2.0006667,13.382667 2,12 1.9993333,10.617333 2.262,9.3173333 2.788,8.1 3.314,6.8826667 4.0263333,5.8243333 4.925,4.925 5.8236667,4.0256667 6.882,3.3133333 8.1,2.788 9.318,2.2626667 10.618,2 12,2 c 1.382,0 2.682,0.2626667 3.9,0.788 1.218,0.5253333 2.276333,1.2376667 3.175,2.137 0.898667,0.8993333 1.611333,1.9576667 2.138,3.175 0.526667,1.2173333 0.789,2.517333 0.787,3.9 -0.002,1.382667 -0.264667,2.682667 -0.788,3.9 -0.523333,1.217333 -1.235667,2.275667 -2.137,3.175 -0.901333,0.899333 -1.959667,1.612 -3.175,2.138 C 14.684667,21.739 13.384667,22.001333 12,22 M 20,12 C 20,9.9778321 19.418096,8.0680972 17.675,6.325 15.931904,4.5819028 14.232703,3.7451172 12.00586,3.7451172 c 0,3.1215572 -0.0031,8.2546878 -0.0031,8.2546878"
      id="path1"
      sodipodi:nodetypes="cssssssssssssssscczcc" />
diff --git a/wlx-overlay-s/src/assets/edit/flipped.svg b/wlx-overlay-s/src/assets/edit/flipped.svg
index ecf153a..6dec99b 100644
--- a/wlx-overlay-s/src/assets/edit/flipped.svg
+++ b/wlx-overlay-s/src/assets/edit/flipped.svg
@@ -33,7 +33,7 @@
      inkscape:current-layer="svg1" />
   <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
   <path
-     fill="white"
+     fill="currentColor"
      d="M 12,22 C 10.616667,22 9.3166667,21.737333 8.1,21.212 6.8833333,20.686667 5.825,19.974333 4.925,19.075 4.025,18.175667 3.3126667,17.117333 2.788,15.9 2.2633333,14.682667 2.0006667,13.382667 2,12 1.9993333,10.617333 2.262,9.3173333 2.788,8.1 3.314,6.8826667 4.0263333,5.8243333 4.925,4.925 5.8236667,4.0256667 6.882,3.3133333 8.1,2.788 9.318,2.2626667 10.618,2 12,2 c 1.382,0 2.682,0.2626667 3.9,0.788 1.218,0.5253333 2.276333,1.2376667 3.175,2.137 0.898667,0.8993333 1.611333,1.9576667 2.138,3.175 0.526667,1.2173333 0.789,2.517333 0.787,3.9 -0.002,1.382667 -0.264667,2.682667 -0.788,3.9 -0.523333,1.217333 -1.235667,2.275667 -2.137,3.175 -0.901333,0.899333 -1.959667,1.612 -3.175,2.138 C 14.684667,21.739 13.384667,22.001333 12,22"
      id="path1"
      sodipodi:nodetypes="csssssssssssssssc" />
diff --git a/wlx-overlay-s/src/assets/edit/float.svg b/wlx-overlay-s/src/assets/edit/float.svg
index ad18caf..4866e99 100644
--- a/wlx-overlay-s/src/assets/edit/float.svg
+++ b/wlx-overlay-s/src/assets/edit/float.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Tabler Icons by Paweł Kuna - https://github.com/tabler/tabler-icons/blob/master/LICENSE --><g fill="white"><path d="M12 1a7 7 0 0 1 7 7c0 5.457-3.028 10-7 10c-3.9 0-6.89-4.379-6.997-9.703L5 8l.004-.24A7 7 0 0 1 12 1m0 4a1 1 0 0 0 0 2l.117.007A1 1 0 0 1 13 8l.007.117A1 1 0 0 0 15 8a3 3 0 0 0-3-3"/><path d="M12 16a1 1 0 0 1 .993.883L13 17v1a3 3 0 0 1-2.824 2.995L10 21H7a1 1 0 0 0-.993.883L6 22a1 1 0 0 1-2 0a3 3 0 0 1 2.824-2.995L7 19h3a1 1 0 0 0 .993-.883L11 18v-1a1 1 0 0 1 1-1"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Tabler Icons by Paweł Kuna - https://github.com/tabler/tabler-icons/blob/master/LICENSE --><g fill="currentColor"><path d="M12 1a7 7 0 0 1 7 7c0 5.457-3.028 10-7 10c-3.9 0-6.89-4.379-6.997-9.703L5 8l.004-.24A7 7 0 0 1 12 1m0 4a1 1 0 0 0 0 2l.117.007A1 1 0 0 1 13 8l.007.117A1 1 0 0 0 15 8a3 3 0 0 0-3-3"/><path d="M12 16a1 1 0 0 1 .993.883L13 17v1a3 3 0 0 1-2.824 2.995L10 21H7a1 1 0 0 0-.993.883L6 22a1 1 0 0 1-2 0a3 3 0 0 1 2.824-2.995L7 19h3a1 1 0 0 0 .993-.883L11 18v-1a1 1 0 0 1 1-1"/></g></svg>
diff --git a/wlx-overlay-s/src/assets/edit/grabbable.svg b/wlx-overlay-s/src/assets/edit/grabbable.svg
index 81ee4cd..ed18c17 100644
--- a/wlx-overlay-s/src/assets/edit/grabbable.svg
+++ b/wlx-overlay-s/src/assets/edit/grabbable.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m2.1 2.075l19.8 19.8l-1.425 1.425l-1.1-1.1q-.5.375-1.1.588T17 23h-6.95q-.75 0-1.4-.337T7.575 21.7L1.2 12.375l.6-.575q.475-.475 1.125-.55t1.175.3L7 13.575v-3.75L.675 3.5zM21 18.15l-6-5.975V3q0-.425.288-.712T16 2t.713.288T17 3v9.175h2V5q0-.425.288-.712T20 4t.713.288T21 5zm-8-8l-2-2V2q0-.425.288-.712T12 1t.713.288T13 2zm-4-4l-2-2V4q0-.425.288-.712T8 3t.713.288T9 4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m2.1 2.075l19.8 19.8l-1.425 1.425l-1.1-1.1q-.5.375-1.1.588T17 23h-6.95q-.75 0-1.4-.337T7.575 21.7L1.2 12.375l.6-.575q.475-.475 1.125-.55t1.175.3L7 13.575v-3.75L.675 3.5zM21 18.15l-6-5.975V3q0-.425.288-.712T16 2t.713.288T17 3v9.175h2V5q0-.425.288-.712T20 4t.713.288T21 5zm-8-8l-2-2V2q0-.425.288-.712T12 1t.713.288T13 2zm-4-4l-2-2V4q0-.425.288-.712T8 3t.713.288T9 4z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/grid.svg b/wlx-overlay-s/src/assets/edit/grid.svg
index 4380ca6..c54ef42 100644
--- a/wlx-overlay-s/src/assets/edit/grid.svg
+++ b/wlx-overlay-s/src/assets/edit/grid.svg
@@ -1,5 +1,5 @@
 <svg width="24" height="16" viewBox="0 0 24 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <g stroke="white" stroke-width="1" stroke-linecap="round" stroke-linejoin="round">
+  <g stroke="currentColor" stroke-width="1" stroke-linecap="round" stroke-linejoin="round">
     <path d="M2 13 L6 5 H18 L22 13 Z"></path>
 
     <path d="M7 13 L9 5"></path>
diff --git a/wlx-overlay-s/src/assets/edit/inout.svg b/wlx-overlay-s/src/assets/edit/inout.svg
index 0490d95..ec43559 100644
--- a/wlx-overlay-s/src/assets/edit/inout.svg
+++ b/wlx-overlay-s/src/assets/edit/inout.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M8 13V5.825L5.425 8.4L4 7l5-5l5 5l-1.425 1.4L10 5.825V13zm7 9l-5-5l1.425-1.4L14 18.175V11h2v7.175l2.575-2.575L20 17z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M8 13V5.825L5.425 8.4L4 7l5-5l5 5l-1.425 1.4L10 5.825V13zm7 9l-5-5l1.425-1.4L14 18.175V11h2v7.175l2.575-2.575L20 17z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/lock.svg b/wlx-overlay-s/src/assets/edit/lock.svg
index e83811b..17e80bf 100644
--- a/wlx-overlay-s/src/assets/edit/lock.svg
+++ b/wlx-overlay-s/src/assets/edit/lock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M6 22q-.825 0-1.412-.587T4 20V10q0-.825.588-1.412T6 8h1V6q0-2.075 1.463-3.537T12 1t3.538 1.463T17 6v2h1q.825 0 1.413.588T20 10v10q0 .825-.587 1.413T18 22zm6-5q.825 0 1.413-.587T14 15t-.587-1.412T12 13t-1.412.588T10 15t.588 1.413T12 17M9 8h6V6q0-1.25-.875-2.125T12 3t-2.125.875T9 6z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M6 22q-.825 0-1.412-.587T4 20V10q0-.825.588-1.412T6 8h1V6q0-2.075 1.463-3.537T12 1t3.538 1.463T17 6v2h1q.825 0 1.413.588T20 10v10q0 .825-.587 1.413T18 22zm6-5q.825 0 1.413-.587T14 15t-.587-1.412T12 13t-1.412.588T10 15t.588 1.413T12 17M9 8h6V6q0-1.25-.875-2.125T12 3t-2.125.875T9 6z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/lock_open.svg b/wlx-overlay-s/src/assets/edit/lock_open.svg
index 977433f..b8472a1 100644
--- a/wlx-overlay-s/src/assets/edit/lock_open.svg
+++ b/wlx-overlay-s/src/assets/edit/lock_open.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M6 8h9V6q0-1.25-.875-2.125T12 3t-2.125.875T9 6H7q0-2.075 1.463-3.537T12 1t3.538 1.463T17 6v2h1q.825 0 1.413.588T20 10v10q0 .825-.587 1.413T18 22H6q-.825 0-1.412-.587T4 20V10q0-.825.588-1.412T6 8m6 9q.825 0 1.413-.587T14 15t-.587-1.412T12 13t-1.412.588T10 15t.588 1.413T12 17"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M6 8h9V6q0-1.25-.875-2.125T12 3t-2.125.875T9 6H7q0-2.075 1.463-3.537T12 1t3.538 1.463T17 6v2h1q.825 0 1.413.588T20 10v10q0 .825-.587 1.413T18 22H6q-.825 0-1.412-.587T4 20V10q0-.825.588-1.412T6 8m6 9q.825 0 1.413-.587T14 15t-.587-1.412T12 13t-1.412.588T10 15t.588 1.413T12 17"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/mirror.svg b/wlx-overlay-s/src/assets/edit/mirror.svg
index 6cf1913..35f9edc 100644
--- a/wlx-overlay-s/src/assets/edit/mirror.svg
+++ b/wlx-overlay-s/src/assets/edit/mirror.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M2 11.6L9.6 4H4q-.825 0-1.413.588T2 6v5.6Zm0 7L16.575 4H12.4L2 14.425V18.6ZM3.4 20H20q.825 0 1.413-.588T22 18V6q0-.825-.588-1.413T20 4h-.6l-16 16Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M2 11.6L9.6 4H4q-.825 0-1.413.588T2 6v5.6Zm0 7L16.575 4H12.4L2 14.425V18.6ZM3.4 20H20q.825 0 1.413-.588T22 18V6q0-.825-.588-1.413T20 4h-.6l-16 16Z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/mouse.svg b/wlx-overlay-s/src/assets/edit/mouse.svg
index 978985d..c3fdb9a 100644
--- a/wlx-overlay-s/src/assets/edit/mouse.svg
+++ b/wlx-overlay-s/src/assets/edit/mouse.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M12 22q-2.925 0-4.962-2.037T5 15v-4h14v4q0 2.925-2.037 4.963T12 22M5 9q0-2.625 1.7-4.587T11 2.074V9zm8 0V2.075q2.6.375 4.3 2.338T19 9z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M12 22q-2.925 0-4.962-2.037T5 15v-4h14v4q0 2.925-2.037 4.963T12 22M5 9q0-2.625 1.7-4.587T11 2.074V9zm8 0V2.075q2.6.375 4.3 2.338T19 9z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/mouse_lock.svg b/wlx-overlay-s/src/assets/edit/mouse_lock.svg
index 5f86575..303ae2a 100644
--- a/wlx-overlay-s/src/assets/edit/mouse_lock.svg
+++ b/wlx-overlay-s/src/assets/edit/mouse_lock.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M15.85 22q-.35 0-.6-.25t-.25-.6v-3.3q0-.35.25-.6t.6-.25H16v-1q0-.825.588-1.412T18 14t1.413.588T20 16v1h.15q.35 0 .6.25t.25.6v3.3q0 .35-.25.6t-.6.25zM17 17h2v-1q0-.425-.288-.712T18 15t-.712.288T17 16zM5 9q0-2.625 1.7-4.587T11 2.074V9zm8 0V2.075q2.6.375 4.3 2.338T19 9zm-1 13q-2.925 0-4.962-2.037T5 15v-4h14v1.1q-.25-.05-.488-.075T18 12q-2.075 0-3.537 1.463T13 17v4.925q-.25.05-.488.063T12 22"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M15.85 22q-.35 0-.6-.25t-.25-.6v-3.3q0-.35.25-.6t.6-.25H16v-1q0-.825.588-1.412T18 14t1.413.588T20 16v1h.15q.35 0 .6.25t.25.6v3.3q0 .35-.25.6t-.6.25zM17 17h2v-1q0-.425-.288-.712T18 15t-.712.288T17 16zM5 9q0-2.625 1.7-4.587T11 2.074V9zm8 0V2.075q2.6.375 4.3 2.338T19 9zm-1 13q-2.925 0-4.962-2.037T5 15v-4h14v1.1q-.25-.05-.488-.075T18 12q-2.075 0-3.537 1.463T13 17v4.925q-.25.05-.488.063T12 22"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/move-all.svg b/wlx-overlay-s/src/assets/edit/move-all.svg
index 1c1ad5c..d8bb0e4 100644
--- a/wlx-overlay-s/src/assets/edit/move-all.svg
+++ b/wlx-overlay-s/src/assets/edit/move-all.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M3 21v-6h2v2.6l3.1-3.1l1.4 1.4L6.4 19H9v2zm12 0v-2h2.6l-3.1-3.1l1.4-1.4l3.1 3.1V15h2v6zM8.1 9.5L5 6.4V9H3V3h6v2H6.4l3.1 3.1zm7.8 0l-1.4-1.4L17.6 5H15V3h6v6h-2V6.4zM12 14q-.825 0-1.412-.587T10 12t.588-1.412T12 10t1.413.588T14 12t-.587 1.413T12 14"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M3 21v-6h2v2.6l3.1-3.1l1.4 1.4L6.4 19H9v2zm12 0v-2h2.6l-3.1-3.1l1.4-1.4l3.1 3.1V15h2v6zM8.1 9.5L5 6.4V9H3V3h6v2H6.4l3.1 3.1zm7.8 0l-1.4-1.4L17.6 5H15V3h6v6h-2V6.4zM12 14q-.825 0-1.412-.587T10 12t.588-1.412T12 10t1.413.588T14 12t-.587 1.413T12 14"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/move-horizontal.svg b/wlx-overlay-s/src/assets/edit/move-horizontal.svg
index 3ccc67a..ab63e26 100644
--- a/wlx-overlay-s/src/assets/edit/move-horizontal.svg
+++ b/wlx-overlay-s/src/assets/edit/move-horizontal.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m7 17l-5-5l5-5l1.4 1.4L5.825 11h12.35L15.6 8.4L17 7l5 5l-5 5l-1.4-1.4l2.575-2.6H5.825L8.4 15.6z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m7 17l-5-5l5-5l1.4 1.4L5.825 11h12.35L15.6 8.4L17 7l5 5l-5 5l-1.4-1.4l2.575-2.6H5.825L8.4 15.6z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/normal.svg b/wlx-overlay-s/src/assets/edit/normal.svg
index 484ad8a..4e90847 100644
--- a/wlx-overlay-s/src/assets/edit/normal.svg
+++ b/wlx-overlay-s/src/assets/edit/normal.svg
@@ -33,7 +33,7 @@
      inkscape:current-layer="svg1" />
   <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
   <path
-     fill="white"
+     fill="currentColor"
      d="M 12,22 C 10.616667,22 9.3166667,21.737333 8.1,21.212 6.8833333,20.686667 5.825,19.974333 4.925,19.075 4.025,18.175667 3.3126667,17.117333 2.788,15.9 2.2633333,14.682667 2.0006667,13.382667 2,12 1.9993333,10.617333 2.262,9.3173333 2.788,8.1 3.314,6.8826667 4.0263333,5.8243333 4.925,4.925 5.8236667,4.0256667 6.882,3.3133333 8.1,2.788 9.318,2.2626667 10.618,2 12,2 c 1.382,0 2.682,0.2626667 3.9,0.788 1.218,0.5253333 2.276333,1.2376667 3.175,2.137 0.898667,0.8993333 1.611333,1.9576667 2.138,3.175 0.526667,1.2173333 0.789,2.517333 0.787,3.9 -0.002,1.382667 -0.264667,2.682667 -0.788,3.9 -0.523333,1.217333 -1.235667,2.275667 -2.137,3.175 -0.901333,0.899333 -1.959667,1.612 -3.175,2.138 C 14.684667,21.739 13.384667,22.001333 12,22 m 0,-2 c 2.233333,0 4.125,-0.775 5.675,-2.325 C 19.225,16.125 20,14.233333 20,12 20,9.9778321 19.418096,8.0680972 17.675,6.325 15.931904,4.5819028 14.226843,4 12,4 9.7731573,4 7.875,4.775 6.325,6.325 4.775,7.875 4,9.7666667 4,12 4,14.233333 4.775,16.125 6.325,17.675 7.875,19.225 9.7666667,20 12,20"
      id="path1"
      sodipodi:nodetypes="csssssssssssssssccsszzzssc" />
diff --git a/wlx-overlay-s/src/assets/edit/panel.svg b/wlx-overlay-s/src/assets/edit/panel.svg
index 3cd44f3..381dc53 100644
--- a/wlx-overlay-s/src/assets/edit/panel.svg
+++ b/wlx-overlay-s/src/assets/edit/panel.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Remix Icon by Remix Design - https://github.com/Remix-Design/RemixIcon/blob/master/License --><path fill="white" d="M3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1m17 7H4v9h16zM5 6v2h2V6zm4 0v2h2V6z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Remix Icon by Remix Design - https://github.com/Remix-Design/RemixIcon/blob/master/License --><path fill="currentColor" d="M3 3h18a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1m17 7H4v9h16zM5 6v2h2V6zm4 0v2h2V6z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/pin.svg b/wlx-overlay-s/src/assets/edit/pin.svg
index 96f6bef..67fd196 100644
--- a/wlx-overlay-s/src/assets/edit/pin.svg
+++ b/wlx-overlay-s/src/assets/edit/pin.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Remix Icon by Remix Design - https://github.com/Remix-Design/RemixIcon/blob/master/License --><path fill="white" d="m22.313 10.175l-1.415 1.414l-.707-.707l-4.242 4.243l-.707 3.536l-1.415 1.414l-4.242-4.243l-4.95 4.95l-1.414-1.414l4.95-4.95l-4.243-4.243l1.414-1.414l3.536-.707l4.242-4.243l-.707-.707l1.414-1.414z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Remix Icon by Remix Design - https://github.com/Remix-Design/RemixIcon/blob/master/License --><path fill="currentColor" d="m22.313 10.175l-1.415 1.414l-.707-.707l-4.242 4.243l-.707 3.536l-1.415 1.414l-4.242-4.243l-4.95 4.95l-1.414-1.414l4.95-4.95l-4.243-4.243l1.414-1.414l3.536-.707l4.242-4.243l-.707-.707l1.414-1.414z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/resize.svg b/wlx-overlay-s/src/assets/edit/resize.svg
index ed581c2..446108b 100644
--- a/wlx-overlay-s/src/assets/edit/resize.svg
+++ b/wlx-overlay-s/src/assets/edit/resize.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M4 5q-.425 0-.712-.288T3 4t.288-.712T4 3t.713.288T5 4t-.288.713T4 5m4 0q-.425 0-.712-.288T7 4t.288-.712T8 3t.713.288T9 4t-.288.713T8 5m4 0q-.425 0-.712-.288T11 4t.288-.712T12 3t.713.288T13 4t-.288.713T12 5M4 9q-.425 0-.712-.288T3 8t.288-.712T4 7t.713.288T5 8t-.288.713T4 9m0 4q-.425 0-.712-.288T3 12t.288-.712T4 11t.713.288T5 12t-.288.713T4 13m16 0q-.425 0-.712-.288T19 12t.288-.712T20 11t.713.288T21 12t-.288.713T20 13m0 4q-.425 0-.712-.288T19 16t.288-.712T20 15t.713.288T21 16t-.288.713T20 17m-8 4q-.425 0-.712-.288T11 20t.288-.712T12 19t.713.288T13 20t-.288.713T12 21m4 0q-.425 0-.712-.288T15 20t.288-.712T16 19t.713.288T17 20t-.288.713T16 21m4 0q-.425 0-.712-.288T19 20t.288-.712T20 19t.713.288T21 20t-.288.713T20 21M19 8V5h-3q-.425 0-.712-.288T15 4t.288-.712T16 3h3q.825 0 1.413.588T21 5v3q0 .425-.288.713T20 9t-.712-.288T19 8M3 19v-3q0-.425.288-.712T4 15t.713.288T5 16v3h3q.425 0 .713.288T9 20t-.288.713T8 21H5q-.825 0-1.412-.587T3 19"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M4 5q-.425 0-.712-.288T3 4t.288-.712T4 3t.713.288T5 4t-.288.713T4 5m4 0q-.425 0-.712-.288T7 4t.288-.712T8 3t.713.288T9 4t-.288.713T8 5m4 0q-.425 0-.712-.288T11 4t.288-.712T12 3t.713.288T13 4t-.288.713T12 5M4 9q-.425 0-.712-.288T3 8t.288-.712T4 7t.713.288T5 8t-.288.713T4 9m0 4q-.425 0-.712-.288T3 12t.288-.712T4 11t.713.288T5 12t-.288.713T4 13m16 0q-.425 0-.712-.288T19 12t.288-.712T20 11t.713.288T21 12t-.288.713T20 13m0 4q-.425 0-.712-.288T19 16t.288-.712T20 15t.713.288T21 16t-.288.713T20 17m-8 4q-.425 0-.712-.288T11 20t.288-.712T12 19t.713.288T13 20t-.288.713T12 21m4 0q-.425 0-.712-.288T15 20t.288-.712T16 19t.713.288T17 20t-.288.713T16 21m4 0q-.425 0-.712-.288T19 20t.288-.712T20 19t.713.288T21 20t-.288.713T20 21M19 8V5h-3q-.425 0-.712-.288T15 4t.288-.712T16 3h3q.825 0 1.413.588T21 5v3q0 .425-.288.713T20 9t-.712-.288T19 8M3 19v-3q0-.425.288-.712T4 15t.713.288T5 16v3h3q.425 0 .713.288T9 20t-.288.713T8 21H5q-.825 0-1.412-.587T3 19"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/rotate180.svg b/wlx-overlay-s/src/assets/edit/rotate180.svg
index b946ed8..2917ddd 100644
--- a/wlx-overlay-s/src/assets/edit/rotate180.svg
+++ b/wlx-overlay-s/src/assets/edit/rotate180.svg
@@ -33,7 +33,7 @@
      inkscape:current-layer="svg1" />
   <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
   <path
-     fill="white"
+     fill="currentColor"
      d="M 12,22 C 10.616667,22 9.3166667,21.737333 8.1,21.212 6.8833333,20.686667 5.825,19.974333 4.925,19.075 4.025,18.175667 3.3126667,17.117333 2.788,15.9 2.2633333,14.682667 2.0006667,13.382667 2,12 1.9993333,10.617333 2.262,9.3173333 2.788,8.1 3.314,6.8826667 4.0263333,5.8243333 4.925,4.925 5.8236667,4.0256667 6.882,3.3133333 8.1,2.788 9.318,2.2626667 10.618,2 12,2 c 1.382,0 2.682,0.2626667 3.9,0.788 1.218,0.5253333 2.276333,1.2376667 3.175,2.137 0.898667,0.8993333 1.611333,1.9576667 2.138,3.175 0.526667,1.2173333 0.789,2.517333 0.787,3.9 -0.002,1.382667 -0.264667,2.682667 -0.788,3.9 -0.523333,1.217333 -1.235667,2.275667 -2.137,3.175 -0.901333,0.899333 -1.959667,1.612 -3.175,2.138 C 14.684667,21.739 13.384667,22.001333 12,22 m 0,-2 c 0,-4.40625 0,-3.449573 0,-8 V 4 C 9.7666667,4 7.875,4.775 6.325,6.325 4.775,7.875 4,9.7666667 4,12 4,14.233333 4.775,16.125 6.325,17.675 7.875,19.225 9.7666667,20 12,20"
      id="path1"
      sodipodi:nodetypes="csssssssssssssssccccsssc" />
diff --git a/wlx-overlay-s/src/assets/edit/rotate270.svg b/wlx-overlay-s/src/assets/edit/rotate270.svg
index 73cb40b..9a6a0b6 100644
--- a/wlx-overlay-s/src/assets/edit/rotate270.svg
+++ b/wlx-overlay-s/src/assets/edit/rotate270.svg
@@ -33,7 +33,7 @@
      inkscape:current-layer="svg1" />
   <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
   <path
-     fill="white"
+     fill="currentColor"
      d="M 12,22 C 10.616667,22 9.3166667,21.737333 8.1,21.212 6.8833333,20.686667 5.825,19.974333 4.925,19.075 4.025,18.175667 3.3126667,17.117333 2.788,15.9 2.2633333,14.682667 2.0006667,13.382667 2,12 1.9993333,10.617333 2.262,9.3173333 2.788,8.1 3.314,6.8826667 4.0263333,5.8243333 4.925,4.925 5.8236667,4.0256667 6.882,3.3133333 8.1,2.788 9.318,2.2626667 10.618,2 12,2 c 1.382,0 2.682,0.2626667 3.9,0.788 1.218,0.5253333 2.276333,1.2376667 3.175,2.137 0.898667,0.8993333 1.611333,1.9576667 2.138,3.175 0.526667,1.2173333 0.789,2.517333 0.787,3.9 -0.002,1.382667 -0.264667,2.682667 -0.788,3.9 -0.523333,1.217333 -1.235667,2.275667 -2.137,3.175 -0.901333,0.899333 -1.959667,1.612 -3.175,2.138 C 14.684667,21.739 13.384667,22.001333 12,22 M 12,12 V 4 C 9.7666667,4 7.875,4.775 6.325,6.325 4.775,7.875 4,9.7666667 4,12"
      id="path1"
      sodipodi:nodetypes="cssssssssssssssscccsc" />
diff --git a/wlx-overlay-s/src/assets/edit/rotate90.svg b/wlx-overlay-s/src/assets/edit/rotate90.svg
index 74a4f57..9c4af2a 100644
--- a/wlx-overlay-s/src/assets/edit/rotate90.svg
+++ b/wlx-overlay-s/src/assets/edit/rotate90.svg
@@ -33,7 +33,7 @@
      inkscape:current-layer="svg1" />
   <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
   <path
-     fill="white"
+     fill="currentColor"
      d="M 12,22 C 10.616667,22 9.3166667,21.737333 8.1,21.212 6.8833333,20.686667 5.825,19.974333 4.925,19.075 4.025,18.175667 3.3126667,17.117333 2.788,15.9 2.2633333,14.682667 2.0006667,13.382667 2,12 1.9993333,10.617333 2.262,9.3173333 2.788,8.1 3.314,6.8826667 4.0263333,5.8243333 4.925,4.925 5.8236667,4.0256667 6.882,3.3133333 8.1,2.788 9.318,2.2626667 10.618,2 12,2 c 1.382,0 2.682,0.2626667 3.9,0.788 1.218,0.5253333 2.276333,1.2376667 3.175,2.137 0.898667,0.8993333 1.611333,1.9576667 2.138,3.175 0.526667,1.2173333 0.789,2.517333 0.787,3.9 -0.002,1.382667 -0.264667,2.682667 -0.788,3.9 -0.523333,1.217333 -1.235667,2.275667 -2.137,3.175 -0.901333,0.899333 -1.959667,1.612 -3.175,2.138 C 14.684667,21.739 13.384667,22.001333 12,22 m 0,-2 c 2.233333,0 4.125,-0.775 5.675,-2.325 C 19.225,16.125 20,14.233333 20,12 16.205587,12 14.579192,11.9944 12,12 V 4 C 9.7666667,4 7.875,4.775 6.325,6.325 4.775,7.875 4,9.7666667 4,12 4,14.233333 4.775,16.125 6.325,17.675 7.875,19.225 9.7666667,20 12,20"
      id="path1"
      sodipodi:nodetypes="csssssssssssssssccscccsssc" />
diff --git a/wlx-overlay-s/src/assets/edit/screen-add.svg b/wlx-overlay-s/src/assets/edit/screen-add.svg
index 96d15de..3e1b55a 100644
--- a/wlx-overlay-s/src/assets/edit/screen-add.svg
+++ b/wlx-overlay-s/src/assets/edit/screen-add.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M11 15h2v-3h3v-2h-3V7h-2v3H8v2h3zm-3 6v-2H4q-.825 0-1.412-.587T2 17V5q0-.825.588-1.412T4 3h16q.825 0 1.413.588T22 5v12q0 .825-.587 1.413T20 19h-4v2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M11 15h2v-3h3v-2h-3V7h-2v3H8v2h3zm-3 6v-2H4q-.825 0-1.412-.587T2 17V5q0-.825.588-1.412T4 3h16q.825 0 1.413.588T22 5v12q0 .825-.587 1.413T20 19h-4v2z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/screen-options.svg b/wlx-overlay-s/src/assets/edit/screen-options.svg
index 99b6fd3..474c865 100644
--- a/wlx-overlay-s/src/assets/edit/screen-options.svg
+++ b/wlx-overlay-s/src/assets/edit/screen-options.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M4 20q-.825 0-1.412-.587T2 18V6q0-.825.588-1.412T4 4h16q.825 0 1.413.588T22 6v12q0 .825-.587 1.413T20 20zm7-3h2l.3-1.5q.3-.125.563-.262t.537-.338l1.45.45l1-1.7l-1.15-1q.05-.325.05-.65t-.05-.65l1.15-1l-1-1.7l-1.45.45q-.275-.2-.537-.338T13.3 8.5L13 7h-2l-.3 1.5q-.3.125-.562.263T9.6 9.1l-1.45-.45l-1 1.7l1.15 1q-.05.325-.05.65t.05.65l-1.15 1l1 1.7l1.45-.45q.275.2.538.338t.562.262zm1-3q-.825 0-1.412-.587T10 12t.588-1.412T12 10t1.413.588T14 12t-.587 1.413T12 14"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M4 20q-.825 0-1.412-.587T2 18V6q0-.825.588-1.412T4 4h16q.825 0 1.413.588T22 6v12q0 .825-.587 1.413T20 20zm7-3h2l.3-1.5q.3-.125.563-.262t.537-.338l1.45.45l1-1.7l-1.15-1q.05-.325.05-.65t-.05-.65l1.15-1l-1-1.7l-1.45.45q-.275-.2-.537-.338T13.3 8.5L13 7h-2l-.3 1.5q-.3.125-.562.263T9.6 9.1l-1.45-.45l-1 1.7l1.15 1q-.05.325-.05.65t.05.65l-1.15 1l1 1.7l1.45-.45q.275.2.538.338t.562.262zm1-3q-.825 0-1.412-.587T10 12t.588-1.412T12 10t1.413.588T14 12t-.587 1.413T12 14"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/screen-remove.svg b/wlx-overlay-s/src/assets/edit/screen-remove.svg
index 6fab54c..a5af89e 100644
--- a/wlx-overlay-s/src/assets/edit/screen-remove.svg
+++ b/wlx-overlay-s/src/assets/edit/screen-remove.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M8 12h8v-2H8zm0 9v-2H4q-.825 0-1.412-.587T2 17V5q0-.825.588-1.412T4 3h16q.825 0 1.413.588T22 5v12q0 .825-.587 1.413T20 19h-4v2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M8 12h8v-2H8zm0 9v-2H4q-.825 0-1.412-.587T2 17V5q0-.825.588-1.412T4 3h16q.825 0 1.413.588T22 5v12q0 .825-.587 1.413T20 19h-4v2z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/screen.svg b/wlx-overlay-s/src/assets/edit/screen.svg
index 2033bd2..6b4fb6b 100644
--- a/wlx-overlay-s/src/assets/edit/screen.svg
+++ b/wlx-overlay-s/src/assets/edit/screen.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M8 21v-2h2v-2H4q-.825 0-1.412-.587T2 15V5q0-.825.588-1.412T4 3h16q.825 0 1.413.588T22 5v10q0 .825-.587 1.413T20 17h-6v2h2v2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M8 21v-2h2v-2H4q-.825 0-1.412-.587T2 15V5q0-.825.588-1.412T4 3h16q.825 0 1.413.588T22 5v10q0 .825-.587 1.413T20 17h-6v2h2v2z"/></svg>
diff --git a/wlx-overlay-s/src/assets/edit/wayvr.svg b/wlx-overlay-s/src/assets/edit/wayvr.svg
index c2ec793..5209678 100644
--- a/wlx-overlay-s/src/assets/edit/wayvr.svg
+++ b/wlx-overlay-s/src/assets/edit/wayvr.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M6 16h9v-5H6zm10.5-3H18V8H9v1.5h7.5zM4 20q-.825 0-1.412-.587T2 18V6q0-.825.588-1.412T4 4h16q.825 0 1.413.588T22 6v12q0 .825-.587 1.413T20 20z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M6 16h9v-5H6zm10.5-3H18V8H9v1.5h7.5zM4 20q-.825 0-1.412-.587T2 18V6q0-.825.588-1.412T4 4h16q.825 0 1.413.588T22 6v12q0 .825-.587 1.413T20 20z"/></svg>
diff --git a/wlx-overlay-s/src/assets/icons/bell.svg b/wlx-overlay-s/src/assets/icons/bell.svg
index 4d98bf9..14a3387 100644
--- a/wlx-overlay-s/src/assets/icons/bell.svg
+++ b/wlx-overlay-s/src/assets/icons/bell.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
-  <path fill="white" d="M12 18.5q.625 0 1.063-.437T13.5 17h-3q0 .625.438 1.063T12 18.5M7 16h10v-2h-1v-2.6q0-1.525-.788-2.787T13 7V5.5h-2V7q-1.425.35-2.212 1.613T8 11.4V14H7zm5 6q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22" />
+  <path fill="currentColor" d="M12 18.5q.625 0 1.063-.437T13.5 17h-3q0 .625.438 1.063T12 18.5M7 16h10v-2h-1v-2.6q0-1.525-.788-2.787T13 7V5.5h-2V7q-1.425.35-2.212 1.613T8 11.4V14H7zm5 6q-2.075 0-3.9-.788t-3.175-2.137T2.788 15.9T2 12t.788-3.9t2.137-3.175T8.1 2.788T12 2t3.9.788t3.175 2.137T21.213 8.1T22 12t-.788 3.9t-2.137 3.175t-3.175 2.138T12 22" />
 </svg>
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/keyboard/backspace.svg b/wlx-overlay-s/src/assets/keyboard/backspace.svg
index 75b38e5..8949c04 100644
--- a/wlx-overlay-s/src/assets/keyboard/backspace.svg
+++ b/wlx-overlay-s/src/assets/keyboard/backspace.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m11.4 16l2.6-2.6l2.6 2.6l1.4-1.4l-2.6-2.6L18 9.4L16.6 8L14 10.6L11.4 8L10 9.4l2.6 2.6l-2.6 2.6zM9 20q-.475 0-.9-.213t-.7-.587L2 12l5.4-7.2q.275-.375.7-.587T9 4h11q.825 0 1.413.587T22 6v12q0 .825-.587 1.413T20 20z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m11.4 16l2.6-2.6l2.6 2.6l1.4-1.4l-2.6-2.6L18 9.4L16.6 8L14 10.6L11.4 8L10 9.4l2.6 2.6l-2.6 2.6zM9 20q-.475 0-.9-.213t-.7-.587L2 12l5.4-7.2q.275-.375.7-.587T9 4h11q.825 0 1.413.587T22 6v12q0 .825-.587 1.413T20 20z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/down.svg b/wlx-overlay-s/src/assets/keyboard/down.svg
index 791f6bb..c352835 100644
--- a/wlx-overlay-s/src/assets/keyboard/down.svg
+++ b/wlx-overlay-s/src/assets/keyboard/down.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m12 15l-5-5h10z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m12 15l-5-5h10z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/left.svg b/wlx-overlay-s/src/assets/keyboard/left.svg
index 999a969..81ceae4 100644
--- a/wlx-overlay-s/src/assets/keyboard/left.svg
+++ b/wlx-overlay-s/src/assets/keyboard/left.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m14 17l-5-5l5-5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m14 17l-5-5l5-5z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/menu.svg b/wlx-overlay-s/src/assets/keyboard/menu.svg
index 6f15c0b..38751dc 100644
--- a/wlx-overlay-s/src/assets/keyboard/menu.svg
+++ b/wlx-overlay-s/src/assets/keyboard/menu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M8 17q.425 0 .713-.288T9 16t-.288-.712T8 15t-.712.288T7 16t.288.713T8 17m0-4q.425 0 .713-.288T9 12t-.288-.712T8 11t-.712.288T7 12t.288.713T8 13m0-4q.425 0 .713-.288T9 8t-.288-.712T8 7t-.712.288T7 8t.288.713T8 9m3 8h6v-2h-6zm0-4h6v-2h-6zm0-4h6V7h-6zM5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M8 17q.425 0 .713-.288T9 16t-.288-.712T8 15t-.712.288T7 16t.288.713T8 17m0-4q.425 0 .713-.288T9 12t-.288-.712T8 11t-.712.288T7 12t.288.713T8 13m0-4q.425 0 .713-.288T9 8t-.288-.712T8 7t-.712.288T7 8t.288.713T8 9m3 8h6v-2h-6zm0-4h6v-2h-6zm0-4h6V7h-6zM5 21q-.825 0-1.412-.587T3 19V5q0-.825.588-1.412T5 3h14q.825 0 1.413.588T21 5v14q0 .825-.587 1.413T19 21z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/return.svg b/wlx-overlay-s/src/assets/keyboard/return.svg
index 02cb3b3..f64eece 100644
--- a/wlx-overlay-s/src/assets/keyboard/return.svg
+++ b/wlx-overlay-s/src/assets/keyboard/return.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m10 21l-6-6l6.025-6.025l1.4 1.425l-3.6 3.6H17V4h2v12H7.825l3.6 3.575z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m10 21l-6-6l6.025-6.025l1.4 1.425l-3.6 3.6H17V4h2v12H7.825l3.6 3.575z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/right.svg b/wlx-overlay-s/src/assets/keyboard/right.svg
index 041ee5b..ca1b8d1 100644
--- a/wlx-overlay-s/src/assets/keyboard/right.svg
+++ b/wlx-overlay-s/src/assets/keyboard/right.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M10 17V7l5 5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M10 17V7l5 5z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/shift.svg b/wlx-overlay-s/src/assets/keyboard/shift.svg
index c669bad..b91c40c 100644
--- a/wlx-overlay-s/src/assets/keyboard/shift.svg
+++ b/wlx-overlay-s/src/assets/keyboard/shift.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M8 18v-5H3l9-11l9 11h-5v5zm-4 4v-2h16v2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M8 18v-5H3l9-11l9 11h-5v5zm-4 4v-2h16v2z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/super.svg b/wlx-overlay-s/src/assets/keyboard/super.svg
index 36a9dfe..347d36c 100644
--- a/wlx-overlay-s/src/assets/keyboard/super.svg
+++ b/wlx-overlay-s/src/assets/keyboard/super.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M6.5 21q-1.45 0-2.475-1.025T3 17.5t1.025-2.475T6.5 14H8v-4H6.5q-1.45 0-2.475-1.025T3 6.5t1.025-2.475T6.5 3t2.475 1.025T10 6.5V8h4V6.5q0-1.45 1.025-2.475T17.5 3t2.475 1.025T21 6.5t-1.025 2.475T17.5 10H16v4h1.5q1.45 0 2.475 1.025T21 17.5t-1.025 2.475T17.5 21t-2.475-1.025T14 17.5V16h-4v1.5q0 1.45-1.025 2.475T6.5 21m0-2q.625 0 1.063-.437T8 17.5V16H6.5q-.625 0-1.062.438T5 17.5t.438 1.063T6.5 19m11 0q.625 0 1.063-.437T19 17.5t-.437-1.062T17.5 16H16v1.5q0 .625.438 1.063T17.5 19M10 14h4v-4h-4zM6.5 8H8V6.5q0-.625-.437-1.062T6.5 5t-1.062.438T5 6.5t.438 1.063T6.5 8M16 8h1.5q.625 0 1.063-.437T19 6.5t-.437-1.062T17.5 5t-1.062.438T16 6.5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M6.5 21q-1.45 0-2.475-1.025T3 17.5t1.025-2.475T6.5 14H8v-4H6.5q-1.45 0-2.475-1.025T3 6.5t1.025-2.475T6.5 3t2.475 1.025T10 6.5V8h4V6.5q0-1.45 1.025-2.475T17.5 3t2.475 1.025T21 6.5t-1.025 2.475T17.5 10H16v4h1.5q1.45 0 2.475 1.025T21 17.5t-1.025 2.475T17.5 21t-2.475-1.025T14 17.5V16h-4v1.5q0 1.45-1.025 2.475T6.5 21m0-2q.625 0 1.063-.437T8 17.5V16H6.5q-.625 0-1.062.438T5 17.5t.438 1.063T6.5 19m11 0q.625 0 1.063-.437T19 17.5t-.437-1.062T17.5 16H16v1.5q0 .625.438 1.063T17.5 19M10 14h4v-4h-4zM6.5 8H8V6.5q0-.625-.437-1.062T6.5 5t-1.062.438T5 6.5t.438 1.063T6.5 8M16 8h1.5q.625 0 1.063-.437T19 6.5t-.437-1.062T17.5 5t-1.062.438T16 6.5z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/swap.svg b/wlx-overlay-s/src/assets/keyboard/swap.svg
index 86534f7..f6a2918 100644
--- a/wlx-overlay-s/src/assets/keyboard/swap.svg
+++ b/wlx-overlay-s/src/assets/keyboard/swap.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m7 20l-5-5l5-5l1.4 1.425L5.825 14H13v2H5.825L8.4 18.575zm10-6l-1.4-1.425L18.175 10H11V8h7.175L15.6 5.425L17 4l5 5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m7 20l-5-5l5-5l1.4 1.425L5.825 14H13v2H5.825L8.4 18.575zm10-6l-1.4-1.425L18.175 10H11V8h7.175L15.6 5.425L17 4l5 5z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/tab.svg b/wlx-overlay-s/src/assets/keyboard/tab.svg
index eb102b7..bac91ef 100644
--- a/wlx-overlay-s/src/assets/keyboard/tab.svg
+++ b/wlx-overlay-s/src/assets/keyboard/tab.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M20 18V6h2v12zm-8 0l-1.425-1.4l3.6-3.6H2v-2h12.175L10.6 7.4L12 6l6 6z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M20 18V6h2v12zm-8 0l-1.425-1.4l3.6-3.6H2v-2h12.175L10.6 7.4L12 6l6 6z"/></svg>
diff --git a/wlx-overlay-s/src/assets/keyboard/up.svg b/wlx-overlay-s/src/assets/keyboard/up.svg
index a59b4a4..21c121b 100644
--- a/wlx-overlay-s/src/assets/keyboard/up.svg
+++ b/wlx-overlay-s/src/assets/keyboard/up.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m7 14l5-5l5 5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m7 14l5-5l5 5z"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/controller_r.svg b/wlx-overlay-s/src/assets/watch/controller_r.svg
index b788296..2ea281a 100644
--- a/wlx-overlay-s/src/assets/watch/controller_r.svg
+++ b/wlx-overlay-s/src/assets/watch/controller_r.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M11 18q-1.65 0-2.825-1.175T7 14q-2.5.025-4.25-1.737T1 8q0-.825.588-1.412T3 6h4V5H5V3h6v2H9v1h3.175q.4 0 .763.15t.637.425l8.375 8.375Q23 16 23 17.45t-1.05 2.5t-2.5 1.05t-2.5-1.05L15 18zm0-4H8.975q0 .825.588 1.413T11 16h2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M11 18q-1.65 0-2.825-1.175T7 14q-2.5.025-4.25-1.737T1 8q0-.825.588-1.412T3 6h4V5H5V3h6v2H9v1h3.175q.4 0 .763.15t.637.425l8.375 8.375Q23 16 23 17.45t-1.05 2.5t-2.5 1.05t-2.5-1.05L15 18zm0-4H8.975q0 .825.588 1.413T11 16h2z"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/display.svg b/wlx-overlay-s/src/assets/watch/display.svg
index f749bda..5509bf7 100644
--- a/wlx-overlay-s/src/assets/watch/display.svg
+++ b/wlx-overlay-s/src/assets/watch/display.svg
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24">
-	<path fill="white" d="M2 16V4q0-.825.588-1.412T4 2h14v2H4v12zm9 6v-2H8q-.825 0-1.412-.587T6 18V8q0-.825.588-1.412T8 6h13q.825 0 1.413.588T23 8v10q0 .825-.587 1.413T21 20h-3v2zm-3-4h13V8H8zm6.5-5" />
+	<path fill="currentColor" d="M2 16V4q0-.825.588-1.412T4 2h14v2H4v12zm9 6v-2H8q-.825 0-1.412-.587T6 18V8q0-.825.588-1.412T8 6h13q.825 0 1.413.588T23 8v10q0 .825-.587 1.413T21 20h-3v2zm-3-4h13V8H8zm6.5-5" />
 </svg>
\ No newline at end of file
diff --git a/wlx-overlay-s/src/assets/watch/edit.svg b/wlx-overlay-s/src/assets/watch/edit.svg
index 88e3c25..aef4205 100644
--- a/wlx-overlay-s/src/assets/watch/edit.svg
+++ b/wlx-overlay-s/src/assets/watch/edit.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m18.9 21l-5.475-5.475l2.1-2.1L21 18.9zM5.1 21L3 18.9L9.9 12l-1.7-1.7l-.7.7l-1.275-1.275v2.05l-.7.7L2.5 9.45l.7-.7h2.05L4 7.5l3.55-3.55q.5-.5 1.075-.725T9.8 3t1.175.225t1.075.725l-2.3 2.3L11 7.5l-.7.7L12 9.9l2.25-2.25q-.1-.275-.162-.575t-.063-.6q0-1.475 1.013-2.488t2.487-1.012q.375 0 .713.075t.687.225L16.45 5.75l1.8 1.8l2.475-2.475q.175.35.238.687t.062.713q0 1.475-1.012 2.488t-2.488 1.012q-.3 0-.6-.05t-.575-.175z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m18.9 21l-5.475-5.475l2.1-2.1L21 18.9zM5.1 21L3 18.9L9.9 12l-1.7-1.7l-.7.7l-1.275-1.275v2.05l-.7.7L2.5 9.45l.7-.7h2.05L4 7.5l3.55-3.55q.5-.5 1.075-.725T9.8 3t1.175.225t1.075.725l-2.3 2.3L11 7.5l-.7.7L12 9.9l2.25-2.25q-.1-.275-.162-.575t-.063-.6q0-1.475 1.013-2.488t2.487-1.012q.375 0 .713.075t.687.225L16.45 5.75l1.8 1.8l2.475-2.475q.175.35.238.687t.062.713q0 1.475-1.012 2.488t-2.488 1.012q-.3 0-.6-.05t-.575-.175z"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/fix-floor.svg b/wlx-overlay-s/src/assets/watch/fix-floor.svg
index 320b6e4..65dc4f5 100644
--- a/wlx-overlay-s/src/assets/watch/fix-floor.svg
+++ b/wlx-overlay-s/src/assets/watch/fix-floor.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M4 21v-2h16v2zm8-4l-5-5l1.4-1.4l2.6 2.6V3h2v10.2l2.6-2.6L17 12z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M4 21v-2h16v2zm8-4l-5-5l1.4-1.4l2.6 2.6V3h2v10.2l2.6-2.6L17 12z"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/hmd.svg b/wlx-overlay-s/src/assets/watch/hmd.svg
index 4416109..f6ca909 100644
--- a/wlx-overlay-s/src/assets/watch/hmd.svg
+++ b/wlx-overlay-s/src/assets/watch/hmd.svg
@@ -33,7 +33,7 @@
      inkscape:current-layer="svg1" />
   <!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE -->
   <path
-     fill="white"
+     fill="currentColor"
      d="m 5.7477204,20.336375 c -1.5283351,0 -2.8366825,-0.544181 -3.9250422,-1.63254 C 0.73431841,17.615476 0.19013847,16.307128 0.19013847,14.778793 V 9.1170061 c 0,-1.1809862 0.37050551,-2.2174752 1.11151643,-3.1094671 C 2.0426657,5.1155471 2.9920861,4.5658096 4.1499156,4.3583266 5.4698413,4.1036041 6.7781887,3.9243721 8.0749578,3.8206305 9.3717264,3.716889 10.680074,3.6645552 12,3.6636289 c 1.319926,-9.264e-4 2.634294,0.051408 3.943104,0.1570016 1.308811,0.1055941 2.611137,0.2848261 3.90698,0.5376961 1.15783,0.2315659 2.107251,0.7873241 2.848261,1.6672746 0.741011,0.8799504 1.111517,1.9104187 1.111517,3.0914049 v 5.6617869 c 0,1.528335 -0.544181,2.836683 -1.63254,3.925042 -1.088359,1.088359 -2.396707,1.63254 -3.925042,1.63254 h -1.389396 c -0.301036,0 -0.602071,-0.0176 -0.903107,-0.0528 -0.301036,-0.03519 -0.590493,-0.110221 -0.868372,-0.225083 L 12.868372,19.294328 C 12.590493,19.17855 12.301036,19.120653 12,19.120653 c -0.301036,0 -0.590493,0.0579 -0.868372,0.173675 l -2.2230329,0.764167 c -0.2778791,0.115783 -0.5673365,0.19081 -0.8683722,0.225083 -0.3010357,0.03427 -0.6020713,0.05187 -0.9031071,0.0528 z m 0,-2.778791 h 1.3893954 c 0.1620962,0 0.3186347,-0.01153 0.4696157,-0.03473 0.150981,-0.02316 0.2954782,-0.0579 0.4334914,-0.104205 0.6715411,-0.208409 1.325946,-0.428396 1.9632161,-0.659963 0.63727,-0.231566 1.30279,-0.347349 1.996561,-0.347349 0.693771,0 1.365313,0.110221 2.014623,0.330676 0.649311,0.220452 1.297696,0.445996 1.945154,0.676636 0.13894,0.04631 0.283899,0.08104 0.434881,0.104205 0.150981,0.02316 0.307056,0.03473 0.468226,0.03473 h 1.389396 c 0.764167,0 1.418572,-0.271859 1.963215,-0.815576 0.544643,-0.543716 0.816502,-1.198121 0.815576,-1.963215 V 9.1170061 c 0,-0.5094451 -0.162097,-0.9494202 -0.486289,-1.3199257 C 20.22059,7.4265749 19.81535,7.1834307 19.329061,7.0676478 18.124918,6.8129253 16.914754,6.6452715 15.698571,6.5646866 14.482387,6.4841017 13.249529,6.4433461 12,6.4424198 10.750471,6.4414935 9.5231705,6.4878068 8.318102,6.5813593 7.113033,6.6749119 5.897312,6.8370081 4.6709389,7.0676478 4.1846505,7.1602742 3.7794101,7.3978608 3.4552178,7.7804076 3.1310256,8.1629545 2.9689294,8.6084873 2.9689294,9.1170061 v 5.6617869 c 0,0.764167 0.2723215,1.418572 0.8169646,1.963215 0.544643,0.544643 1.1985852,0.816502 1.9618264,0.815576 m 0,0 c -0.7641675,0 -1.4181097,-0.271859 -1.9618264,-0.815576 C 3.2421772,16.198292 2.9698557,15.543887 2.9689294,14.778793 V 9.1170061 c 0,-0.5094451 0.1620962,-0.9549778 0.4862884,-1.3365985 C 3.7794101,7.398787 4.1846505,7.1612003 4.6709389,7.0676478 5.8982382,6.8360818 7.1139592,6.6739858 8.318102,6.5813593 9.5222452,6.4887329 10.749544,6.4424198 12,6.4424198 c 1.250456,0 2.483776,0.040755 3.69996,0.1222668 1.216184,0.081512 2.425885,0.2491649 3.629101,0.5029612 0.486289,0.1157825 0.891529,0.3589271 1.215721,0.7294326 0.324192,0.3705055 0.486289,0.8104806 0.486289,1.3199257 v 5.6617869 c 0,0.764167 -0.271859,1.418572 -0.815576,1.963215 -0.543716,0.544643 -1.198121,0.816502 -1.963215,0.815576 h -1.389396 c -0.162096,0 -0.318171,-0.01153 -0.468226,-0.03473 -0.150055,-0.02316 -0.295015,-0.0579 -0.434881,-0.104205 C 15.311392,17.187078 14.663008,16.96107 14.014623,16.740619 13.366238,16.520168 12.694698,16.41087 12,16.412722 c -0.694698,0.0018 -1.360218,0.11764 -1.996561,0.347349 -0.6363434,0.229713 -1.2907487,0.449701 -1.9632161,0.659962 -0.1389395,0.04631 -0.2834367,0.08104 -0.4334914,0.104205 -0.1500547,0.02316 -0.3065933,0.03427 -0.4696157,0.03335 z"
      id="path1"
      style="fill:#ffffff;fill-opacity:1;stroke-width:1.3894"
diff --git a/wlx-overlay-s/src/assets/watch/home.svg b/wlx-overlay-s/src/assets/watch/home.svg
index 71a6c45..665fdda 100644
--- a/wlx-overlay-s/src/assets/watch/home.svg
+++ b/wlx-overlay-s/src/assets/watch/home.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M4 21v-9.375L2.2 13L1 11.4L12 3l11 8.4l-1.2 1.575l-1.8-1.35V21zm4-6q-.425 0-.712-.288T7 14t.288-.712T8 13t.713.288T9 14t-.288.713T8 15m4 0q-.425 0-.712-.288T11 14t.288-.712T12 13t.713.288T13 14t-.288.713T12 15m4 0q-.425 0-.712-.288T15 14t.288-.712T16 13t.713.288T17 14t-.288.713T16 15"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M4 21v-9.375L2.2 13L1 11.4L12 3l11 8.4l-1.2 1.575l-1.8-1.35V21zm4-6q-.425 0-.712-.288T7 14t.288-.712T8 13t.713.288T9 14t-.288.713T8 15m4 0q-.425 0-.712-.288T11 14t.288-.712T12 13t.713.288T13 14t-.288.713T12 15m4 0q-.425 0-.712-.288T15 14t.288-.712T16 13t.713.288T17 14t-.288.713T16 15"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/keyboard.svg b/wlx-overlay-s/src/assets/watch/keyboard.svg
index fb614bf..469a0db 100644
--- a/wlx-overlay-s/src/assets/watch/keyboard.svg
+++ b/wlx-overlay-s/src/assets/watch/keyboard.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M4 19q-.825 0-1.412-.587T2 17V7q0-.825.588-1.412T4 5h16q.825 0 1.413.588T22 7v10q0 .825-.587 1.413T20 19zm4-3h8v-2H8zm-3-3h2v-2H5zm3 0h2v-2H8zm3 0h2v-2h-2zm3 0h2v-2h-2zm3 0h2v-2h-2zM5 10h2V8H5zm3 0h2V8H8zm3 0h2V8h-2zm3 0h2V8h-2zm3 0h2V8h-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M4 19q-.825 0-1.412-.587T2 17V7q0-.825.588-1.412T4 5h16q.825 0 1.413.588T22 7v10q0 .825-.587 1.413T20 19zm4-3h8v-2H8zm-3-3h2v-2H5zm3 0h2v-2H8zm3 0h2v-2h-2zm3 0h2v-2h-2zm3 0h2v-2h-2zM5 10h2V8H5zm3 0h2V8H8zm3 0h2V8h-2zm3 0h2V8h-2zm3 0h2V8h-2z"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/mirror-off.svg b/wlx-overlay-s/src/assets/watch/mirror-off.svg
index 19ea5f0..1403352 100644
--- a/wlx-overlay-s/src/assets/watch/mirror-off.svg
+++ b/wlx-overlay-s/src/assets/watch/mirror-off.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m20.45 23.3l-3.3-3.3H3.4l6.875-6.875l-1.4-1.4L2 18.6v-4.175l4.775-4.8l-1.4-1.4L2 11.6V6q0-.25.1-.438t.25-.362L.65 3.5l1.425-1.425l19.8 19.8L20.45 23.3ZM22 19.15l-8.875-8.875L19.4 4h.6q.825 0 1.413.588T22 6v13.15ZM11.725 8.875l-2.1-2.1L12.4 4h4.175l-4.85 4.875Zm-3.5-3.5L6.85 4H9.6L8.225 5.375Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m20.45 23.3l-3.3-3.3H3.4l6.875-6.875l-1.4-1.4L2 18.6v-4.175l4.775-4.8l-1.4-1.4L2 11.6V6q0-.25.1-.438t.25-.362L.65 3.5l1.425-1.425l19.8 19.8L20.45 23.3ZM22 19.15l-8.875-8.875L19.4 4h.6q.825 0 1.413.588T22 6v13.15ZM11.725 8.875l-2.1-2.1L12.4 4h4.175l-4.85 4.875Zm-3.5-3.5L6.85 4H9.6L8.225 5.375Z"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/recenter.svg b/wlx-overlay-s/src/assets/watch/recenter.svg
index c17ecef..a831e76 100644
--- a/wlx-overlay-s/src/assets/watch/recenter.svg
+++ b/wlx-overlay-s/src/assets/watch/recenter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M11 23v-4.175L9.9 19.9l-1.4-1.4L12 15l3.5 3.5l-1.4 1.4l-1.1-1.075V23zm-5.5-7.5l-1.4-1.4L5.175 13H1v-2h4.175L4.1 9.9l1.4-1.4L9 12zm13 0L15 12l3.5-3.5l1.4 1.4l-1.075 1.1H23v2h-4.175l1.075 1.1zm-6.5-2q-.625 0-1.062-.437T10.5 12t.438-1.062T12 10.5t1.063.438T13.5 12t-.437 1.063T12 13.5M12 9L8.5 5.5l1.4-1.4L11 5.175V1h2v4.175L14.1 4.1l1.4 1.4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M11 23v-4.175L9.9 19.9l-1.4-1.4L12 15l3.5 3.5l-1.4 1.4l-1.1-1.075V23zm-5.5-7.5l-1.4-1.4L5.175 13H1v-2h4.175L4.1 9.9l1.4-1.4L9 12zm13 0L15 12l3.5-3.5l1.4 1.4l-1.075 1.1H23v2h-4.175l1.075 1.1zm-6.5-2q-.625 0-1.062-.437T10.5 12t.438-1.062T12 10.5t1.063.438T13.5 12t-.437 1.063T12 13.5M12 9L8.5 5.5l1.4-1.4L11 5.175V1h2v4.175L14.1 4.1l1.4 1.4z"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/restart.svg b/wlx-overlay-s/src/assets/watch/restart.svg
index 316abdf..2b74157 100644
--- a/wlx-overlay-s/src/assets/watch/restart.svg
+++ b/wlx-overlay-s/src/assets/watch/restart.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M12 21q-3.15 0-5.575-1.912T3.275 14.2q-.1-.375.15-.687t.675-.363q.4-.05.725.15t.45.6q.6 2.25 2.475 3.675T12 19q2.925 0 4.963-2.037T19 12t-2.037-4.962T12 5q-1.725 0-3.225.8T6.25 8H8q.425 0 .713.288T9 9t-.288.713T8 10H4q-.425 0-.712-.288T3 9V5q0-.425.288-.712T4 4t.713.288T5 5v1.35q1.275-1.6 3.113-2.475T12 3q1.875 0 3.513.713t2.85 1.924t1.925 2.85T21 12t-.712 3.513t-1.925 2.85t-2.85 1.925T12 21m0-7q-.825 0-1.412-.587T10 12t.588-1.412T12 10t1.413.588T14 12t-.587 1.413T12 14"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M12 21q-3.15 0-5.575-1.912T3.275 14.2q-.1-.375.15-.687t.675-.363q.4-.05.725.15t.45.6q.6 2.25 2.475 3.675T12 19q2.925 0 4.963-2.037T19 12t-2.037-4.962T12 5q-1.725 0-3.225.8T6.25 8H8q.425 0 .713.288T9 9t-.288.713T8 10H4q-.425 0-.712-.288T3 9V5q0-.425.288-.712T4 4t.713.288T5 5v1.35q1.275-1.6 3.113-2.475T12 3q1.875 0 3.513.713t2.85 1.924t1.925 2.85T21 12t-.712 3.513t-1.925 2.85t-2.85 1.925T12 21m0-7q-.825 0-1.412-.587T10 12t.588-1.412T12 10t1.413.588T14 12t-.587 1.413T12 14"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/set2.svg b/wlx-overlay-s/src/assets/watch/set2.svg
index 487afb8..51e6e09 100644
--- a/wlx-overlay-s/src/assets/watch/set2.svg
+++ b/wlx-overlay-s/src/assets/watch/set2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M20 15v-5q0-1.25-.875-2.125T17 7H6V4q0-.825.588-1.412T8 2h12q.825 0 1.413.588T22 4v9q0 .825-.587 1.413T20 15M4 22q-.825 0-1.412-.587T2 20v-9q0-.825.588-1.412T4 9h12q.825 0 1.413.588T18 11v9q0 .825-.587 1.413T16 22z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M20 15v-5q0-1.25-.875-2.125T17 7H6V4q0-.825.588-1.412T8 2h12q.825 0 1.413.588T22 4v9q0 .825-.587 1.413T20 15M4 22q-.825 0-1.412-.587T2 20v-9q0-.825.588-1.412T4 9h12q.825 0 1.413.588T18 11v9q0 .825-.587 1.413T16 22z"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/settings.svg b/wlx-overlay-s/src/assets/watch/settings.svg
index 9412260..f3817d5 100644
--- a/wlx-overlay-s/src/assets/watch/settings.svg
+++ b/wlx-overlay-s/src/assets/watch/settings.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="m9.25 22l-.4-3.2q-.325-.125-.612-.3t-.563-.375L4.7 19.375l-2.75-4.75l2.575-1.95Q4.5 12.5 4.5 12.338v-.675q0-.163.025-.338L1.95 9.375l2.75-4.75l2.975 1.25q.275-.2.575-.375t.6-.3l.4-3.2h5.5l.4 3.2q.325.125.613.3t.562.375l2.975-1.25l2.75 4.75l-2.575 1.95q.025.175.025.338v.674q0 .163-.05.338l2.575 1.95l-2.75 4.75l-2.95-1.25q-.275.2-.575.375t-.6.3l-.4 3.2zm2.8-6.5q1.45 0 2.475-1.025T15.55 12t-1.025-2.475T12.05 8.5q-1.475 0-2.488 1.025T8.55 12t1.013 2.475T12.05 15.5"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="m9.25 22l-.4-3.2q-.325-.125-.612-.3t-.563-.375L4.7 19.375l-2.75-4.75l2.575-1.95Q4.5 12.5 4.5 12.338v-.675q0-.163.025-.338L1.95 9.375l2.75-4.75l2.975 1.25q.275-.2.575-.375t.6-.3l.4-3.2h5.5l.4 3.2q.325.125.613.3t.562.375l2.975-1.25l2.75 4.75l-2.575 1.95q.025.175.025.338v.674q0 .163-.05.338l2.575 1.95l-2.75 4.75l-2.95-1.25q-.275.2-.575.375t-.6.3l-.4 3.2zm2.8-6.5q1.45 0 2.475-1.025T15.55 12t-1.025-2.475T12.05 8.5q-1.475 0-2.488 1.025T8.55 12t1.013 2.475T12.05 15.5"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/track.svg b/wlx-overlay-s/src/assets/watch/track.svg
index 508603f..694de86 100644
--- a/wlx-overlay-s/src/assets/watch/track.svg
+++ b/wlx-overlay-s/src/assets/watch/track.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M11 23v-2q-3.125-.35-5.363-2.588T3.05 13.05h-2v-2h2q.35-3.125 2.588-5.363T11 3.1v-2h2v2q3.125.35 5.363 2.588t2.587 5.362h2v2h-2q-.35 3.125-2.587 5.363T13 21v2zm1-3.95q2.9 0 4.95-2.05T19 12.05T16.95 7.1T12 5.05T7.05 7.1T5 12.05T7.05 17T12 19.05"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M11 23v-2q-3.125-.35-5.363-2.588T3.05 13.05h-2v-2h2q.35-3.125 2.588-5.363T11 3.1v-2h2v2q3.125.35 5.363 2.588t2.587 5.362h2v2h-2q-.35 3.125-2.587 5.363T13 21v2zm1-3.95q2.9 0 4.95-2.05T19 12.05T16.95 7.1T12 5.05T7.05 7.1T5 12.05T7.05 17T12 19.05"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/track2.svg b/wlx-overlay-s/src/assets/watch/track2.svg
index 2f10406..12c4c7e 100644
--- a/wlx-overlay-s/src/assets/watch/track2.svg
+++ b/wlx-overlay-s/src/assets/watch/track2.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M11 22.95v-2q-3.125-.35-5.363-2.587T3.05 13h-2v-2h2q.35-3.125 2.588-5.363T11 3.05v-2h2v2q3.125.35 5.363 2.588T20.95 11h2v2h-2q-.35 3.125-2.587 5.363T13 20.95v2zM12 19q2.9 0 4.95-2.05T19 12t-2.05-4.95T12 5T7.05 7.05T5 12t2.05 4.95T12 19m0-3q-1.65 0-2.825-1.175T8 12t1.175-2.825T12 8t2.825 1.175T16 12t-1.175 2.825T12 16"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M11 22.95v-2q-3.125-.35-5.363-2.587T3.05 13h-2v-2h2q.35-3.125 2.588-5.363T11 3.05v-2h2v2q3.125.35 5.363 2.588T20.95 11h2v2h-2q-.35 3.125-2.587 5.363T13 20.95v2zM12 19q2.9 0 4.95-2.05T19 12t-2.05-4.95T12 5T7.05 7.05T5 12t2.05 4.95T12 19m0-3q-1.65 0-2.825-1.175T8 12t1.175-2.825T12 8t2.825 1.175T16 12t-1.175 2.825T12 16"/></svg>
diff --git a/wlx-overlay-s/src/assets/watch/track3.svg b/wlx-overlay-s/src/assets/watch/track3.svg
index 3e1b821..3d3cfd0 100644
--- a/wlx-overlay-s/src/assets/watch/track3.svg
+++ b/wlx-overlay-s/src/assets/watch/track3.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="white" d="M8 19q-2.925 0-4.962-2.037T1 12t2.038-4.962T8 5h8q2.925 0 4.963 2.038T23 12t-2.037 4.963T16 19zm.75-7.75q0 1.525 1.025 2.663T12 16q1.2-.95 2.225-2.087t1.025-2.663q0-1.35-.95-2.3T12 8t-2.3.95t-.95 2.3M12 12q-.425 0-.712-.288T11 11t.288-.712T12 10t.713.288T13 11t-.288.713T12 12"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><!-- Icon from Material Symbols by Google - https://github.com/google/material-design-icons/blob/master/LICENSE --><path fill="currentColor" d="M8 19q-2.925 0-4.962-2.037T1 12t2.038-4.962T8 5h8q2.925 0 4.963 2.038T23 12t-2.037 4.963T16 19zm.75-7.75q0 1.525 1.025 2.663T12 16q1.2-.95 2.225-2.087t1.025-2.663q0-1.35-.95-2.3T12 8t-2.3.95t-.95 2.3M12 12q-.425 0-.712-.288T11 11t.288-.712T12 10t.713.288T13 11t-.288.713T12 12"/></svg>