diff --git a/companion/src/themes/new/32/compare.png b/companion/src/themes/new/32/compare.png
deleted file mode 100644
index f5ce044bf..000000000
Binary files a/companion/src/themes/new/32/compare.png and /dev/null differ
diff --git a/companion/src/themes/new/32/configure.png b/companion/src/themes/new/32/configure.png
deleted file mode 100644
index 23143b879..000000000
Binary files a/companion/src/themes/new/32/configure.png and /dev/null differ
diff --git a/companion/src/themes/new/32/read_eeprom.png b/companion/src/themes/new/32/read_eeprom.png
deleted file mode 100644
index 8b65a3e95..000000000
Binary files a/companion/src/themes/new/32/read_eeprom.png and /dev/null differ
diff --git a/companion/src/themes/new/32/read_eeprom_file.png b/companion/src/themes/new/32/read_eeprom_file.png
deleted file mode 100644
index 2eed0084c..000000000
Binary files a/companion/src/themes/new/32/read_eeprom_file.png and /dev/null differ
diff --git a/companion/src/themes/new/32/read_flash.png b/companion/src/themes/new/32/read_flash.png
deleted file mode 100644
index 7246335ec..000000000
Binary files a/companion/src/themes/new/32/read_flash.png and /dev/null differ
diff --git a/companion/src/themes/new/32/save.png b/companion/src/themes/new/32/save.png
deleted file mode 100644
index 29032f4e8..000000000
Binary files a/companion/src/themes/new/32/save.png and /dev/null differ
diff --git a/companion/src/themes/new/32/write_eeprom.png b/companion/src/themes/new/32/write_eeprom.png
deleted file mode 100644
index 974df3648..000000000
Binary files a/companion/src/themes/new/32/write_eeprom.png and /dev/null differ
diff --git a/companion/src/themes/new/32/write_eeprom_file.png b/companion/src/themes/new/32/write_eeprom_file.png
deleted file mode 100644
index 0e9803f87..000000000
Binary files a/companion/src/themes/new/32/write_eeprom_file.png and /dev/null differ
diff --git a/companion/src/themes/new/32/write_flash.png b/companion/src/themes/new/32/write_flash.png
deleted file mode 100644
index ba4267520..000000000
Binary files a/companion/src/themes/new/32/write_flash.png and /dev/null differ
diff --git a/companion/src/themes/new/16/add.png b/companion/src/themes/yerico/16/add.png
similarity index 100%
rename from companion/src/themes/new/16/add.png
rename to companion/src/themes/yerico/16/add.png
diff --git a/companion/src/themes/new/16/apppreferences.png b/companion/src/themes/yerico/16/apppreferences.png
similarity index 100%
rename from companion/src/themes/new/16/apppreferences.png
rename to companion/src/themes/yerico/16/apppreferences.png
diff --git a/companion/src/themes/new/16/arrow-left.png b/companion/src/themes/yerico/16/arrow-left.png
similarity index 100%
rename from companion/src/themes/new/16/arrow-left.png
rename to companion/src/themes/yerico/16/arrow-left.png
diff --git a/companion/src/themes/new/16/arrow-right.png b/companion/src/themes/yerico/16/arrow-right.png
similarity index 100%
rename from companion/src/themes/new/16/arrow-right.png
rename to companion/src/themes/yerico/16/arrow-right.png
diff --git a/companion/src/themes/new/16/changelog.png b/companion/src/themes/yerico/16/changelog.png
similarity index 100%
rename from companion/src/themes/new/16/changelog.png
rename to companion/src/themes/yerico/16/changelog.png
diff --git a/companion/src/themes/new/16/clear.png b/companion/src/themes/yerico/16/clear.png
similarity index 100%
rename from companion/src/themes/new/16/clear.png
rename to companion/src/themes/yerico/16/clear.png
diff --git a/companion/src/themes/new/16/compare.png b/companion/src/themes/yerico/16/compare.png
similarity index 100%
rename from companion/src/themes/new/16/compare.png
rename to companion/src/themes/yerico/16/compare.png
diff --git a/companion/src/themes/new/16/configure.png b/companion/src/themes/yerico/16/configure.png
similarity index 100%
rename from companion/src/themes/new/16/configure.png
rename to companion/src/themes/yerico/16/configure.png
diff --git a/companion/src/themes/new/16/contributors.png b/companion/src/themes/yerico/16/contributors.png
similarity index 100%
rename from companion/src/themes/new/16/contributors.png
rename to companion/src/themes/yerico/16/contributors.png
diff --git a/companion/src/themes/new/16/copy.png b/companion/src/themes/yerico/16/copy.png
similarity index 100%
rename from companion/src/themes/new/16/copy.png
rename to companion/src/themes/yerico/16/copy.png
diff --git a/companion/src/themes/new/16/currentmodel.png b/companion/src/themes/yerico/16/currentmodel.png
similarity index 100%
rename from companion/src/themes/new/16/currentmodel.png
rename to companion/src/themes/yerico/16/currentmodel.png
diff --git a/companion/src/themes/new/16/cut.png b/companion/src/themes/yerico/16/cut.png
similarity index 100%
rename from companion/src/themes/new/16/cut.png
rename to companion/src/themes/yerico/16/cut.png
diff --git a/companion/src/themes/new/16/duplicate.png b/companion/src/themes/yerico/16/duplicate.png
similarity index 100%
rename from companion/src/themes/new/16/duplicate.png
rename to companion/src/themes/yerico/16/duplicate.png
diff --git a/companion/src/themes/new/16/edit.png b/companion/src/themes/yerico/16/edit.png
similarity index 100%
rename from companion/src/themes/new/16/edit.png
rename to companion/src/themes/yerico/16/edit.png
diff --git a/companion/src/themes/new/16/exit.png b/companion/src/themes/yerico/16/exit.png
similarity index 100%
rename from companion/src/themes/new/16/exit.png
rename to companion/src/themes/yerico/16/exit.png
diff --git a/companion/src/themes/new/16/fuses.png b/companion/src/themes/yerico/16/fuses.png
similarity index 100%
rename from companion/src/themes/new/16/fuses.png
rename to companion/src/themes/yerico/16/fuses.png
diff --git a/companion/src/themes/new/16/fwpreferences.png b/companion/src/themes/yerico/16/fwpreferences.png
similarity index 100%
rename from companion/src/themes/new/16/fwpreferences.png
rename to companion/src/themes/yerico/16/fwpreferences.png
diff --git a/companion/src/themes/new/16/information.png b/companion/src/themes/yerico/16/information.png
similarity index 100%
rename from companion/src/themes/new/16/information.png
rename to companion/src/themes/yerico/16/information.png
diff --git a/companion/src/themes/new/16/library.png b/companion/src/themes/yerico/16/library.png
similarity index 100%
rename from companion/src/themes/new/16/library.png
rename to companion/src/themes/yerico/16/library.png
diff --git a/companion/src/themes/new/16/list.png b/companion/src/themes/yerico/16/list.png
similarity index 100%
rename from companion/src/themes/new/16/list.png
rename to companion/src/themes/yerico/16/list.png
diff --git a/companion/src/themes/new/16/logs.png b/companion/src/themes/yerico/16/logs.png
similarity index 100%
rename from companion/src/themes/new/16/logs.png
rename to companion/src/themes/yerico/16/logs.png
diff --git a/companion/src/themes/new/16/movedown.png b/companion/src/themes/yerico/16/movedown.png
similarity index 100%
rename from companion/src/themes/new/16/movedown.png
rename to companion/src/themes/yerico/16/movedown.png
diff --git a/companion/src/themes/new/16/moveup.png b/companion/src/themes/yerico/16/moveup.png
similarity index 100%
rename from companion/src/themes/new/16/moveup.png
rename to companion/src/themes/yerico/16/moveup.png
diff --git a/companion/src/themes/new/16/new.png b/companion/src/themes/yerico/16/new.png
similarity index 100%
rename from companion/src/themes/new/16/new.png
rename to companion/src/themes/yerico/16/new.png
diff --git a/companion/src/themes/new/16/open.png b/companion/src/themes/yerico/16/open.png
similarity index 100%
rename from companion/src/themes/new/16/open.png
rename to companion/src/themes/yerico/16/open.png
diff --git a/companion/src/themes/new/16/paintbrush.png b/companion/src/themes/yerico/16/paintbrush.png
similarity index 100%
rename from companion/src/themes/new/16/paintbrush.png
rename to companion/src/themes/yerico/16/paintbrush.png
diff --git a/companion/src/themes/new/16/paste.png b/companion/src/themes/yerico/16/paste.png
similarity index 100%
rename from companion/src/themes/new/16/paste.png
rename to companion/src/themes/yerico/16/paste.png
diff --git a/companion/src/themes/new/16/play.png b/companion/src/themes/yerico/16/play.png
similarity index 100%
rename from companion/src/themes/new/16/play.png
rename to companion/src/themes/yerico/16/play.png
diff --git a/companion/src/themes/new/16/print.png b/companion/src/themes/yerico/16/print.png
similarity index 100%
rename from companion/src/themes/new/16/print.png
rename to companion/src/themes/yerico/16/print.png
diff --git a/companion/src/themes/new/16/profiles.png b/companion/src/themes/yerico/16/profiles.png
similarity index 100%
rename from companion/src/themes/new/16/profiles.png
rename to companion/src/themes/yerico/16/profiles.png
diff --git a/companion/src/themes/new/16/read_eeprom.png b/companion/src/themes/yerico/16/read_eeprom.png
similarity index 100%
rename from companion/src/themes/new/16/read_eeprom.png
rename to companion/src/themes/yerico/16/read_eeprom.png
diff --git a/companion/src/themes/new/16/read_eeprom_file.png b/companion/src/themes/yerico/16/read_eeprom_file.png
similarity index 100%
rename from companion/src/themes/new/16/read_eeprom_file.png
rename to companion/src/themes/yerico/16/read_eeprom_file.png
diff --git a/companion/src/themes/new/16/read_flash.png b/companion/src/themes/yerico/16/read_flash.png
similarity index 100%
rename from companion/src/themes/new/16/read_flash.png
rename to companion/src/themes/yerico/16/read_flash.png
diff --git a/companion/src/themes/new/16/recentdocument.png b/companion/src/themes/yerico/16/recentdocument.png
similarity index 100%
rename from companion/src/themes/new/16/recentdocument.png
rename to companion/src/themes/yerico/16/recentdocument.png
diff --git a/companion/src/themes/new/16/save.png b/companion/src/themes/yerico/16/save.png
similarity index 100%
rename from companion/src/themes/new/16/save.png
rename to companion/src/themes/yerico/16/save.png
diff --git a/companion/src/themes/new/16/saveas.png b/companion/src/themes/yerico/16/saveas.png
similarity index 100%
rename from companion/src/themes/new/16/saveas.png
rename to companion/src/themes/yerico/16/saveas.png
diff --git a/companion/src/themes/new/16/simulate.png b/companion/src/themes/yerico/16/simulate.png
similarity index 100%
rename from companion/src/themes/new/16/simulate.png
rename to companion/src/themes/yerico/16/simulate.png
diff --git a/companion/src/themes/new/16/stop.png b/companion/src/themes/yerico/16/stop.png
similarity index 100%
rename from companion/src/themes/new/16/stop.png
rename to companion/src/themes/yerico/16/stop.png
diff --git a/companion/src/themes/new/16/update.png b/companion/src/themes/yerico/16/update.png
similarity index 100%
rename from companion/src/themes/new/16/update.png
rename to companion/src/themes/yerico/16/update.png
diff --git a/companion/src/themes/new/16/wizard.png b/companion/src/themes/yerico/16/wizard.png
similarity index 100%
rename from companion/src/themes/new/16/wizard.png
rename to companion/src/themes/yerico/16/wizard.png
diff --git a/companion/src/themes/new/16/write_eeprom.png b/companion/src/themes/yerico/16/write_eeprom.png
similarity index 100%
rename from companion/src/themes/new/16/write_eeprom.png
rename to companion/src/themes/yerico/16/write_eeprom.png
diff --git a/companion/src/themes/new/16/write_eeprom_file.png b/companion/src/themes/yerico/16/write_eeprom_file.png
similarity index 100%
rename from companion/src/themes/new/16/write_eeprom_file.png
rename to companion/src/themes/yerico/16/write_eeprom_file.png
diff --git a/companion/src/themes/new/16/write_flash.png b/companion/src/themes/yerico/16/write_flash.png
similarity index 100%
rename from companion/src/themes/new/16/write_flash.png
rename to companion/src/themes/yerico/16/write_flash.png
diff --git a/companion/src/themes/new/24/add.png b/companion/src/themes/yerico/24/add.png
similarity index 100%
rename from companion/src/themes/new/24/add.png
rename to companion/src/themes/yerico/24/add.png
diff --git a/companion/src/themes/new/24/apppreferences.png b/companion/src/themes/yerico/24/apppreferences.png
similarity index 100%
rename from companion/src/themes/new/24/apppreferences.png
rename to companion/src/themes/yerico/24/apppreferences.png
diff --git a/companion/src/themes/new/24/arrow-left.png b/companion/src/themes/yerico/24/arrow-left.png
similarity index 100%
rename from companion/src/themes/new/24/arrow-left.png
rename to companion/src/themes/yerico/24/arrow-left.png
diff --git a/companion/src/themes/new/24/arrow-right.png b/companion/src/themes/yerico/24/arrow-right.png
similarity index 100%
rename from companion/src/themes/new/24/arrow-right.png
rename to companion/src/themes/yerico/24/arrow-right.png
diff --git a/companion/src/themes/new/24/changelog.png b/companion/src/themes/yerico/24/changelog.png
similarity index 100%
rename from companion/src/themes/new/24/changelog.png
rename to companion/src/themes/yerico/24/changelog.png
diff --git a/companion/src/themes/new/24/clear.png b/companion/src/themes/yerico/24/clear.png
similarity index 100%
rename from companion/src/themes/new/24/clear.png
rename to companion/src/themes/yerico/24/clear.png
diff --git a/companion/src/themes/new/24/compare.png b/companion/src/themes/yerico/24/compare.png
similarity index 100%
rename from companion/src/themes/new/24/compare.png
rename to companion/src/themes/yerico/24/compare.png
diff --git a/companion/src/themes/new/24/configure.png b/companion/src/themes/yerico/24/configure.png
similarity index 100%
rename from companion/src/themes/new/24/configure.png
rename to companion/src/themes/yerico/24/configure.png
diff --git a/companion/src/themes/new/24/contributors.png b/companion/src/themes/yerico/24/contributors.png
similarity index 100%
rename from companion/src/themes/new/24/contributors.png
rename to companion/src/themes/yerico/24/contributors.png
diff --git a/companion/src/themes/new/24/copy.png b/companion/src/themes/yerico/24/copy.png
similarity index 100%
rename from companion/src/themes/new/24/copy.png
rename to companion/src/themes/yerico/24/copy.png
diff --git a/companion/src/themes/new/24/currentmodel.png b/companion/src/themes/yerico/24/currentmodel.png
similarity index 100%
rename from companion/src/themes/new/24/currentmodel.png
rename to companion/src/themes/yerico/24/currentmodel.png
diff --git a/companion/src/themes/new/24/cut.png b/companion/src/themes/yerico/24/cut.png
similarity index 100%
rename from companion/src/themes/new/24/cut.png
rename to companion/src/themes/yerico/24/cut.png
diff --git a/companion/src/themes/new/24/duplicate.png b/companion/src/themes/yerico/24/duplicate.png
similarity index 100%
rename from companion/src/themes/new/24/duplicate.png
rename to companion/src/themes/yerico/24/duplicate.png
diff --git a/companion/src/themes/new/24/edit.png b/companion/src/themes/yerico/24/edit.png
similarity index 100%
rename from companion/src/themes/new/24/edit.png
rename to companion/src/themes/yerico/24/edit.png
diff --git a/companion/src/themes/new/24/exit.png b/companion/src/themes/yerico/24/exit.png
similarity index 100%
rename from companion/src/themes/new/24/exit.png
rename to companion/src/themes/yerico/24/exit.png
diff --git a/companion/src/themes/new/24/fuses.png b/companion/src/themes/yerico/24/fuses.png
similarity index 100%
rename from companion/src/themes/new/24/fuses.png
rename to companion/src/themes/yerico/24/fuses.png
diff --git a/companion/src/themes/new/24/fwpreferences.png b/companion/src/themes/yerico/24/fwpreferences.png
similarity index 100%
rename from companion/src/themes/new/24/fwpreferences.png
rename to companion/src/themes/yerico/24/fwpreferences.png
diff --git a/companion/src/themes/new/24/information.png b/companion/src/themes/yerico/24/information.png
similarity index 100%
rename from companion/src/themes/new/24/information.png
rename to companion/src/themes/yerico/24/information.png
diff --git a/companion/src/themes/new/24/library.png b/companion/src/themes/yerico/24/library.png
similarity index 100%
rename from companion/src/themes/new/24/library.png
rename to companion/src/themes/yerico/24/library.png
diff --git a/companion/src/themes/new/24/list.png b/companion/src/themes/yerico/24/list.png
similarity index 100%
rename from companion/src/themes/new/24/list.png
rename to companion/src/themes/yerico/24/list.png
diff --git a/companion/src/themes/new/24/logs.png b/companion/src/themes/yerico/24/logs.png
similarity index 100%
rename from companion/src/themes/new/24/logs.png
rename to companion/src/themes/yerico/24/logs.png
diff --git a/companion/src/themes/new/24/movedown.png b/companion/src/themes/yerico/24/movedown.png
similarity index 100%
rename from companion/src/themes/new/24/movedown.png
rename to companion/src/themes/yerico/24/movedown.png
diff --git a/companion/src/themes/new/24/moveup.png b/companion/src/themes/yerico/24/moveup.png
similarity index 100%
rename from companion/src/themes/new/24/moveup.png
rename to companion/src/themes/yerico/24/moveup.png
diff --git a/companion/src/themes/new/24/new.png b/companion/src/themes/yerico/24/new.png
similarity index 100%
rename from companion/src/themes/new/24/new.png
rename to companion/src/themes/yerico/24/new.png
diff --git a/companion/src/themes/new/24/open.png b/companion/src/themes/yerico/24/open.png
similarity index 100%
rename from companion/src/themes/new/24/open.png
rename to companion/src/themes/yerico/24/open.png
diff --git a/companion/src/themes/new/24/paintbrush.png b/companion/src/themes/yerico/24/paintbrush.png
similarity index 100%
rename from companion/src/themes/new/24/paintbrush.png
rename to companion/src/themes/yerico/24/paintbrush.png
diff --git a/companion/src/themes/new/24/paste.png b/companion/src/themes/yerico/24/paste.png
similarity index 100%
rename from companion/src/themes/new/24/paste.png
rename to companion/src/themes/yerico/24/paste.png
diff --git a/companion/src/themes/new/24/play.png b/companion/src/themes/yerico/24/play.png
similarity index 100%
rename from companion/src/themes/new/24/play.png
rename to companion/src/themes/yerico/24/play.png
diff --git a/companion/src/themes/new/24/print.png b/companion/src/themes/yerico/24/print.png
similarity index 100%
rename from companion/src/themes/new/24/print.png
rename to companion/src/themes/yerico/24/print.png
diff --git a/companion/src/themes/new/24/profiles.png b/companion/src/themes/yerico/24/profiles.png
similarity index 100%
rename from companion/src/themes/new/24/profiles.png
rename to companion/src/themes/yerico/24/profiles.png
diff --git a/companion/src/themes/new/24/read_eeprom.png b/companion/src/themes/yerico/24/read_eeprom.png
similarity index 100%
rename from companion/src/themes/new/24/read_eeprom.png
rename to companion/src/themes/yerico/24/read_eeprom.png
diff --git a/companion/src/themes/new/24/read_eeprom_file.png b/companion/src/themes/yerico/24/read_eeprom_file.png
similarity index 100%
rename from companion/src/themes/new/24/read_eeprom_file.png
rename to companion/src/themes/yerico/24/read_eeprom_file.png
diff --git a/companion/src/themes/new/24/read_flash.png b/companion/src/themes/yerico/24/read_flash.png
similarity index 100%
rename from companion/src/themes/new/24/read_flash.png
rename to companion/src/themes/yerico/24/read_flash.png
diff --git a/companion/src/themes/new/24/recentdocument.png b/companion/src/themes/yerico/24/recentdocument.png
similarity index 100%
rename from companion/src/themes/new/24/recentdocument.png
rename to companion/src/themes/yerico/24/recentdocument.png
diff --git a/companion/src/themes/new/24/save.png b/companion/src/themes/yerico/24/save.png
similarity index 100%
rename from companion/src/themes/new/24/save.png
rename to companion/src/themes/yerico/24/save.png
diff --git a/companion/src/themes/new/24/saveas.png b/companion/src/themes/yerico/24/saveas.png
similarity index 100%
rename from companion/src/themes/new/24/saveas.png
rename to companion/src/themes/yerico/24/saveas.png
diff --git a/companion/src/themes/new/24/simulate.png b/companion/src/themes/yerico/24/simulate.png
similarity index 100%
rename from companion/src/themes/new/24/simulate.png
rename to companion/src/themes/yerico/24/simulate.png
diff --git a/companion/src/themes/new/24/stop.png b/companion/src/themes/yerico/24/stop.png
similarity index 100%
rename from companion/src/themes/new/24/stop.png
rename to companion/src/themes/yerico/24/stop.png
diff --git a/companion/src/themes/new/24/update.png b/companion/src/themes/yerico/24/update.png
similarity index 100%
rename from companion/src/themes/new/24/update.png
rename to companion/src/themes/yerico/24/update.png
diff --git a/companion/src/themes/new/24/wizard.png b/companion/src/themes/yerico/24/wizard.png
similarity index 100%
rename from companion/src/themes/new/24/wizard.png
rename to companion/src/themes/yerico/24/wizard.png
diff --git a/companion/src/themes/new/24/write_eeprom.png b/companion/src/themes/yerico/24/write_eeprom.png
similarity index 100%
rename from companion/src/themes/new/24/write_eeprom.png
rename to companion/src/themes/yerico/24/write_eeprom.png
diff --git a/companion/src/themes/new/24/write_eeprom_file.png b/companion/src/themes/yerico/24/write_eeprom_file.png
similarity index 100%
rename from companion/src/themes/new/24/write_eeprom_file.png
rename to companion/src/themes/yerico/24/write_eeprom_file.png
diff --git a/companion/src/themes/new/24/write_flash.png b/companion/src/themes/yerico/24/write_flash.png
similarity index 100%
rename from companion/src/themes/new/24/write_flash.png
rename to companion/src/themes/yerico/24/write_flash.png
diff --git a/companion/src/themes/new/32/add.png b/companion/src/themes/yerico/32/add.png
similarity index 100%
rename from companion/src/themes/new/32/add.png
rename to companion/src/themes/yerico/32/add.png
diff --git a/companion/src/themes/new/32/apppreferences.png b/companion/src/themes/yerico/32/apppreferences.png
similarity index 100%
rename from companion/src/themes/new/32/apppreferences.png
rename to companion/src/themes/yerico/32/apppreferences.png
diff --git a/companion/src/themes/new/32/arrow-left.png b/companion/src/themes/yerico/32/arrow-left.png
similarity index 100%
rename from companion/src/themes/new/32/arrow-left.png
rename to companion/src/themes/yerico/32/arrow-left.png
diff --git a/companion/src/themes/new/32/arrow-right.png b/companion/src/themes/yerico/32/arrow-right.png
similarity index 100%
rename from companion/src/themes/new/32/arrow-right.png
rename to companion/src/themes/yerico/32/arrow-right.png
diff --git a/companion/src/themes/new/32/changelog.png b/companion/src/themes/yerico/32/changelog.png
similarity index 100%
rename from companion/src/themes/new/32/changelog.png
rename to companion/src/themes/yerico/32/changelog.png
diff --git a/companion/src/themes/new/32/clear.png b/companion/src/themes/yerico/32/clear.png
similarity index 100%
rename from companion/src/themes/new/32/clear.png
rename to companion/src/themes/yerico/32/clear.png
diff --git a/companion/src/themes/yerico/32/compare.png b/companion/src/themes/yerico/32/compare.png
new file mode 100644
index 000000000..ca22cbda2
Binary files /dev/null and b/companion/src/themes/yerico/32/compare.png differ
diff --git a/companion/src/themes/yerico/32/configure.png b/companion/src/themes/yerico/32/configure.png
new file mode 100644
index 000000000..b43651d4e
Binary files /dev/null and b/companion/src/themes/yerico/32/configure.png differ
diff --git a/companion/src/themes/new/32/contributors.png b/companion/src/themes/yerico/32/contributors.png
similarity index 100%
rename from companion/src/themes/new/32/contributors.png
rename to companion/src/themes/yerico/32/contributors.png
diff --git a/companion/src/themes/new/32/copy.png b/companion/src/themes/yerico/32/copy.png
similarity index 100%
rename from companion/src/themes/new/32/copy.png
rename to companion/src/themes/yerico/32/copy.png
diff --git a/companion/src/themes/new/32/currentmodel.png b/companion/src/themes/yerico/32/currentmodel.png
similarity index 100%
rename from companion/src/themes/new/32/currentmodel.png
rename to companion/src/themes/yerico/32/currentmodel.png
diff --git a/companion/src/themes/new/32/cut.png b/companion/src/themes/yerico/32/cut.png
similarity index 100%
rename from companion/src/themes/new/32/cut.png
rename to companion/src/themes/yerico/32/cut.png
diff --git a/companion/src/themes/new/32/duplicate.png b/companion/src/themes/yerico/32/duplicate.png
similarity index 100%
rename from companion/src/themes/new/32/duplicate.png
rename to companion/src/themes/yerico/32/duplicate.png
diff --git a/companion/src/themes/new/32/edit.png b/companion/src/themes/yerico/32/edit.png
similarity index 100%
rename from companion/src/themes/new/32/edit.png
rename to companion/src/themes/yerico/32/edit.png
diff --git a/companion/src/themes/new/32/exit.png b/companion/src/themes/yerico/32/exit.png
similarity index 100%
rename from companion/src/themes/new/32/exit.png
rename to companion/src/themes/yerico/32/exit.png
diff --git a/companion/src/themes/new/32/fuses.png b/companion/src/themes/yerico/32/fuses.png
similarity index 100%
rename from companion/src/themes/new/32/fuses.png
rename to companion/src/themes/yerico/32/fuses.png
diff --git a/companion/src/themes/new/32/fwpreferences.png b/companion/src/themes/yerico/32/fwpreferences.png
similarity index 100%
rename from companion/src/themes/new/32/fwpreferences.png
rename to companion/src/themes/yerico/32/fwpreferences.png
diff --git a/companion/src/themes/new/32/information.png b/companion/src/themes/yerico/32/information.png
similarity index 100%
rename from companion/src/themes/new/32/information.png
rename to companion/src/themes/yerico/32/information.png
diff --git a/companion/src/themes/new/32/library.png b/companion/src/themes/yerico/32/library.png
similarity index 100%
rename from companion/src/themes/new/32/library.png
rename to companion/src/themes/yerico/32/library.png
diff --git a/companion/src/themes/new/32/list.png b/companion/src/themes/yerico/32/list.png
similarity index 100%
rename from companion/src/themes/new/32/list.png
rename to companion/src/themes/yerico/32/list.png
diff --git a/companion/src/themes/new/32/logs.png b/companion/src/themes/yerico/32/logs.png
similarity index 100%
rename from companion/src/themes/new/32/logs.png
rename to companion/src/themes/yerico/32/logs.png
diff --git a/companion/src/themes/new/32/movedown.png b/companion/src/themes/yerico/32/movedown.png
similarity index 100%
rename from companion/src/themes/new/32/movedown.png
rename to companion/src/themes/yerico/32/movedown.png
diff --git a/companion/src/themes/new/32/moveup.png b/companion/src/themes/yerico/32/moveup.png
similarity index 100%
rename from companion/src/themes/new/32/moveup.png
rename to companion/src/themes/yerico/32/moveup.png
diff --git a/companion/src/themes/new/32/new.png b/companion/src/themes/yerico/32/new.png
similarity index 100%
rename from companion/src/themes/new/32/new.png
rename to companion/src/themes/yerico/32/new.png
diff --git a/companion/src/themes/new/32/open.png b/companion/src/themes/yerico/32/open.png
similarity index 100%
rename from companion/src/themes/new/32/open.png
rename to companion/src/themes/yerico/32/open.png
diff --git a/companion/src/themes/new/32/paintbrush.png b/companion/src/themes/yerico/32/paintbrush.png
similarity index 100%
rename from companion/src/themes/new/32/paintbrush.png
rename to companion/src/themes/yerico/32/paintbrush.png
diff --git a/companion/src/themes/new/32/paste.png b/companion/src/themes/yerico/32/paste.png
similarity index 100%
rename from companion/src/themes/new/32/paste.png
rename to companion/src/themes/yerico/32/paste.png
diff --git a/companion/src/themes/new/32/play.png b/companion/src/themes/yerico/32/play.png
similarity index 100%
rename from companion/src/themes/new/32/play.png
rename to companion/src/themes/yerico/32/play.png
diff --git a/companion/src/themes/new/32/print.png b/companion/src/themes/yerico/32/print.png
similarity index 100%
rename from companion/src/themes/new/32/print.png
rename to companion/src/themes/yerico/32/print.png
diff --git a/companion/src/themes/new/32/profiles.png b/companion/src/themes/yerico/32/profiles.png
similarity index 100%
rename from companion/src/themes/new/32/profiles.png
rename to companion/src/themes/yerico/32/profiles.png
diff --git a/companion/src/themes/yerico/32/read_eeprom.png b/companion/src/themes/yerico/32/read_eeprom.png
new file mode 100644
index 000000000..371c1cab8
Binary files /dev/null and b/companion/src/themes/yerico/32/read_eeprom.png differ
diff --git a/companion/src/themes/yerico/32/read_eeprom_file.png b/companion/src/themes/yerico/32/read_eeprom_file.png
new file mode 100644
index 000000000..2e3516df1
Binary files /dev/null and b/companion/src/themes/yerico/32/read_eeprom_file.png differ
diff --git a/companion/src/themes/yerico/32/read_flash.png b/companion/src/themes/yerico/32/read_flash.png
new file mode 100644
index 000000000..6aef83a4b
Binary files /dev/null and b/companion/src/themes/yerico/32/read_flash.png differ
diff --git a/companion/src/themes/new/32/recentdocument.png b/companion/src/themes/yerico/32/recentdocument.png
similarity index 100%
rename from companion/src/themes/new/32/recentdocument.png
rename to companion/src/themes/yerico/32/recentdocument.png
diff --git a/companion/src/themes/yerico/32/save.png b/companion/src/themes/yerico/32/save.png
new file mode 100644
index 000000000..c9e3e71f9
Binary files /dev/null and b/companion/src/themes/yerico/32/save.png differ
diff --git a/companion/src/themes/new/32/saveas.png b/companion/src/themes/yerico/32/saveas.png
similarity index 100%
rename from companion/src/themes/new/32/saveas.png
rename to companion/src/themes/yerico/32/saveas.png
diff --git a/companion/src/themes/new/32/simulate.png b/companion/src/themes/yerico/32/simulate.png
similarity index 100%
rename from companion/src/themes/new/32/simulate.png
rename to companion/src/themes/yerico/32/simulate.png
diff --git a/companion/src/themes/new/32/stop.png b/companion/src/themes/yerico/32/stop.png
similarity index 100%
rename from companion/src/themes/new/32/stop.png
rename to companion/src/themes/yerico/32/stop.png
diff --git a/companion/src/themes/new/32/update.png b/companion/src/themes/yerico/32/update.png
similarity index 100%
rename from companion/src/themes/new/32/update.png
rename to companion/src/themes/yerico/32/update.png
diff --git a/companion/src/themes/new/32/wizard.png b/companion/src/themes/yerico/32/wizard.png
similarity index 100%
rename from companion/src/themes/new/32/wizard.png
rename to companion/src/themes/yerico/32/wizard.png
diff --git a/companion/src/themes/yerico/32/write_eeprom.png b/companion/src/themes/yerico/32/write_eeprom.png
new file mode 100644
index 000000000..e7bc975a6
Binary files /dev/null and b/companion/src/themes/yerico/32/write_eeprom.png differ
diff --git a/companion/src/themes/yerico/32/write_eeprom_file.png b/companion/src/themes/yerico/32/write_eeprom_file.png
new file mode 100644
index 000000000..65728a70a
Binary files /dev/null and b/companion/src/themes/yerico/32/write_eeprom_file.png differ
diff --git a/companion/src/themes/yerico/32/write_flash.png b/companion/src/themes/yerico/32/write_flash.png
new file mode 100644
index 000000000..71d8b1056
Binary files /dev/null and b/companion/src/themes/yerico/32/write_flash.png differ
diff --git a/companion/src/themes/new/48/add.png b/companion/src/themes/yerico/48/add.png
similarity index 100%
rename from companion/src/themes/new/48/add.png
rename to companion/src/themes/yerico/48/add.png
diff --git a/companion/src/themes/new/48/apppreferences.png b/companion/src/themes/yerico/48/apppreferences.png
similarity index 100%
rename from companion/src/themes/new/48/apppreferences.png
rename to companion/src/themes/yerico/48/apppreferences.png
diff --git a/companion/src/themes/new/48/arrow-left.png b/companion/src/themes/yerico/48/arrow-left.png
similarity index 100%
rename from companion/src/themes/new/48/arrow-left.png
rename to companion/src/themes/yerico/48/arrow-left.png
diff --git a/companion/src/themes/new/48/arrow-right.png b/companion/src/themes/yerico/48/arrow-right.png
similarity index 100%
rename from companion/src/themes/new/48/arrow-right.png
rename to companion/src/themes/yerico/48/arrow-right.png
diff --git a/companion/src/themes/new/48/changelog.png b/companion/src/themes/yerico/48/changelog.png
similarity index 100%
rename from companion/src/themes/new/48/changelog.png
rename to companion/src/themes/yerico/48/changelog.png
diff --git a/companion/src/themes/new/48/clear.png b/companion/src/themes/yerico/48/clear.png
similarity index 100%
rename from companion/src/themes/new/48/clear.png
rename to companion/src/themes/yerico/48/clear.png
diff --git a/companion/src/themes/new/48/compare.png b/companion/src/themes/yerico/48/compare.png
similarity index 100%
rename from companion/src/themes/new/48/compare.png
rename to companion/src/themes/yerico/48/compare.png
diff --git a/companion/src/themes/new/48/configure.png b/companion/src/themes/yerico/48/configure.png
similarity index 100%
rename from companion/src/themes/new/48/configure.png
rename to companion/src/themes/yerico/48/configure.png
diff --git a/companion/src/themes/new/48/contributors.png b/companion/src/themes/yerico/48/contributors.png
similarity index 100%
rename from companion/src/themes/new/48/contributors.png
rename to companion/src/themes/yerico/48/contributors.png
diff --git a/companion/src/themes/new/48/copy.png b/companion/src/themes/yerico/48/copy.png
similarity index 100%
rename from companion/src/themes/new/48/copy.png
rename to companion/src/themes/yerico/48/copy.png
diff --git a/companion/src/themes/new/48/currentmodel.png b/companion/src/themes/yerico/48/currentmodel.png
similarity index 100%
rename from companion/src/themes/new/48/currentmodel.png
rename to companion/src/themes/yerico/48/currentmodel.png
diff --git a/companion/src/themes/new/48/cut.png b/companion/src/themes/yerico/48/cut.png
similarity index 100%
rename from companion/src/themes/new/48/cut.png
rename to companion/src/themes/yerico/48/cut.png
diff --git a/companion/src/themes/new/48/duplicate.png b/companion/src/themes/yerico/48/duplicate.png
similarity index 100%
rename from companion/src/themes/new/48/duplicate.png
rename to companion/src/themes/yerico/48/duplicate.png
diff --git a/companion/src/themes/new/48/edit.png b/companion/src/themes/yerico/48/edit.png
similarity index 100%
rename from companion/src/themes/new/48/edit.png
rename to companion/src/themes/yerico/48/edit.png
diff --git a/companion/src/themes/new/48/exit.png b/companion/src/themes/yerico/48/exit.png
similarity index 100%
rename from companion/src/themes/new/48/exit.png
rename to companion/src/themes/yerico/48/exit.png
diff --git a/companion/src/themes/new/48/fuses.png b/companion/src/themes/yerico/48/fuses.png
similarity index 100%
rename from companion/src/themes/new/48/fuses.png
rename to companion/src/themes/yerico/48/fuses.png
diff --git a/companion/src/themes/new/48/fwpreferences.png b/companion/src/themes/yerico/48/fwpreferences.png
similarity index 100%
rename from companion/src/themes/new/48/fwpreferences.png
rename to companion/src/themes/yerico/48/fwpreferences.png
diff --git a/companion/src/themes/new/48/information.png b/companion/src/themes/yerico/48/information.png
similarity index 100%
rename from companion/src/themes/new/48/information.png
rename to companion/src/themes/yerico/48/information.png
diff --git a/companion/src/themes/new/48/library.png b/companion/src/themes/yerico/48/library.png
similarity index 100%
rename from companion/src/themes/new/48/library.png
rename to companion/src/themes/yerico/48/library.png
diff --git a/companion/src/themes/new/48/list.png b/companion/src/themes/yerico/48/list.png
similarity index 100%
rename from companion/src/themes/new/48/list.png
rename to companion/src/themes/yerico/48/list.png
diff --git a/companion/src/themes/new/48/logs.png b/companion/src/themes/yerico/48/logs.png
similarity index 100%
rename from companion/src/themes/new/48/logs.png
rename to companion/src/themes/yerico/48/logs.png
diff --git a/companion/src/themes/new/48/movedown.png b/companion/src/themes/yerico/48/movedown.png
similarity index 100%
rename from companion/src/themes/new/48/movedown.png
rename to companion/src/themes/yerico/48/movedown.png
diff --git a/companion/src/themes/new/48/moveup.png b/companion/src/themes/yerico/48/moveup.png
similarity index 100%
rename from companion/src/themes/new/48/moveup.png
rename to companion/src/themes/yerico/48/moveup.png
diff --git a/companion/src/themes/new/48/new.png b/companion/src/themes/yerico/48/new.png
similarity index 100%
rename from companion/src/themes/new/48/new.png
rename to companion/src/themes/yerico/48/new.png
diff --git a/companion/src/themes/new/48/open.png b/companion/src/themes/yerico/48/open.png
similarity index 100%
rename from companion/src/themes/new/48/open.png
rename to companion/src/themes/yerico/48/open.png
diff --git a/companion/src/themes/new/48/paintbrush.png b/companion/src/themes/yerico/48/paintbrush.png
similarity index 100%
rename from companion/src/themes/new/48/paintbrush.png
rename to companion/src/themes/yerico/48/paintbrush.png
diff --git a/companion/src/themes/new/48/paste.png b/companion/src/themes/yerico/48/paste.png
similarity index 100%
rename from companion/src/themes/new/48/paste.png
rename to companion/src/themes/yerico/48/paste.png
diff --git a/companion/src/themes/new/48/play.png b/companion/src/themes/yerico/48/play.png
similarity index 100%
rename from companion/src/themes/new/48/play.png
rename to companion/src/themes/yerico/48/play.png
diff --git a/companion/src/themes/new/48/print.png b/companion/src/themes/yerico/48/print.png
similarity index 100%
rename from companion/src/themes/new/48/print.png
rename to companion/src/themes/yerico/48/print.png
diff --git a/companion/src/themes/new/48/profiles.png b/companion/src/themes/yerico/48/profiles.png
similarity index 100%
rename from companion/src/themes/new/48/profiles.png
rename to companion/src/themes/yerico/48/profiles.png
diff --git a/companion/src/themes/new/48/read_eeprom.png b/companion/src/themes/yerico/48/read_eeprom.png
similarity index 100%
rename from companion/src/themes/new/48/read_eeprom.png
rename to companion/src/themes/yerico/48/read_eeprom.png
diff --git a/companion/src/themes/new/48/read_eeprom_file.png b/companion/src/themes/yerico/48/read_eeprom_file.png
similarity index 100%
rename from companion/src/themes/new/48/read_eeprom_file.png
rename to companion/src/themes/yerico/48/read_eeprom_file.png
diff --git a/companion/src/themes/new/48/read_flash.png b/companion/src/themes/yerico/48/read_flash.png
similarity index 100%
rename from companion/src/themes/new/48/read_flash.png
rename to companion/src/themes/yerico/48/read_flash.png
diff --git a/companion/src/themes/new/48/recentdocument.png b/companion/src/themes/yerico/48/recentdocument.png
similarity index 100%
rename from companion/src/themes/new/48/recentdocument.png
rename to companion/src/themes/yerico/48/recentdocument.png
diff --git a/companion/src/themes/new/48/save.png b/companion/src/themes/yerico/48/save.png
similarity index 100%
rename from companion/src/themes/new/48/save.png
rename to companion/src/themes/yerico/48/save.png
diff --git a/companion/src/themes/new/48/saveas.png b/companion/src/themes/yerico/48/saveas.png
similarity index 100%
rename from companion/src/themes/new/48/saveas.png
rename to companion/src/themes/yerico/48/saveas.png
diff --git a/companion/src/themes/new/48/simulate.png b/companion/src/themes/yerico/48/simulate.png
similarity index 100%
rename from companion/src/themes/new/48/simulate.png
rename to companion/src/themes/yerico/48/simulate.png
diff --git a/companion/src/themes/new/48/stop.png b/companion/src/themes/yerico/48/stop.png
similarity index 100%
rename from companion/src/themes/new/48/stop.png
rename to companion/src/themes/yerico/48/stop.png
diff --git a/companion/src/themes/new/48/update.png b/companion/src/themes/yerico/48/update.png
similarity index 100%
rename from companion/src/themes/new/48/update.png
rename to companion/src/themes/yerico/48/update.png
diff --git a/companion/src/themes/new/48/wizard.png b/companion/src/themes/yerico/48/wizard.png
similarity index 100%
rename from companion/src/themes/new/48/wizard.png
rename to companion/src/themes/yerico/48/wizard.png
diff --git a/companion/src/themes/new/48/write_eeprom.png b/companion/src/themes/yerico/48/write_eeprom.png
similarity index 100%
rename from companion/src/themes/new/48/write_eeprom.png
rename to companion/src/themes/yerico/48/write_eeprom.png
diff --git a/companion/src/themes/new/48/write_eeprom_file.png b/companion/src/themes/yerico/48/write_eeprom_file.png
similarity index 100%
rename from companion/src/themes/new/48/write_eeprom_file.png
rename to companion/src/themes/yerico/48/write_eeprom_file.png
diff --git a/companion/src/themes/new/48/write_flash.png b/companion/src/themes/yerico/48/write_flash.png
similarity index 100%
rename from companion/src/themes/new/48/write_flash.png
rename to companion/src/themes/yerico/48/write_flash.png