diff --git a/hammond-gtk/resources/gtk/player_toolbar.ui b/hammond-gtk/resources/gtk/player_toolbar.ui
index 653f976..5aa9457 100644
--- a/hammond-gtk/resources/gtk/player_toolbar.ui
+++ b/hammond-gtk/resources/gtk/player_toolbar.ui
@@ -2,14 +2,6 @@
 <!-- Generated with glade 3.22.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkImage" id="ff_image">
-    <property name="visible">True</property>
-    <property name="sensitive">False</property>
-    <property name="can_focus">False</property>
-    <property name="margin_top">1</property>
-    <property name="icon_name">media-seek-forward-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkImage" id="pause_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -24,13 +16,6 @@
     <property name="icon_name">media-playback-start-symbolic</property>
     <property name="icon_size">1</property>
   </object>
-  <object class="GtkImage" id="previous_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="margin_top">1</property>
-    <property name="icon_name">media-seek-backward-symbolic</property>
-    <property name="icon_size">1</property>
-  </object>
   <object class="GtkActionBar" id="action_bar">
     <property name="can_focus">False</property>
     <property name="no_show_all">True</property>
@@ -47,8 +32,10 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="tooltip_text" translatable="yes">Previous</property>
-            <property name="image">previous_image</property>
             <property name="always_show_image">True</property>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -94,8 +81,10 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="tooltip_text" translatable="yes">Next</property>
-            <property name="image">ff_image</property>
             <property name="always_show_image">True</property>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/hammond-gtk/resources/icons/src/skip-back-symbolic.svg b/hammond-gtk/resources/icons/src/skip-back-symbolic.svg
