diff --git a/lib/states/editor.rb b/lib/states/editor.rb
index 70f7099..7af324b 100644
--- a/lib/states/editor.rb
+++ b/lib/states/editor.rb
@@ -26,17 +26,17 @@ module TAC
                   end
 
                   flow width: 0.395 do
-                    button "►", text_size: 18, margin_left: 10, tip: "Simulate robot path"
+                    button get_image("#{TAC::ROOT_PATH}/media/icons/right.png"), image_width: 18, margin_left: 10, tip: "Simulate robot path"
                     button "Presets", text_size: 18, margin_left: 10, tip: "Manage presets" do
                       push_state(ManagePresets)
                     end
-                    button "Save", text_size: 18, margin_left: 10, tip: "Save config to disk" do
+                    button get_image("#{TAC::ROOT_PATH}/media/icons/save.png"), image_width: 18, margin_left: 10, tip: "Save config to disk" do
                       window.backend.save_config
                     end
-                    button "▲", text_size: 18, margin_left: 10, tip: "Upload local config to remote, if connected." do
+                    button get_image("#{TAC::ROOT_PATH}/media/icons/export.png"), image_width: 18, margin_left: 10, tip: "Upload local config to remote, if connected." do
                       window.backend.upload_config
                     end
-                    button "▼", text_size: 18, margin_left: 10, tip: "Download remote config, if connected." do
+                    button get_image("#{TAC::ROOT_PATH}/media/icons/import.png"), image_width: 18, margin_left: 10, tip: "Download remote config, if connected." do
                       window.backend.download_config
                     end
                   end
