diff --git a/res/layout-grid.svg b/res/layout-grid.svg
new file mode 100644
index 0000000..a129fd6
--- /dev/null
+++ b/res/layout-grid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" class="icon icon-tabler icons-tabler-filled icon-tabler-layout-grid"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M9 3a2 2 0 0 1 2 2v4a2 2 0 0 1 -2 2h-4a2 2 0 0 1 -2 -2v-4a2 2 0 0 1 2 -2z" /><path d="M19 3a2 2 0 0 1 2 2v4a2 2 0 0 1 -2 2h-4a2 2 0 0 1 -2 -2v-4a2 2 0 0 1 2 -2z" /><path d="M9 13a2 2 0 0 1 2 2v4a2 2 0 0 1 -2 2h-4a2 2 0 0 1 -2 -2v-4a2 2 0 0 1 2 -2z" /><path d="M19 13a2 2 0 0 1 2 2v4a2 2 0 0 1 -2 2h-4a2 2 0 0 1 -2 -2v-4a2 2 0 0 1 2 -2z" /></svg>
\ No newline at end of file
diff --git a/res/plus.svg b/res/plus.svg
new file mode 100644
index 0000000..3346f8c
--- /dev/null
+++ b/res/plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-plus"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M12 5l0 14" /><path d="M5 12l14 0" /></svg>
\ No newline at end of file
diff --git a/res/x.svg b/res/x.svg
new file mode 100644
index 0000000..299b36d
--- /dev/null
+++ b/res/x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-x"><path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M18 6l-12 12" /><path d="M6 6l12 12" /></svg>
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index ec9ead3..eef9eeb 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -693,7 +693,7 @@ impl cosmic::Application for App {
                             column![title, subtitle].spacing(space_xxs),
                             horizontal(),
                             tooltip(
-                                icon::from_name("add")
+                                icon::from_path("./res/plus.svg".into())
                                     .symbolic(true)
                                     .apply(button::icon)
                                     .icon_size(space_l)
@@ -1826,7 +1826,9 @@ impl cosmic::Application for App {
         let presenter_tool_bar = if self.editor_mode.is_none() {
             let grid_button = button::standard("Grid")
                 .on_press(Message::ViewModeSwitch(ViewMode::Grid))
-                .leading_icon(icon::from_name("show-grid").symbolic(true).size(space_xl))
+                .leading_icon(
+                    icon::from_path("./res/layout-grid.svg".into()).symbolic(true),
+                )
                 .height(space_xl)
                 .class(if self.view_mode == ViewMode::Grid {
                     theme::Button::Standard
diff --git a/src/ui/library.rs b/src/ui/library.rs
index 5d2e71c..36fcd24 100644
--- a/src/ui/library.rs
+++ b/src/ui/library.rs
@@ -759,8 +759,10 @@ impl<'a> Library {
 
             let library_toolbar = rowm!(
                 text_input("Search...", ""),
-                button::icon(icon::from_name("add")).on_press(Message::AddItem)
-            );
+                button::icon(icon::from_path("./res/plus.svg".into()).symbolic(true))
+                    .on_press(Message::AddItem)
+            )
+            .align_y(Vertical::Center);
             let context_menu = self.context_menu(items.into());
             let library_column = column![library_toolbar, context_menu].spacing(3);
             Container::new(library_column).padding(5)
@@ -822,12 +824,13 @@ impl<'a> Library {
 
         let texts = column([text.into(), subtext.into()]);
 
-        let add_button = button::icon(icon::from_name("arrow-right"))
-            .on_press(Message::ToService((
-                model.kind,
-                index.try_into().expect("Shouldn't have issues"),
-            )))
-            .tooltip("Add to service");
+        let add_button =
+            button::icon(icon::from_path("./res/caret-right.svg".into()).symbolic(true))
+                .on_press(Message::ToService((
+                    model.kind,
+                    index.try_into().expect("Shouldn't have issues"),
+                )))
+                .tooltip("Add to service");
 
         Container::new(
             rowm![horizontal().width(0), texts, add_button]
diff --git a/src/ui/widgets/verse_editor.rs b/src/ui/widgets/verse_editor.rs
index 36e95a5..5969ce1 100644
--- a/src/ui/widgets/verse_editor.rs
+++ b/src/ui/widgets/verse_editor.rs
@@ -87,7 +87,7 @@ impl VerseEditor {
         } = theme::spacing();
 
         let delete_button = button::text("Delete")
-            .trailing_icon(icon::from_name("view-close").symbolic(true))
+            .trailing_icon(icon::from_path("./res/x.svg".into()).symbolic(true))
             .class(theme::Button::Destructive)
             .on_press(Message::DeleteVerse(self.verse_name));
         let combo = combo_box(