new file mode 100644
index 0000000..32cbad7
--- /dev/null
+++ b/hammond-gtk/resources/icons/src/skip-back-symbolic.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   version="1.1"
+   id="svg7384"
+   height="16"
+   sodipodi:docname="skip-back-symbolic.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview16"
+     showgrid="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-page="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="17.084746"
+     inkscape:cy="16"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7212">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop7214" />
+    </linearGradient>
+  </defs>
+  <g
+     id="g872">
+    <rect
+       transform="scale(-1,1)"
+       style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.43700789"
+       id="rect2229"
+       width="16"
+       height="16"
+       x="-15.999758"
+       y="-2.8537272e-07" />
+    <g
+       style="display:inline"
+       transform="matrix(1,0,0,-1,-19.99975,312)"
+       inkscape:label="edit-redo"
+       id="g2235">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none"
+         id="rect2231"
+         width="16"
+         height="16"
+         x="19.99975"
+         y="296" />
+      <g
+         id="g2233"
+         style="opacity:0.25" />
+    </g>
+    <path
+       sodipodi:nodetypes="cccscccccccc"
+       inkscape:connector-curvature="0"
+       id="path2237"
+       d="M 7.2497404,2.0000013e-8 C 7.1167004,0.00600002 6.9863604,0.04440002 6.8747404,0.11718802 l -3.75,2.24999998 c -0.2118,0.134783 -0.32813,0.383797 -0.32813,0.632813 0,0.249014 0.11633,0.498029 0.32813,0.632812 l 3.75,2.25 C 6.9863604,5.955563 7.1167004,5.994 7.2497404,6 H 7.3669304 7.99973 V 2.0000013e-8 H 7.3669304 Z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path2239"
+       d="M 8.3671875,2.0097656 C 10.530533,2.1249698 12.572319,3.2435768 13.820312,5.1113281 15.484304,7.6016632 15.376039,10.885546 13.552734,13.261719 11.729429,15.637892 8.5861549,16.591649 5.75,15.628906 2.9138451,14.666163 1,11.995101 1,9 h 2 c 0,2.145788 1.3606612,4.044633 3.3925781,4.734375 2.0319169,0.689742 4.2679429,0.01096 5.5742189,-1.691406 C 13.273073,10.3406 13.348388,8.0068142 12.15625,6.2226562 10.964112,4.4384983 8.7777559,3.6145505 6.7050781,4.1699219 L 6.1875,2.2382812 C 6.9107622,2.0444841 7.6460722,1.9713642 8.3671875,2.0097656 Z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/hammond-gtk/resources/icons/src/skip-forward-symbolic.svg b/hammond-gtk/resources/icons/src/skip-forward-symbolic.svg
new file mode 100644
index 0000000..8b4d556
--- /dev/null
+++ b/hammond-gtk/resources/icons/src/skip-forward-symbolic.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   version="1.1"
+   id="svg7384"
+   height="16"
+   sodipodi:docname="skip-forward-symbolic.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview16"
+     showgrid="false"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-page="true"
+     inkscape:zoom="14.75"
+     inkscape:cx="17.084746"
+     inkscape:cy="16"
+     inkscape:window-x="1920"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       osb:paint="solid"
+       id="linearGradient7212">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop7214" />
+    </linearGradient>
+  </defs>
+  <g
+     id="g872"
+     transform="matrix(-1,0,0,1,15.999758,0)">
+    <rect
+       transform="scale(-1,1)"
+       style="display:inline;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.43700789"
+       id="rect2229"
+       width="16"
+       height="16"
+       x="-15.999758"
+       y="-2.8537272e-07" />
+    <g
+       style="display:inline"
+       transform="matrix(1,0,0,-1,-19.99975,312)"
+       inkscape:label="edit-redo"
+       id="g2235">
+      <rect
+         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none"
+         id="rect2231"
+         width="16"
+         height="16"
+         x="19.99975"
+         y="296" />
+      <g
+         id="g2233"
+         style="opacity:0.25" />
+    </g>
+    <path
+       sodipodi:nodetypes="cccscccccccc"
+       inkscape:connector-curvature="0"
+       id="path2237"
+       d="M 7.2497404,2.0000013e-8 C 7.1167004,0.00600002 6.9863604,0.04440002 6.8747404,0.11718802 l -3.75,2.24999998 c -0.2118,0.134783 -0.32813,0.383797 -0.32813,0.632813 0,0.249014 0.11633,0.498029 0.32813,0.632812 l 3.75,2.25 C 6.9863604,5.955563 7.1167004,5.994 7.2497404,6 H 7.3669304 7.99973 V 2.0000013e-8 H 7.3669304 Z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path2239"
+       d="M 8.3671875,2.0097656 C 10.530533,2.1249698 12.572319,3.2435768 13.820312,5.1113281 15.484304,7.6016632 15.376039,10.885546 13.552734,13.261719 11.729429,15.637892 8.5861549,16.591649 5.75,15.628906 2.9138451,14.666163 1,11.995101 1,9 h 2 c 0,2.145788 1.3606612,4.044633 3.3925781,4.734375 2.0319169,0.689742 4.2679429,0.01096 5.5742189,-1.691406 C 13.273073,10.3406 13.348388,8.0068142 12.15625,6.2226562 10.964112,4.4384983 8.7777559,3.6145505 6.7050781,4.1699219 L 6.1875,2.2382812 C 6.9107622,2.0444841 7.6460722,1.9713642 8.3671875,2.0097656 Z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  </g>
+</svg>
diff --git a/hammond-gtk/resources/resources.xml b/hammond-gtk/resources/resources.xml
index 57a377d..1af4443 100644
--- a/hammond-gtk/resources/resources.xml
+++ b/hammond-gtk/resources/resources.xml
@@ -15,6 +15,8 @@
       <file compressed="true" preprocess="xml-stripblanks">gtk/show_menu.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
       <file compressed="true" preprocess="xml-stripblanks">gtk/player_toolbar.ui</file>
+      <file compressed="true" preprocess="xml-stripblanks">icons/src/skip-back-symbolic.svg</file>
+      <file compressed="true" preprocess="xml-stripblanks">icons/src/skip-forward-symbolic.svg</file>
       <file compressed="true">gtk/style.css</file>
   </gresource>
 </gresources>
diff --git a/hammond-gtk/src/widgets/player.rs b/hammond-gtk/src/widgets/player.rs
index e8ca1a8..3a6dee1 100644
--- a/hammond-gtk/src/widgets/player.rs
+++ b/hammond-gtk/src/widgets/player.rs
@@ -185,8 +185,15 @@ impl Default for PlayerWidget {
         let buttons = builder.get_object("buttons").unwrap();
         let play = builder.get_object("play_button").unwrap();
         let pause = builder.get_object("pause_button").unwrap();
-        let forward = builder.get_object("ff_button").unwrap();
-        let rewind = builder.get_object("rewind_button").unwrap();
+        let forward: gtk::Button = builder.get_object("ff_button").unwrap();
+        let rewind: gtk::Button = builder.get_object("rewind_button").unwrap();
+
+        let img =
+            gtk::Image::new_from_resource("/org/gnome/Hammond/icons/src/skip-forward-symbolic.svg");
+        forward.set_image(&img);
+        let img =
+            gtk::Image::new_from_resource("/org/gnome/Hammond/icons/src/skip-back-symbolic.svg");
+        rewind.set_image(&img);
 
         let controls = PlayerControls {
             container: buttons,