diff --git a/lib/theme.rb b/lib/theme.rb
index 2980143..7b4f9fb 100644
--- a/lib/theme.rb
+++ b/lib/theme.rb
@@ -1,7 +1,7 @@
 module TAC
   THEME = {
             Label: {
-              font: "#{TAC::ROOT_PATH}/media/DejaVuSansCondensed.ttf",
+              font: "#{TAC::ROOT_PATH}/media/fonts/DejaVuSansCondensed.ttf",
               text_size: 28
             },
             Button: {
diff --git a/media/DejaVuSansCondensed.ttf b/media/fonts/DejaVuSansCondensed.ttf
similarity index 100%
rename from media/DejaVuSansCondensed.ttf
rename to media/fonts/DejaVuSansCondensed.ttf
diff --git a/media/FONT_LICENSE b/media/fonts/LICENSE
similarity index 100%
rename from media/FONT_LICENSE
rename to media/fonts/LICENSE
diff --git a/media/icons/arrowDown.png b/media/icons/arrowDown.png
new file mode 100644
index 0000000..a5dde02
Binary files /dev/null and b/media/icons/arrowDown.png differ
diff --git a/media/icons/arrowLeft.png b/media/icons/arrowLeft.png
new file mode 100644
index 0000000..5d5bf2e
Binary files /dev/null and b/media/icons/arrowLeft.png differ
diff --git a/media/icons/arrowRight.png b/media/icons/arrowRight.png
new file mode 100644
index 0000000..f0c041b
Binary files /dev/null and b/media/icons/arrowRight.png differ
diff --git a/media/icons/arrowUp.png b/media/icons/arrowUp.png
new file mode 100644
index 0000000..26c043c
Binary files /dev/null and b/media/icons/arrowUp.png differ
diff --git a/media/icons/audioOff.png b/media/icons/audioOff.png
new file mode 100644
index 0000000..8f61b33
Binary files /dev/null and b/media/icons/audioOff.png differ
diff --git a/media/icons/audioOn.png b/media/icons/audioOn.png
new file mode 100644
index 0000000..3250a72
Binary files /dev/null and b/media/icons/audioOn.png differ
diff --git a/media/icons/barsHorizontal.png b/media/icons/barsHorizontal.png
new file mode 100644
index 0000000..b40ad8f
Binary files /dev/null and b/media/icons/barsHorizontal.png differ
diff --git a/media/icons/barsVertical.png b/media/icons/barsVertical.png
new file mode 100644
index 0000000..15de39c
Binary files /dev/null and b/media/icons/barsVertical.png differ
diff --git a/media/icons/button1.png b/media/icons/button1.png
new file mode 100644
index 0000000..d72ed8e
Binary files /dev/null and b/media/icons/button1.png differ
diff --git a/media/icons/button2.png b/media/icons/button2.png
new file mode 100644
index 0000000..2cf1d6a
Binary files /dev/null and b/media/icons/button2.png differ
diff --git a/media/icons/button3.png b/media/icons/button3.png
new file mode 100644
index 0000000..010b7f4
Binary files /dev/null and b/media/icons/button3.png differ
diff --git a/media/icons/buttonA.png b/media/icons/buttonA.png
new file mode 100644
index 0000000..379a0bd
Binary files /dev/null and b/media/icons/buttonA.png differ
diff --git a/media/icons/buttonB.png b/media/icons/buttonB.png
new file mode 100644
index 0000000..b8586e5
Binary files /dev/null and b/media/icons/buttonB.png differ
diff --git a/media/icons/buttonL.png b/media/icons/buttonL.png
new file mode 100644
index 0000000..8fe8ef9
Binary files /dev/null and b/media/icons/buttonL.png differ
diff --git a/media/icons/buttonL1.png b/media/icons/buttonL1.png
new file mode 100644
index 0000000..40cdac6
Binary files /dev/null and b/media/icons/buttonL1.png differ
diff --git a/media/icons/buttonL2.png b/media/icons/buttonL2.png
new file mode 100644
index 0000000..d4ad08b
Binary files /dev/null and b/media/icons/buttonL2.png differ
diff --git a/media/icons/buttonR.png b/media/icons/buttonR.png
new file mode 100644
index 0000000..d737efe
Binary files /dev/null and b/media/icons/buttonR.png differ
diff --git a/media/icons/buttonR1.png b/media/icons/buttonR1.png
new file mode 100644
index 0000000..0a2ec6d
Binary files /dev/null and b/media/icons/buttonR1.png differ
diff --git a/media/icons/buttonR2.png b/media/icons/buttonR2.png
new file mode 100644
index 0000000..7b98609
Binary files /dev/null and b/media/icons/buttonR2.png differ
diff --git a/media/icons/buttonSelect.png b/media/icons/buttonSelect.png
new file mode 100644
index 0000000..b0b091b
Binary files /dev/null and b/media/icons/buttonSelect.png differ
diff --git a/media/icons/buttonStart.png b/media/icons/buttonStart.png
new file mode 100644
index 0000000..a6482ea
Binary files /dev/null and b/media/icons/buttonStart.png differ
diff --git a/media/icons/buttonX.png b/media/icons/buttonX.png
new file mode 100644
index 0000000..0ceb691
Binary files /dev/null and b/media/icons/buttonX.png differ
diff --git a/media/icons/buttonY.png b/media/icons/buttonY.png
new file mode 100644
index 0000000..ea4fbf6
Binary files /dev/null and b/media/icons/buttonY.png differ
diff --git a/media/icons/checkmark.png b/media/icons/checkmark.png
new file mode 100644
index 0000000..f912260
Binary files /dev/null and b/media/icons/checkmark.png differ
diff --git a/media/icons/contrast.png b/media/icons/contrast.png
new file mode 100644
index 0000000..42db74d
Binary files /dev/null and b/media/icons/contrast.png differ
diff --git a/media/icons/cross.png b/media/icons/cross.png
new file mode 100644
index 0000000..e21d5ac
Binary files /dev/null and b/media/icons/cross.png differ
diff --git a/media/icons/down.png b/media/icons/down.png
new file mode 100644
index 0000000..50cba60
Binary files /dev/null and b/media/icons/down.png differ
diff --git a/media/icons/downLeft.png b/media/icons/downLeft.png
new file mode 100644
index 0000000..bfe94eb
Binary files /dev/null and b/media/icons/downLeft.png differ
diff --git a/media/icons/downRight.png b/media/icons/downRight.png
new file mode 100644
index 0000000..ca575ac
Binary files /dev/null and b/media/icons/downRight.png differ
diff --git a/media/icons/exclamation.png b/media/icons/exclamation.png
new file mode 100644
index 0000000..951d06f
Binary files /dev/null and b/media/icons/exclamation.png differ
diff --git a/media/icons/exit.png b/media/icons/exit.png
new file mode 100644
index 0000000..0924199
Binary files /dev/null and b/media/icons/exit.png differ
diff --git a/media/icons/exitLeft.png b/media/icons/exitLeft.png
new file mode 100644
index 0000000..cae49d3
Binary files /dev/null and b/media/icons/exitLeft.png differ
diff --git a/media/icons/exitRight.png b/media/icons/exitRight.png
new file mode 100644
index 0000000..7c2ca28
Binary files /dev/null and b/media/icons/exitRight.png differ
diff --git a/media/icons/export.png b/media/icons/export.png
new file mode 100644
index 0000000..97100c7
Binary files /dev/null and b/media/icons/export.png differ
diff --git a/media/icons/fastForward.png b/media/icons/fastForward.png
new file mode 100644
index 0000000..6500b10
Binary files /dev/null and b/media/icons/fastForward.png differ
diff --git a/media/icons/gamepad.png b/media/icons/gamepad.png
new file mode 100644
index 0000000..46cbcd5
Binary files /dev/null and b/media/icons/gamepad.png differ
diff --git a/media/icons/gamepad1.png b/media/icons/gamepad1.png
new file mode 100644
index 0000000..1d7b251
Binary files /dev/null and b/media/icons/gamepad1.png differ
diff --git a/media/icons/gamepad2.png b/media/icons/gamepad2.png
new file mode 100644
index 0000000..29c9567
Binary files /dev/null and b/media/icons/gamepad2.png differ
diff --git a/media/icons/gamepad3.png b/media/icons/gamepad3.png
new file mode 100644
index 0000000..bcc8551
Binary files /dev/null and b/media/icons/gamepad3.png differ
diff --git a/media/icons/gamepad4.png b/media/icons/gamepad4.png
new file mode 100644
index 0000000..a8e772a
Binary files /dev/null and b/media/icons/gamepad4.png differ
diff --git a/media/icons/gear.png b/media/icons/gear.png
new file mode 100644
index 0000000..bc19573
Binary files /dev/null and b/media/icons/gear.png differ
diff --git a/media/icons/home.png b/media/icons/home.png
new file mode 100644
index 0000000..65f5c1e
Binary files /dev/null and b/media/icons/home.png differ
diff --git a/media/icons/import.png b/media/icons/import.png
new file mode 100644
index 0000000..1a1278f
Binary files /dev/null and b/media/icons/import.png differ
diff --git a/media/icons/information.png b/media/icons/information.png
new file mode 100644
index 0000000..6f7d18e
Binary files /dev/null and b/media/icons/information.png differ
diff --git a/media/icons/joystick.png b/media/icons/joystick.png
new file mode 100644
index 0000000..f8956f0
Binary files /dev/null and b/media/icons/joystick.png differ
diff --git a/media/icons/joystickLeft.png b/media/icons/joystickLeft.png
new file mode 100644
index 0000000..de81675
Binary files /dev/null and b/media/icons/joystickLeft.png differ
diff --git a/media/icons/joystickRight.png b/media/icons/joystickRight.png
new file mode 100644
index 0000000..4329723
Binary files /dev/null and b/media/icons/joystickRight.png differ
diff --git a/media/icons/joystickUp.png b/media/icons/joystickUp.png
new file mode 100644
index 0000000..fa57c08
Binary files /dev/null and b/media/icons/joystickUp.png differ
diff --git a/media/icons/larger.png b/media/icons/larger.png
new file mode 100644
index 0000000..4f5d733
Binary files /dev/null and b/media/icons/larger.png differ
diff --git a/media/icons/leaderboardsComplex.png b/media/icons/leaderboardsComplex.png
new file mode 100644
index 0000000..3d8043b
Binary files /dev/null and b/media/icons/leaderboardsComplex.png differ
diff --git a/media/icons/leaderboardsSimple.png b/media/icons/leaderboardsSimple.png
new file mode 100644
index 0000000..4501efb
Binary files /dev/null and b/media/icons/leaderboardsSimple.png differ
diff --git a/media/icons/left.png b/media/icons/left.png
new file mode 100644
index 0000000..ebfb42a
Binary files /dev/null and b/media/icons/left.png differ
diff --git a/media/icons/license.txt b/media/icons/license.txt
new file mode 100644
index 0000000..4914a6d
--- /dev/null
+++ b/media/icons/license.txt
@@ -0,0 +1,14 @@
+
+###############################################################################
+
+	Game icon pack by Kenney Vleugels (www.kenney.nl)
+
+			------------------------------
+
+			        License (CC0)
+	       http://creativecommons.org/publicdomain/zero/1.0/
+
+	You may use these graphics in personal and commercial projects.
+	Credit (Kenney or www.kenney.nl) would be nice but is not mandatory.
+
+###############################################################################
\ No newline at end of file
diff --git a/media/icons/locked.png b/media/icons/locked.png
new file mode 100644
index 0000000..22189be
Binary files /dev/null and b/media/icons/locked.png differ
diff --git a/media/icons/massiveMultiplayer.png b/media/icons/massiveMultiplayer.png
new file mode 100644
index 0000000..e169a06
Binary files /dev/null and b/media/icons/massiveMultiplayer.png differ
diff --git a/media/icons/medal1.png b/media/icons/medal1.png
new file mode 100644
index 0000000..96342c9
Binary files /dev/null and b/media/icons/medal1.png differ
diff --git a/media/icons/medal2.png b/media/icons/medal2.png
new file mode 100644
index 0000000..cb60876
Binary files /dev/null and b/media/icons/medal2.png differ
diff --git a/media/icons/menuGrid.png b/media/icons/menuGrid.png
new file mode 100644
index 0000000..3e92b49
Binary files /dev/null and b/media/icons/menuGrid.png differ
diff --git a/media/icons/menuList.png b/media/icons/menuList.png
new file mode 100644
index 0000000..92e1528
Binary files /dev/null and b/media/icons/menuList.png differ
diff --git a/media/icons/minus.png b/media/icons/minus.png
new file mode 100644
index 0000000..bf53d03
Binary files /dev/null and b/media/icons/minus.png differ
diff --git a/media/icons/mouse.png b/media/icons/mouse.png
new file mode 100644
index 0000000..46042c2
Binary files /dev/null and b/media/icons/mouse.png differ
diff --git a/media/icons/movie.png b/media/icons/movie.png
new file mode 100644
index 0000000..e935e59
Binary files /dev/null and b/media/icons/movie.png differ
diff --git a/media/icons/multiplayer.png b/media/icons/multiplayer.png
new file mode 100644
index 0000000..6d96000
Binary files /dev/null and b/media/icons/multiplayer.png differ
diff --git a/media/icons/musicOff.png b/media/icons/musicOff.png
new file mode 100644
index 0000000..ce460f2
Binary files /dev/null and b/media/icons/musicOff.png differ
diff --git a/media/icons/musicOn.png b/media/icons/musicOn.png
new file mode 100644
index 0000000..e0db7ff
Binary files /dev/null and b/media/icons/musicOn.png differ
diff --git a/media/icons/next.png b/media/icons/next.png
new file mode 100644
index 0000000..9dd3d9e
Binary files /dev/null and b/media/icons/next.png differ
diff --git a/media/icons/open.png b/media/icons/open.png
new file mode 100644
index 0000000..16df1e9
Binary files /dev/null and b/media/icons/open.png differ
diff --git a/media/icons/pause.png b/media/icons/pause.png
new file mode 100644
index 0000000..aec61a0
Binary files /dev/null and b/media/icons/pause.png differ
diff --git a/media/icons/phone.png b/media/icons/phone.png
new file mode 100644
index 0000000..3580a6e
Binary files /dev/null and b/media/icons/phone.png differ
diff --git a/media/icons/plus.png b/media/icons/plus.png
new file mode 100644
index 0000000..3f5cf37
Binary files /dev/null and b/media/icons/plus.png differ
diff --git a/media/icons/power.png b/media/icons/power.png
new file mode 100644
index 0000000..e1e7775
Binary files /dev/null and b/media/icons/power.png differ
diff --git a/media/icons/previous.png b/media/icons/previous.png
new file mode 100644
index 0000000..2720365
Binary files /dev/null and b/media/icons/previous.png differ
diff --git a/media/icons/question.png b/media/icons/question.png
new file mode 100644
index 0000000..a1b75ad
Binary files /dev/null and b/media/icons/question.png differ
diff --git a/media/icons/return.png b/media/icons/return.png
new file mode 100644
index 0000000..139b39a
Binary files /dev/null and b/media/icons/return.png differ
diff --git a/media/icons/rewind.png b/media/icons/rewind.png
new file mode 100644
index 0000000..fcdfd45
Binary files /dev/null and b/media/icons/rewind.png differ
diff --git a/media/icons/right.png b/media/icons/right.png
new file mode 100644
index 0000000..d0a2528
Binary files /dev/null and b/media/icons/right.png differ
diff --git a/media/icons/save.png b/media/icons/save.png
new file mode 100644
index 0000000..a40de9f
Binary files /dev/null and b/media/icons/save.png differ
diff --git a/media/icons/scrollHorizontal.png b/media/icons/scrollHorizontal.png
new file mode 100644
index 0000000..db16284
Binary files /dev/null and b/media/icons/scrollHorizontal.png differ
diff --git a/media/icons/scrollVertical.png b/media/icons/scrollVertical.png
new file mode 100644
index 0000000..e73bcb3
Binary files /dev/null and b/media/icons/scrollVertical.png differ
diff --git a/media/icons/share1.png b/media/icons/share1.png
new file mode 100644
index 0000000..3db9e99
Binary files /dev/null and b/media/icons/share1.png differ
diff --git a/media/icons/share2.png b/media/icons/share2.png
new file mode 100644
index 0000000..f2cb130
Binary files /dev/null and b/media/icons/share2.png differ
diff --git a/media/icons/shoppingBasket.png b/media/icons/shoppingBasket.png
new file mode 100644
index 0000000..477032b
Binary files /dev/null and b/media/icons/shoppingBasket.png differ
diff --git a/media/icons/shoppingCart.png b/media/icons/shoppingCart.png
new file mode 100644
index 0000000..f8bae55
Binary files /dev/null and b/media/icons/shoppingCart.png differ
diff --git a/media/icons/siganl1.png b/media/icons/siganl1.png
new file mode 100644
index 0000000..9516f2b
Binary files /dev/null and b/media/icons/siganl1.png differ
diff --git a/media/icons/signal2.png b/media/icons/signal2.png
new file mode 100644
index 0000000..e672f98
Binary files /dev/null and b/media/icons/signal2.png differ
diff --git a/media/icons/signal3.png b/media/icons/signal3.png
new file mode 100644
index 0000000..b0763e7
Binary files /dev/null and b/media/icons/signal3.png differ
diff --git a/media/icons/singleplayer.png b/media/icons/singleplayer.png
new file mode 100644
index 0000000..a8e6571
Binary files /dev/null and b/media/icons/singleplayer.png differ
diff --git a/media/icons/smaller.png b/media/icons/smaller.png
new file mode 100644
index 0000000..c1520a5
Binary files /dev/null and b/media/icons/smaller.png differ
diff --git a/media/icons/star.png b/media/icons/star.png
new file mode 100644
index 0000000..3e8a1ee
Binary files /dev/null and b/media/icons/star.png differ
diff --git a/media/icons/stop.png b/media/icons/stop.png
new file mode 100644
index 0000000..45cb57a
Binary files /dev/null and b/media/icons/stop.png differ
diff --git a/media/icons/tablet.png b/media/icons/tablet.png
new file mode 100644
index 0000000..88c3fe3
Binary files /dev/null and b/media/icons/tablet.png differ
diff --git a/media/icons/target.png b/media/icons/target.png
new file mode 100644
index 0000000..820f47b
Binary files /dev/null and b/media/icons/target.png differ
diff --git a/media/icons/trashcan.png b/media/icons/trashcan.png
new file mode 100644
index 0000000..cbd352d
Binary files /dev/null and b/media/icons/trashcan.png differ
diff --git a/media/icons/trashcanOpen.png b/media/icons/trashcanOpen.png
new file mode 100644
index 0000000..1192503
Binary files /dev/null and b/media/icons/trashcanOpen.png differ
diff --git a/media/icons/trophy.png b/media/icons/trophy.png
new file mode 100644
index 0000000..a013f42
Binary files /dev/null and b/media/icons/trophy.png differ
diff --git a/media/icons/unlocked.png b/media/icons/unlocked.png
new file mode 100644
index 0000000..2532c87
Binary files /dev/null and b/media/icons/unlocked.png differ
diff --git a/media/icons/up.png b/media/icons/up.png
new file mode 100644
index 0000000..d1b642c
Binary files /dev/null and b/media/icons/up.png differ
diff --git a/media/icons/upLeft.png b/media/icons/upLeft.png
new file mode 100644
index 0000000..d2022f3
Binary files /dev/null and b/media/icons/upLeft.png differ
diff --git a/media/icons/upRight.png b/media/icons/upRight.png
new file mode 100644
index 0000000..244dc9b
Binary files /dev/null and b/media/icons/upRight.png differ
diff --git a/media/icons/video.png b/media/icons/video.png
new file mode 100644
index 0000000..fa5081b
Binary files /dev/null and b/media/icons/video.png differ
diff --git a/media/icons/warning.png b/media/icons/warning.png
new file mode 100644
index 0000000..5869f57
Binary files /dev/null and b/media/icons/warning.png differ
diff --git a/media/icons/wrench.png b/media/icons/wrench.png
new file mode 100644
index 0000000..5f74641
Binary files /dev/null and b/media/icons/wrench.png differ
diff --git a/media/icons/zoom.png b/media/icons/zoom.png
new file mode 100644
index 0000000..6485b48
Binary files /dev/null and b/media/icons/zoom.png differ
diff --git a/media/icons/zoomDefault.png b/media/icons/zoomDefault.png
new file mode 100644
index 0000000..451cb6a
Binary files /dev/null and b/media/icons/zoomDefault.png differ
diff --git a/media/icons/zoomIn.png b/media/icons/zoomIn.png
new file mode 100644
index 0000000..086b6f0
Binary files /dev/null and b/media/icons/zoomIn.png differ
diff --git a/media/icons/zoomOut.png b/media/icons/zoomOut.png
new file mode 100644
index 0000000..77e7909
Binary files /dev/null and b/media/icons/zoomOut.png differ