diff --git a/src/pug/templates/control-view.pug b/src/pug/templates/control-view.pug
index 8eaad25..69d7747 100644
--- a/src/pug/templates/control-view.pug
+++ b/src/pug/templates/control-view.pug
@@ -63,13 +63,15 @@ script#control-view-template(type="text/x-template")
                 button(@click="jog_fn(-1,0,0,0)") X-
               td(style="height:100px",align="center")
                 button(@click="showMoveToZeroDialog('xy')")
-                  | XY 
+                  | XY
+                  br 
                   | Origin
               td(style="height:100px",align="center")
                 button(@click="jog_fn(1,0,0,0)") X+
               td(style="height:100px",align="center")
                 button(@click="showMoveToZeroDialog('z')") 
                   | Z
+                  br
                   | Origin
             tr
               td(style="height:100px",align="center")
@@ -271,7 +273,7 @@ script#control-view-template(type="text/x-template")
             .fa(:class="is_running ? 'fa-pause' : 'fa-play'")
 
           button.pure-button(title="Stop program.", @click="stop", style="height:100px;width:100px;font-weight:normal")
-            img(src="resources/icons/icon.webp", alt="Icon")
+            img(src="images/stop.png")
 
           button.pure-button(title="Pause program at next optional stop (M1).",
             @click="optional_pause", v-if="false", style="height:100px;width:100px;font-weight:normal")
diff --git a/src/resources/icons/button_delete.webp b/src/resources/icons/button_delete.webp
deleted file mode 100644
index 21a1ee5..0000000
Binary files a/src/resources/icons/button_delete.webp and /dev/null differ
diff --git a/src/resources/icons/button_download.webp b/src/resources/icons/button_download.webp
deleted file mode 100644
index b4702b0..0000000
Binary files a/src/resources/icons/button_download.webp and /dev/null differ
diff --git a/src/resources/icons/button_play.webp b/src/resources/icons/button_play.webp
deleted file mode 100644
index a5ab0ce..0000000
Binary files a/src/resources/icons/button_play.webp and /dev/null differ
diff --git a/src/resources/icons/button_stop.webp b/src/resources/icons/button_stop.webp
deleted file mode 100644
index 82b0017..0000000
Binary files a/src/resources/icons/button_stop.webp and /dev/null differ
diff --git a/src/resources/icons/button_upload_folder.webp b/src/resources/icons/button_upload_folder.webp
deleted file mode 100644
index adac51b..0000000
Binary files a/src/resources/icons/button_upload_folder.webp and /dev/null differ
diff --git a/src/resources/icons/button_upload_gcode.webp b/src/resources/icons/button_upload_gcode.webp
deleted file mode 100644
index 7dbe73a..0000000
Binary files a/src/resources/icons/button_upload_gcode.webp and /dev/null differ
diff --git a/src/resources/images/delete_gcode.png b/src/resources/images/delete_gcode.png
new file mode 100644
index 0000000..9394d03
Binary files /dev/null and b/src/resources/images/delete_gcode.png differ
diff --git a/src/resources/images/download_gcode.png b/src/resources/images/download_gcode.png
new file mode 100644
index 0000000..6c00248
Binary files /dev/null and b/src/resources/images/download_gcode.png differ
diff --git a/src/resources/images/play.png b/src/resources/images/play.png
new file mode 100644
index 0000000..ea853b4
Binary files /dev/null and b/src/resources/images/play.png differ
diff --git a/src/resources/images/stop.png b/src/resources/images/stop.png
new file mode 100644
index 0000000..c53af1e
Binary files /dev/null and b/src/resources/images/stop.png differ
diff --git a/src/resources/images/upload_folder.png b/src/resources/images/upload_folder.png
new file mode 100644
index 0000000..8f9e4de
Binary files /dev/null and b/src/resources/images/upload_folder.png differ
diff --git a/src/resources/images/upload_gcode.png b/src/resources/images/upload_gcode.png
new file mode 100644
index 0000000..1ccdcfa
Binary files /dev/null and b/src/resources/images/upload_gcode.png differ