diff --git a/companion/src/themes/classic/add.png b/companion/src/themes/classic/add.png
new file mode 100644
index 000000000..24cc027da
Binary files /dev/null and b/companion/src/themes/classic/add.png differ
diff --git a/companion/src/themes/classic/arrow-left.png b/companion/src/themes/classic/arrow-left.png
new file mode 100644
index 000000000..759e58950
Binary files /dev/null and b/companion/src/themes/classic/arrow-left.png differ
diff --git a/companion/src/themes/classic/arrow-right.png b/companion/src/themes/classic/arrow-right.png
new file mode 100644
index 000000000..1d056715f
Binary files /dev/null and b/companion/src/themes/classic/arrow-right.png differ
diff --git a/companion/src/themes/classic/changelog.png b/companion/src/themes/classic/changelog.png
new file mode 100644
index 000000000..3c60e6745
Binary files /dev/null and b/companion/src/themes/classic/changelog.png differ
diff --git a/companion/src/themes/classic/clear.png b/companion/src/themes/classic/clear.png
new file mode 100644
index 000000000..a599c0332
Binary files /dev/null and b/companion/src/themes/classic/clear.png differ
diff --git a/companion/src/themes/classic/compare.png b/companion/src/themes/classic/compare.png
new file mode 100644
index 000000000..5b7e41c4f
Binary files /dev/null and b/companion/src/themes/classic/compare.png differ
diff --git a/companion/src/themes/classic/configure.png b/companion/src/themes/classic/configure.png
new file mode 100644
index 000000000..ec6fad759
Binary files /dev/null and b/companion/src/themes/classic/configure.png differ
diff --git a/companion/src/themes/classic/contributors.png b/companion/src/themes/classic/contributors.png
new file mode 100644
index 000000000..276949198
Binary files /dev/null and b/companion/src/themes/classic/contributors.png differ
diff --git a/companion/src/themes/classic/copy.png b/companion/src/themes/classic/copy.png
new file mode 100644
index 000000000..2aeb28288
Binary files /dev/null and b/companion/src/themes/classic/copy.png differ
diff --git a/companion/src/themes/classic/currentmodel.png b/companion/src/themes/classic/currentmodel.png
new file mode 100644
index 000000000..35a37b766
Binary files /dev/null and b/companion/src/themes/classic/currentmodel.png differ
diff --git a/companion/src/themes/classic/customize.png b/companion/src/themes/classic/customize.png
new file mode 100644
index 000000000..96259b922
Binary files /dev/null and b/companion/src/themes/classic/customize.png differ
diff --git a/companion/src/themes/classic/cut.png b/companion/src/themes/classic/cut.png
new file mode 100644
index 000000000..54638e938
Binary files /dev/null and b/companion/src/themes/classic/cut.png differ
diff --git a/companion/src/themes/classic/duplicate.png b/companion/src/themes/classic/duplicate.png
new file mode 100644
index 000000000..811691d98
Binary files /dev/null and b/companion/src/themes/classic/duplicate.png differ
diff --git a/companion/src/themes/classic/edit.png b/companion/src/themes/classic/edit.png
new file mode 100644
index 000000000..106709cae
Binary files /dev/null and b/companion/src/themes/classic/edit.png differ
diff --git a/companion/src/themes/classic/exit.png b/companion/src/themes/classic/exit.png
new file mode 100644
index 000000000..5319a9480
Binary files /dev/null and b/companion/src/themes/classic/exit.png differ
diff --git a/companion/src/themes/classic/fuses.png b/companion/src/themes/classic/fuses.png
new file mode 100644
index 000000000..4354cdcb2
Binary files /dev/null and b/companion/src/themes/classic/fuses.png differ
diff --git a/companion/src/themes/classic/information.png b/companion/src/themes/classic/information.png
new file mode 100644
index 000000000..76b6d5966
Binary files /dev/null and b/companion/src/themes/classic/information.png differ
diff --git a/companion/src/themes/classic/library.png b/companion/src/themes/classic/library.png
new file mode 100644
index 000000000..16bfde4b9
Binary files /dev/null and b/companion/src/themes/classic/library.png differ
diff --git a/companion/src/themes/classic/list.png b/companion/src/themes/classic/list.png
new file mode 100644
index 000000000..fd4db26dc
Binary files /dev/null and b/companion/src/themes/classic/list.png differ
diff --git a/companion/src/themes/classic/logs.png b/companion/src/themes/classic/logs.png
new file mode 100644
index 000000000..8dc7ce194
Binary files /dev/null and b/companion/src/themes/classic/logs.png differ
diff --git a/companion/src/themes/classic/movedown.png b/companion/src/themes/classic/movedown.png
new file mode 100644
index 000000000..2632877c1
Binary files /dev/null and b/companion/src/themes/classic/movedown.png differ
diff --git a/companion/src/themes/classic/moveup.png b/companion/src/themes/classic/moveup.png
new file mode 100644
index 000000000..447f087cc
Binary files /dev/null and b/companion/src/themes/classic/moveup.png differ
diff --git a/companion/src/themes/classic/new.png b/companion/src/themes/classic/new.png
new file mode 100644
index 000000000..12131b010
Binary files /dev/null and b/companion/src/themes/classic/new.png differ
diff --git a/companion/src/themes/classic/open.png b/companion/src/themes/classic/open.png
new file mode 100644
index 000000000..45fa2883a
Binary files /dev/null and b/companion/src/themes/classic/open.png differ
diff --git a/companion/src/themes/classic/paste.png b/companion/src/themes/classic/paste.png
new file mode 100644
index 000000000..c14425cad
Binary files /dev/null and b/companion/src/themes/classic/paste.png differ
diff --git a/companion/src/images/play.png b/companion/src/themes/classic/play.png
similarity index 100%
rename from companion/src/images/play.png
rename to companion/src/themes/classic/play.png
diff --git a/companion/src/themes/classic/preferences.png b/companion/src/themes/classic/preferences.png
new file mode 100644
index 000000000..1f6613e40
Binary files /dev/null and b/companion/src/themes/classic/preferences.png differ
diff --git a/companion/src/themes/classic/print.png b/companion/src/themes/classic/print.png
new file mode 100644
index 000000000..578980db7
Binary files /dev/null and b/companion/src/themes/classic/print.png differ
diff --git a/companion/src/themes/classic/profiles.png b/companion/src/themes/classic/profiles.png
new file mode 100644
index 000000000..bfa571cff
Binary files /dev/null and b/companion/src/themes/classic/profiles.png differ
diff --git a/companion/src/themes/classic/read_eeprom.png b/companion/src/themes/classic/read_eeprom.png
new file mode 100644
index 000000000..08e861b31
Binary files /dev/null and b/companion/src/themes/classic/read_eeprom.png differ
diff --git a/companion/src/themes/classic/read_eeprom_file.png b/companion/src/themes/classic/read_eeprom_file.png
new file mode 100644
index 000000000..67a41176b
Binary files /dev/null and b/companion/src/themes/classic/read_eeprom_file.png differ
diff --git a/companion/src/themes/classic/read_flash.png b/companion/src/themes/classic/read_flash.png
new file mode 100644
index 000000000..c9065819b
Binary files /dev/null and b/companion/src/themes/classic/read_flash.png differ
diff --git a/companion/src/themes/classic/recentdocument.png b/companion/src/themes/classic/recentdocument.png
new file mode 100644
index 000000000..567494905
Binary files /dev/null and b/companion/src/themes/classic/recentdocument.png differ
diff --git a/companion/src/themes/classic/save.png b/companion/src/themes/classic/save.png
new file mode 100644
index 000000000..651b2a41f
Binary files /dev/null and b/companion/src/themes/classic/save.png differ
diff --git a/companion/src/themes/classic/saveas.png b/companion/src/themes/classic/saveas.png
new file mode 100644
index 000000000..d5d3176b8
Binary files /dev/null and b/companion/src/themes/classic/saveas.png differ
diff --git a/companion/src/themes/classic/simulate.png b/companion/src/themes/classic/simulate.png
new file mode 100644
index 000000000..429e12b9a
Binary files /dev/null and b/companion/src/themes/classic/simulate.png differ
diff --git a/companion/src/images/stop.png b/companion/src/themes/classic/stop.png
similarity index 100%
rename from companion/src/images/stop.png
rename to companion/src/themes/classic/stop.png
diff --git a/companion/src/themes/classic/switch_dir.png b/companion/src/themes/classic/switch_dir.png
new file mode 100644
index 000000000..a9ba5f47a
Binary files /dev/null and b/companion/src/themes/classic/switch_dir.png differ
diff --git a/companion/src/themes/classic/update.png b/companion/src/themes/classic/update.png
new file mode 100644
index 000000000..034ee58e8
Binary files /dev/null and b/companion/src/themes/classic/update.png differ
diff --git a/companion/src/themes/classic/wizard.png b/companion/src/themes/classic/wizard.png
new file mode 100644
index 000000000..ccd964e1d
Binary files /dev/null and b/companion/src/themes/classic/wizard.png differ
diff --git a/companion/src/themes/classic/write_eeprom.png b/companion/src/themes/classic/write_eeprom.png
new file mode 100644
index 000000000..15e58d0a3
Binary files /dev/null and b/companion/src/themes/classic/write_eeprom.png differ
diff --git a/companion/src/themes/classic/write_eeprom_file.png b/companion/src/themes/classic/write_eeprom_file.png
new file mode 100644
index 000000000..60d7c312e
Binary files /dev/null and b/companion/src/themes/classic/write_eeprom_file.png differ
diff --git a/companion/src/themes/classic/write_flash.png b/companion/src/themes/classic/write_flash.png
new file mode 100644
index 000000000..1664cb228
Binary files /dev/null and b/companion/src/themes/classic/write_flash.png differ
diff --git a/companion/src/images/add.png b/companion/src/themes/monochrome/add.png
similarity index 100%
rename from companion/src/images/add.png
rename to companion/src/themes/monochrome/add.png
diff --git a/companion/src/images/arrow-left.png b/companion/src/themes/monochrome/arrow-left.png
similarity index 100%
rename from companion/src/images/arrow-left.png
rename to companion/src/themes/monochrome/arrow-left.png
diff --git a/companion/src/images/arrow-right.png b/companion/src/themes/monochrome/arrow-right.png
similarity index 100%
rename from companion/src/images/arrow-right.png
rename to companion/src/themes/monochrome/arrow-right.png
diff --git a/companion/src/images/changelog.png b/companion/src/themes/monochrome/changelog.png
similarity index 100%
rename from companion/src/images/changelog.png
rename to companion/src/themes/monochrome/changelog.png
diff --git a/companion/src/images/clear.png b/companion/src/themes/monochrome/clear.png
similarity index 100%
rename from companion/src/images/clear.png
rename to companion/src/themes/monochrome/clear.png
diff --git a/companion/src/images/compare.png b/companion/src/themes/monochrome/compare.png
similarity index 100%
rename from companion/src/images/compare.png
rename to companion/src/themes/monochrome/compare.png
diff --git a/companion/src/images/configure.png b/companion/src/themes/monochrome/configure.png
similarity index 100%
rename from companion/src/images/configure.png
rename to companion/src/themes/monochrome/configure.png
diff --git a/companion/src/images/contributors.png b/companion/src/themes/monochrome/contributors.png
similarity index 100%
rename from companion/src/images/contributors.png
rename to companion/src/themes/monochrome/contributors.png
diff --git a/companion/src/images/copy.png b/companion/src/themes/monochrome/copy.png
similarity index 100%
rename from companion/src/images/copy.png
rename to companion/src/themes/monochrome/copy.png
diff --git a/companion/src/images/currentmodel.png b/companion/src/themes/monochrome/currentmodel.png
similarity index 100%
rename from companion/src/images/currentmodel.png
rename to companion/src/themes/monochrome/currentmodel.png
diff --git a/companion/src/images/customize.png b/companion/src/themes/monochrome/customize.png
similarity index 100%
rename from companion/src/images/customize.png
rename to companion/src/themes/monochrome/customize.png
diff --git a/companion/src/images/cut.png b/companion/src/themes/monochrome/cut.png
similarity index 100%
rename from companion/src/images/cut.png
rename to companion/src/themes/monochrome/cut.png
diff --git a/companion/src/images/duplicate.png b/companion/src/themes/monochrome/duplicate.png
similarity index 100%
rename from companion/src/images/duplicate.png
rename to companion/src/themes/monochrome/duplicate.png
diff --git a/companion/src/images/edit.png b/companion/src/themes/monochrome/edit.png
similarity index 100%
rename from companion/src/images/edit.png
rename to companion/src/themes/monochrome/edit.png
diff --git a/companion/src/images/exit.png b/companion/src/themes/monochrome/exit.png
similarity index 100%
rename from companion/src/images/exit.png
rename to companion/src/themes/monochrome/exit.png
diff --git a/companion/src/images/fuses.png b/companion/src/themes/monochrome/fuses.png
similarity index 100%
rename from companion/src/images/fuses.png
rename to companion/src/themes/monochrome/fuses.png
diff --git a/companion/src/images/information.png b/companion/src/themes/monochrome/information.png
similarity index 100%
rename from companion/src/images/information.png
rename to companion/src/themes/monochrome/information.png
diff --git a/companion/src/images/library.png b/companion/src/themes/monochrome/library.png
similarity index 100%
rename from companion/src/images/library.png
rename to companion/src/themes/monochrome/library.png
diff --git a/companion/src/images/list.png b/companion/src/themes/monochrome/list.png
similarity index 100%
rename from companion/src/images/list.png
rename to companion/src/themes/monochrome/list.png
diff --git a/companion/src/images/logs.png b/companion/src/themes/monochrome/logs.png
similarity index 100%
rename from companion/src/images/logs.png
rename to companion/src/themes/monochrome/logs.png
diff --git a/companion/src/images/movedown.png b/companion/src/themes/monochrome/movedown.png
similarity index 100%
rename from companion/src/images/movedown.png
rename to companion/src/themes/monochrome/movedown.png
diff --git a/companion/src/images/moveup.png b/companion/src/themes/monochrome/moveup.png
similarity index 100%
rename from companion/src/images/moveup.png
rename to companion/src/themes/monochrome/moveup.png
diff --git a/companion/src/images/new.png b/companion/src/themes/monochrome/new.png
similarity index 100%
rename from companion/src/images/new.png
rename to companion/src/themes/monochrome/new.png
diff --git a/companion/src/images/open.png b/companion/src/themes/monochrome/open.png
similarity index 100%
rename from companion/src/images/open.png
rename to companion/src/themes/monochrome/open.png
diff --git a/companion/src/images/paste.png b/companion/src/themes/monochrome/paste.png
similarity index 100%
rename from companion/src/images/paste.png
rename to companion/src/themes/monochrome/paste.png
diff --git a/companion/src/themes/monochrome/play.png b/companion/src/themes/monochrome/play.png
new file mode 100644
index 000000000..8501a8b58
Binary files /dev/null and b/companion/src/themes/monochrome/play.png differ
diff --git a/companion/src/images/preferences.png b/companion/src/themes/monochrome/preferences.png
similarity index 100%
rename from companion/src/images/preferences.png
rename to companion/src/themes/monochrome/preferences.png
diff --git a/companion/src/images/print.png b/companion/src/themes/monochrome/print.png
similarity index 100%
rename from companion/src/images/print.png
rename to companion/src/themes/monochrome/print.png
diff --git a/companion/src/images/profiles.png b/companion/src/themes/monochrome/profiles.png
similarity index 100%
rename from companion/src/images/profiles.png
rename to companion/src/themes/monochrome/profiles.png
diff --git a/companion/src/images/read_eeprom.png b/companion/src/themes/monochrome/read_eeprom.png
similarity index 100%
rename from companion/src/images/read_eeprom.png
rename to companion/src/themes/monochrome/read_eeprom.png
diff --git a/companion/src/images/read_eeprom_file.png b/companion/src/themes/monochrome/read_eeprom_file.png
similarity index 100%
rename from companion/src/images/read_eeprom_file.png
rename to companion/src/themes/monochrome/read_eeprom_file.png
diff --git a/companion/src/images/read_flash.png b/companion/src/themes/monochrome/read_flash.png
similarity index 100%
rename from companion/src/images/read_flash.png
rename to companion/src/themes/monochrome/read_flash.png
diff --git a/companion/src/images/recentdocument.png b/companion/src/themes/monochrome/recentdocument.png
similarity index 100%
rename from companion/src/images/recentdocument.png
rename to companion/src/themes/monochrome/recentdocument.png
diff --git a/companion/src/images/save.png b/companion/src/themes/monochrome/save.png
similarity index 100%
rename from companion/src/images/save.png
rename to companion/src/themes/monochrome/save.png
diff --git a/companion/src/images/saveas.png b/companion/src/themes/monochrome/saveas.png
similarity index 100%
rename from companion/src/images/saveas.png
rename to companion/src/themes/monochrome/saveas.png
diff --git a/companion/src/images/simulate.png b/companion/src/themes/monochrome/simulate.png
similarity index 100%
rename from companion/src/images/simulate.png
rename to companion/src/themes/monochrome/simulate.png
diff --git a/companion/src/themes/monochrome/stop.png b/companion/src/themes/monochrome/stop.png
new file mode 100644
index 000000000..3bf2af6e9
Binary files /dev/null and b/companion/src/themes/monochrome/stop.png differ
diff --git a/companion/src/images/switch_dir.png b/companion/src/themes/monochrome/switch_dir.png
similarity index 100%
rename from companion/src/images/switch_dir.png
rename to companion/src/themes/monochrome/switch_dir.png
diff --git a/companion/src/images/update.png b/companion/src/themes/monochrome/update.png
similarity index 100%
rename from companion/src/images/update.png
rename to companion/src/themes/monochrome/update.png
diff --git a/companion/src/images/wizard.png b/companion/src/themes/monochrome/wizard.png
similarity index 100%
rename from companion/src/images/wizard.png
rename to companion/src/themes/monochrome/wizard.png
diff --git a/companion/src/images/write_eeprom.png b/companion/src/themes/monochrome/write_eeprom.png
similarity index 100%
rename from companion/src/images/write_eeprom.png
rename to companion/src/themes/monochrome/write_eeprom.png
diff --git a/companion/src/images/write_eeprom_file.png b/companion/src/themes/monochrome/write_eeprom_file.png
similarity index 100%
rename from companion/src/images/write_eeprom_file.png
rename to companion/src/themes/monochrome/write_eeprom_file.png
diff --git a/companion/src/images/write_flash.png b/companion/src/themes/monochrome/write_flash.png
similarity index 100%
rename from companion/src/images/write_flash.png
rename to companion/src/themes/monochrome/write_flash.png