diff --git a/hammond-gtk/resources/icons/src/skip-back-symbolic.svg b/hammond-gtk/resources/icons/src/skip-back-symbolic.svg
index 32cbad7..dc560f0 100644
--- a/hammond-gtk/resources/icons/src/skip-back-symbolic.svg
+++ b/hammond-gtk/resources/icons/src/skip-back-symbolic.svg
@@ -26,7 +26,7 @@
      inkscape:window-width="1920"
      inkscape:window-height="1016"
      id="namedview16"
-     showgrid="false"
+     showgrid="true"
      inkscape:snap-smooth-nodes="true"
      inkscape:snap-midpoints="true"
      inkscape:object-paths="true"
@@ -36,12 +36,16 @@
      inkscape:snap-text-baseline="true"
      inkscape:snap-page="true"
      inkscape:zoom="14.75"
-     inkscape:cx="17.084746"
-     inkscape:cy="16"
+     inkscape:cx="-5.302011"
+     inkscape:cy="11.053898"
      inkscape:window-x="1920"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg7384" />
+     inkscape:current-layer="g1104">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837" />
+  </sodipodi:namedview>
   <metadata
      id="metadata90">
     <rdf:RDF>
@@ -68,41 +72,28 @@
     </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>
+     id="g1104"
+     transform="translate(-285.00026,-511.51971)">
     <path
-       sodipodi:nodetypes="cccscccccccc"
+       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:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       d="m 293.25027,512.51971 c -0.13304,0.006 -0.26338,0.0444 -0.375,0.11719 l -3.75,2.25 c -0.2118,0.13478 -0.32813,0.3838 -0.32813,0.63281 0,0.24901 0.11633,0.49803 0.32813,0.63281 l 3.75,2.25 c 0.11162,0.0728 0.24196,0.11119 0.375,0.11719 h 0.11719 0.6328 v -6 h -0.6328 z"
+       id="path1096-6-3"
        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" />
+       sodipodi:nodetypes="cccscccccccc" />
     <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" />
+       id="path1098-7"
+       d="m 294.00002,514.51953 c 2.61534,0 4.93816,1.703 5.72461,4.19727 0.78645,2.49427 -0.14084,5.22062 -2.2832,6.7207 a 1.0000999,1.0000999 0 1 1 -1.14649,-1.63867 c 1.43403,-1.00411 2.04791,-2.8109 1.52149,-4.48047 -0.52643,-1.66957 -2.06577,-2.79883 -3.81641,-2.79883 a 1.0000999,1.0000999 0 1 1 0,-2 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:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;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" />
+    <path
+       d="m 285.51611,526.51971 h 3.72666 v -1.28266 h -1.066 v -4.732 h -0.89266 l -2.07134,1.196 0.56334,1.07466 0.90133,-0.468 v 2.92934 h -1.16133 z"
+       style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:8.66666698px;line-height:1.25;font-family:Cantarell;-inkscape-font-specification:'Cantarell Ultra-Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.99999976"
+       id="path844"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 292.11307,526.60638 c 1.52533,0 2.55666,-1.248 2.55666,-3.12867 0,-1.83733 -1.014,-3.05933 -2.51333,-3.05933 -1.534,0 -2.56533,1.248 -2.56533,3.12 0,1.83733 1.014,3.068 2.522,3.068 z m 0.0347,-1.28267 c -0.61533,0 -1.014,-0.73666 -1.014,-1.83733 0,-1.07467 0.39867,-1.78533 0.988,-1.78533 0.598,0 1.00534,0.73666 1.00534,1.846 0,1.066 -0.39867,1.77666 -0.97934,1.77666 z"
+       style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:8.66666698px;line-height:1.25;font-family:Cantarell;-inkscape-font-specification:'Cantarell Ultra-Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.99999976"
+       id="path846"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/hammond-gtk/resources/icons/src/skip-forward-symbolic.svg b/hammond-gtk/resources/icons/src/skip-forward-symbolic.svg
index 8b4d556..956b23a 100644
--- a/hammond-gtk/resources/icons/src/skip-forward-symbolic.svg
+++ b/hammond-gtk/resources/icons/src/skip-forward-symbolic.svg
@@ -26,7 +26,7 @@
      inkscape:window-width="1920"
      inkscape:window-height="1016"
      id="namedview16"
-     showgrid="false"
+     showgrid="true"
      inkscape:snap-smooth-nodes="true"
      inkscape:snap-midpoints="true"
      inkscape:object-paths="true"
@@ -35,13 +35,17 @@
      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:zoom="20.85965"
+     inkscape:cx="12.060999"
+     inkscape:cy="12.860546"
      inkscape:window-x="1920"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg7384" />
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid835" />
+  </sodipodi:namedview>
   <metadata
      id="metadata90">
     <rdf:RDF>
@@ -67,43 +71,25 @@
          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>
+  <path
+     inkscape:connector-curvature="0"
+     id="path849"
+     style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:8.66666698px;line-height:1.25;font-family:Cantarell;-inkscape-font-specification:'Cantarell Ultra-Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.99999976"
+     d="m 6.515284,15.000003 h 3.726667 V 13.717336 H 9.1759508 v -4.732 H 8.2832841 l -2.0713334,1.196 0.5633333,1.074667 0.9013334,-0.468 v 2.929333 H 6.515284 Z" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path851"
+     style="font-style:normal;font-variant:normal;font-weight:800;font-stretch:normal;font-size:8.66666698px;line-height:1.25;font-family:Cantarell;-inkscape-font-specification:'Cantarell Ultra-Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:0.99999976"
+     d="m 13.112242,15.08667 c 1.525334,0 2.556667,-1.248001 2.556667,-3.128667 0,-1.837334 -1.014,-3.0593337 -2.513333,-3.0593337 -1.534,0 -2.565334,1.2479997 -2.565334,3.1199997 0,1.837334 1.014,3.068001 2.522,3.068001 z m 0.03467,-1.282667 c -0.615333,0 -1.014,-0.736667 -1.014,-1.837334 0,-1.074666 0.398667,-1.785333 0.988,-1.785333 0.598,0 1.005333,0.736667 1.005333,1.846 0,1.066 -0.398666,1.776667 -0.979333,1.776667 z" />
+  <path
+     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:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+     d="m 7.74999,1 c 0.13304,0.006 0.26338,0.0444 0.375,0.11719 l 3.749999,2.2499999 c 0.2118,0.13478 0.32813,0.3838 0.32813,0.63281 0,0.24901 -0.11633,0.49803 -0.32813,0.63281 L 8.12499,6.8828096 c -0.11162,0.0728 -0.24196,0.11119 -0.375,0.11719 H 7.6328 7 V 1 h 0.6328 z"
+     id="path946"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccscccccccc" />
+  <path
+     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:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.99999988;stroke-linecap:round;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"
+     d="m 7,3 c -2.615338,-10e-8 -4.9362036,1.702994 -5.7226562,4.1972656 -0.78645273,2.4942717 0.1388853,5.2206254 2.28125,6.7207034 A 1.0000999,1.0000999 0 1 0 4.7050781,12.279297 C 3.2710452,11.275191 2.6571722,9.4683988 3.1835938,7.7988281 3.7100153,6.1292575 5.2493627,5 7,5 A 1.0000999,1.0000999 0 1 0 7,3 Z"
+     id="path948"
+     inkscape:connector-curvature="0" />
 </svg>