diff --git a/gui/icons/README b/gui/icons/README
index 3fe8c0d..a52a0a0 100644
--- a/gui/icons/README
+++ b/gui/icons/README
@@ -1 +1,3 @@
-These icons were shamelessly taken from nemiver and Gnome.
+Some of these icons were shamelessly taken from nemiver and Gnome.
+
+Others come from Feather Icons: https://feathericons.com/
diff --git a/gui/icons/arrow-down.svg b/gui/icons/arrow-down.svg
new file mode 100644
index 0000000..80ad254
--- /dev/null
+++ b/gui/icons/arrow-down.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="feather feather-arrow-down"><line x1="12" y1="4" x2="12" y2="20"></line><polyline points="18 14 12 20 6 14"></polyline></svg>
\ No newline at end of file
diff --git a/gui/icons/arrow-right.svg b/gui/icons/arrow-right.svg
new file mode 100644
index 0000000..ea99d54
--- /dev/null
+++ b/gui/icons/arrow-right.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="feather feather-arrow-right"><line x1="4" y1="12" x2="20" y2="12"></line><polyline points="14 6 20 12 14 18"></polyline></svg>
\ No newline at end of file
diff --git a/gui/icons/arrow-up.svg b/gui/icons/arrow-up.svg
new file mode 100644
index 0000000..ac6cba5
--- /dev/null
+++ b/gui/icons/arrow-up.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="feather feather-arrow-up"><line x1="12" y1="20" x2="12" y2="4"></line><polyline points="6 10 12 4 18 10"></polyline></svg>
\ No newline at end of file
diff --git a/gui/icons/corner-right-down.svg b/gui/icons/corner-right-down.svg
new file mode 100644
index 0000000..a49e6d6
--- /dev/null
+++ b/gui/icons/corner-right-down.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="feather feather-corner-right-down"><polyline points="10 15 15 20 20 15"></polyline><path d="M4 4h7a4 4 0 0 1 4 4v12"></path></svg>
\ No newline at end of file
diff --git a/gui/icons/corner-right-up.svg b/gui/icons/corner-right-up.svg
new file mode 100644
index 0000000..a5c5dce
--- /dev/null
+++ b/gui/icons/corner-right-up.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="feather feather-corner-right-up"><polyline points="10 9 15 4 20 9"></polyline><path d="M4 20h7a4 4 0 0 0 4-4V4"></path></svg>
\ No newline at end of file
diff --git a/gui/icons/fast-forward.svg b/gui/icons/fast-forward.svg
new file mode 100644
index 0000000..fa39877
--- /dev/null
+++ b/gui/icons/fast-forward.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="feather feather-fast-forward"><polygon points="13 19 22 12 13 5 13 19"></polygon><polygon points="2 19 11 12 2 5 2 19"></polygon></svg>
\ No newline at end of file
diff --git a/gui/icons/pause.svg b/gui/icons/pause.svg
new file mode 100644
index 0000000..4e78038
--- /dev/null
+++ b/gui/icons/pause.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="feather feather-pause"><rect x="6" y="4" width="4" height="16"></rect><rect x="14" y="4" width="4" height="16"></rect></svg>
\ No newline at end of file
diff --git a/gui/icons/step-into.xpm b/gui/icons/step-into.xpm
deleted file mode 100644
index e168c80..0000000
--- a/gui/icons/step-into.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * step_in_xpm[] = {
-"22 22 3 1",
-" 	c None",
-".	c #FF0000",
-"+	c #000000",
-"                      ",
-"                      ",
-"                      ",
-"                      ",
-"    .........         ",
-"    .........         ",
-"           ..         ",
-"        ++ .. ++      ",
-"       ++......++     ",
-"       ++ .... ++     ",
-"       ++  ..  ++     ",
-"      ++        ++    ",
-"     ++          ++   ",
-"      ++        ++    ",
-"       ++      ++     ",
-"       ++      ++     ",
-"       ++      ++     ",
-"        ++    ++      ",
-"                      ",
-"                      ",
-"                      ",
-"                      "};
diff --git a/gui/icons/step-out.xpm b/gui/icons/step-out.xpm
deleted file mode 100644
index 1f10cf6..0000000
--- a/gui/icons/step-out.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * step_out_xpm[] = {
-"22 22 3 1",
-" 	c None",
-".	c #FF0000",
-"+	c #000000",
-"                      ",
-"                      ",
-"                .     ",
-"                ..    ",
-"          .........   ",
-"          .........   ",
-"          ..    ..    ",
-"       ++ .. ++ .     ",
-"      ++  ..  ++      ",
-"      ++  ..  ++      ",
-"      ++  ..  ++      ",
-"     ++        ++     ",
-"    ++          ++    ",
-"     ++        ++     ",
-"      ++      ++      ",
-"      ++      ++      ",
-"      ++      ++      ",
-"       ++    ++       ",
-"                      ",
-"                      ",
-"                      ",
-"                      "};
diff --git a/gui/icons/step-over.xpm b/gui/icons/step-over.xpm
deleted file mode 100644
index 5b68cc5..0000000
--- a/gui/icons/step-over.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * step_over_xpm[] = {
-"22 22 3 1",
-" 	c None",
-".	c #FF0000",
-"+	c #000000",
-"                      ",
-"                      ",
-"                      ",
-"                .     ",
-"                ..    ",
-"   ................   ",
-"   ................   ",
-"                ..    ",
-"       ++    ++ .     ",
-"      ++      ++      ",
-"      ++      ++      ",
-"      ++      ++      ",
-"     ++        ++     ",
-"    ++          ++    ",
-"     ++        ++     ",
-"      ++      ++      ",
-"      ++      ++      ",
-"      ++      ++      ",
-"       ++    ++       ",
-"                      ",
-"                      ",
-"                      "};
diff --git a/gui/icons/throbber.gif b/gui/icons/throbber.gif
deleted file mode 100644
index 529e72f..0000000
Binary files a/gui/icons/throbber.gif and /dev/null differ
diff --git a/gui/sourcewindow.xml b/gui/sourcewindow.xml
index 2ea4c55..6037f81 100644
--- a/gui/sourcewindow.xml
+++ b/gui/sourcewindow.xml
@@ -6,17 +6,37 @@
   <object class="GtkImage" id="finish-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">icons/step-out.xpm</property>
