diff --git a/res/icons/list-add-symbolic.svg b/res/icons/list-add-symbolic.svg
new file mode 100644
index 00000000..59b2fb03
--- /dev/null
+++ b/res/icons/list-add-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 3C7.73478 3 7.48043 3.10536 7.29289 3.29289C7.10536 3.48043 7 3.73478 7 4V6.996L4 7C3.73478 7 3.48043 7.10536 3.29289 7.29289C3.10536 7.48043 3 7.73478 3 8C3 8.26522 3.10536 8.51957 3.29289 8.70711C3.48043 8.89464 3.73478 9 4 9L7 8.996V12C7 12.2652 7.10536 12.5196 7.29289 12.7071C7.48043 12.8946 7.73478 13 8 13C8.26522 13 8.51957 12.8946 8.70711 12.7071C8.89464 12.5196 9 12.2652 9 12V8.996L12 9C12.2652 9 12.5196 8.89464 12.7071 8.70711C12.8946 8.51957 13 8.26522 13 8C13 7.73478 12.8946 7.48043 12.7071 7.29289C12.5196 7.10536 12.2652 7 12 7L9 6.996V4C9 3.73478 8.89464 3.48043 8.70711 3.29289C8.51957 3.10536 8.26522 3 8 3Z" fill="#232323"/>
+</svg>
diff --git a/res/icons/list-remove-symbolic.svg b/res/icons/list-remove-symbolic.svg
new file mode 100644
index 00000000..5b9ded7c
--- /dev/null
+++ b/res/icons/list-remove-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 7C3.73478 7 3.48043 7.10536 3.29289 7.29289C3.10536 7.48043 3 7.73478 3 8C3 8.26522 3.10536 8.51957 3.29289 8.70711C3.48043 8.89464 3.73478 9 4 9H12C12.2652 9 12.5196 8.89464 12.7071 8.70711C12.8946 8.51957 13 8.26522 13 8C13 7.73478 12.8946 7.48043 12.7071 7.29289C12.5196 7.10536 12.2652 7 12 7H4Z" fill="#232323"/>
+</svg>
diff --git a/src/widget/spin_button.rs b/src/widget/spin_button.rs
index 1a2f3e0f..6edfac59 100644
--- a/src/widget/spin_button.rs
+++ b/src/widget/spin_button.rs
@@ -155,23 +155,26 @@ where
     Message: Clone + 'static,
     T: Copy + Sub<Output = T> + Add<Output = T> + PartialOrd,
 {
-    let decrement_button = icon::from_name("list-remove-symbolic")
-        .apply(button::icon)
-        .on_press((spin_button.on_press)(decrement::<T>(
+    let make_button = | icon, operation: fn(T,T,T,T)->T | {
+        #[cfg(target_os = "linux")]
+        let button = icon::from_name(icon);
+        
+        #[cfg(not(target_os = "linux"))]
+        let button = icon::from_svg_bytes(
+            include_bytes!(concat!["../../res/icons/", icon ,".svg"])
+        ).symbolic(true);
+        
+        button.apply(button::icon)
+            .on_press((spin_button.on_press)(operation(
             spin_button.value,
             spin_button.step,
             spin_button.min,
             spin_button.max,
-        )));
+        )))
+    };
 
-    let increment_button = icon::from_name("list-add-symbolic")
-        .apply(button::icon)
-        .on_press((spin_button.on_press)(increment::<T>(
-            spin_button.value,
-            spin_button.step,
-            spin_button.min,
-            spin_button.max,
-        )));
+    let decrement_button = make_button("list-remove-symbolic", decrement);
+    let increment_button = make_button("list-add-symbolic", increment);
 
     let label = text::title4(spin_button.label)
         .apply(container)
@@ -193,23 +196,26 @@ where
     Message: Clone + 'static,
     T: Copy + Sub<Output = T> + Add<Output = T> + PartialOrd,
 {
-    let decrement_button = icon::from_name("list-remove-symbolic")
-        .apply(button::icon)
-        .on_press((spin_button.on_press)(decrement::<T>(
-            spin_button.value,
-            spin_button.step,
-            spin_button.min,
-            spin_button.max,
-        )));
+    let make_button = | icon, operation: fn(T,T,T,T)->T | {
+        #[cfg(target_os = "linux")]
+        let button = icon::from_name(icon);
 
-    let increment_button = icon::from_name("list-add-symbolic")
-        .apply(button::icon)
-        .on_press((spin_button.on_press)(increment::<T>(
-            spin_button.value,
-            spin_button.step,
-            spin_button.min,
-            spin_button.max,
-        )));
+        #[cfg(not(target_os = "linux"))]
+        let button = icon::from_svg_bytes(
+            include_bytes!(concat!["../../res/icons/", icon ,".svg"])
+        ).symbolic(true);
+
+        button.apply(button::icon)
+            .on_press((spin_button.on_press)(operation(
+                spin_button.value,
+                spin_button.step,
+                spin_button.min,
+                spin_button.max,
+            )))
+    };
+
+    let decrement_button = make_button("list-remove-symbolic", decrement);
+    let increment_button = make_button("list-add-symbolic", increment);
 
     let label = text::title4(spin_button.label)
         .apply(container)
diff --git a/src/widget/warning.rs b/src/widget/warning.rs
index 942ffb8b..92fa7178 100644
--- a/src/widget/warning.rs
+++ b/src/widget/warning.rs
@@ -33,11 +33,21 @@ impl<'a, Message: 'static + Clone> Warning<'a, Message> {
     pub fn into_widget(self) -> widget::Container<'a, Message, crate::Theme, Renderer> {
         let label = widget::container(crate::widget::text(self.message)).width(Length::Fill);
 
+        #[cfg(target_os = "linux")]
         let close_button = icon::from_name("window-close-symbolic")
             .size(16)
             .apply(widget::button::icon)
             .on_press_maybe(self.on_close);
 
+        #[cfg(not(target_os = "linux"))]
+        let close_button = icon::from_svg_bytes(
+            include_bytes!("../../res/icons/window-close-symbolic.svg")
+        )
+            .symbolic(true)
+            .apply(widget::button::icon)
+            .icon_size(16)
+            .on_press_maybe(self.on_close);
+
         widget::row::with_capacity(2)
             .push(label)
             .push(close_button)