+    <property name="pixbuf">icons/corner-right-up.svg</property>
   </object>
   <object class="GtkImage" id="next-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">icons/step-over.xpm</property>
+    <property name="pixbuf">icons/arrow-right.svg</property>
   </object>
   <object class="GtkImage" id="step-image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">icons/step-into.xpm</property>
+    <property name="pixbuf">icons/corner-right-down.svg</property>
+  </object>
+  <object class="GtkImage" id="up-image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">icons/arrow-up.svg</property>
+  </object>
+  <object class="GtkImage" id="down-image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">icons/arrow-down.svg</property>
+  </object>
+  <object class="GtkImage" id="pause-image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">icons/pause.svg</property>
+  </object>
+  <object class="GtkImage" id="play-image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">icons/fast-forward.svg</property>
   </object>
   <object class="GtkWindow" id="sourcewindow">
     <property name="can_focus">False</property>
@@ -40,7 +60,7 @@
                 <property name="tooltip_text" translatable="yes">Continue execution</property>
                 <property name="label" translatable="yes">Continue</property>
                 <property name="use_underline">True</property>
-                <property name="icon_name">media-playback-start</property>
+                <property name="icon_widget">play-image</property>
                 <signal name="clicked" handler="do_continue" swapped="no"/>
                 <accelerator key="c" signal="clicked"/>
               </object>
@@ -88,7 +108,7 @@
                 <property name="tooltip_text" translatable="yes">Interrupt the program</property>
                 <property name="label" translatable="yes">Stop</property>
                 <property name="use_underline">True</property>
-                <property name="icon_name">media-playback-pause</property>
+                <property name="icon_widget">pause-image</property>
                 <signal name="clicked" handler="do_stop" swapped="no"/>
                 <accelerator key="c" signal="clicked" modifiers="GDK_CONTROL_MASK"/>
               </object>
@@ -130,7 +150,7 @@
                 <property name="tooltip_text" translatable="yes">Down one frame</property>
                 <property name="label" translatable="yes">Down</property>
                 <property name="use_underline">True</property>
-                <property name="icon_name">go-down</property>
+                <property name="icon_widget">down-image</property>
                 <signal name="clicked" handler="do_down" swapped="no"/>
                 <accelerator key="d" signal="clicked"/>
               </object>
@@ -146,7 +166,7 @@
                 <property name="tooltip_text" translatable="yes">Up one frame</property>
                 <property name="label" translatable="yes">Up</property>
                 <property name="use_underline">True</property>
-                <property name="icon_name">go-up</property>
+                <property name="icon_widget">up-image</property>
                 <signal name="clicked" handler="do_up" swapped="no"/>
                 <accelerator key="u" signal="clicked"/>
               </object>