diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc
index 832e5ef2f..1c4550d1a 100644
--- a/companion/src/companion.qrc
+++ b/companion/src/companion.qrc
@@ -981,177 +981,177 @@
themes/monowhite/48/contributors.png
themes/monowhite/48/stop.png
themes/monowhite/48/write_eeprom.png
- themes/new/16/paintbrush.png
- themes/new/16/open.png
- themes/new/16/edit.png
- themes/new/16/information.png
- themes/new/16/configure.png
- themes/new/16/list.png
- themes/new/16/wizard.png
- themes/new/16/logs.png
- themes/new/16/new.png
- themes/new/16/save.png
- themes/new/16/recentdocument.png
- themes/new/16/simulate.png
- themes/new/16/changelog.png
- themes/new/16/copy.png
- themes/new/16/write_flash.png
- themes/new/16/read_eeprom_file.png
- themes/new/16/clear.png
- themes/new/16/play.png
- themes/new/16/fuses.png
- themes/new/16/arrow-right.png
- themes/new/16/exit.png
- themes/new/16/moveup.png
- themes/new/16/read_eeprom.png
- themes/new/16/cut.png
- themes/new/16/arrow-left.png
- themes/new/16/write_eeprom_file.png
- themes/new/16/library.png
- themes/new/16/profiles.png
- themes/new/16/paste.png
- themes/new/16/print.png
- themes/new/16/compare.png
- themes/new/16/saveas.png
- themes/new/16/apppreferences.png
- themes/new/16/fwpreferences.png
- themes/new/16/movedown.png
- themes/new/16/currentmodel.png
- themes/new/16/read_flash.png
- themes/new/16/duplicate.png
- themes/new/16/add.png
- themes/new/16/update.png
- themes/new/16/contributors.png
- themes/new/16/stop.png
- themes/new/16/write_eeprom.png
- themes/new/24/paintbrush.png
- themes/new/24/open.png
- themes/new/24/edit.png
- themes/new/24/information.png
- themes/new/24/configure.png
- themes/new/24/list.png
- themes/new/24/wizard.png
- themes/new/24/logs.png
- themes/new/24/new.png
- themes/new/24/save.png
- themes/new/24/recentdocument.png
- themes/new/24/simulate.png
- themes/new/24/changelog.png
- themes/new/24/copy.png
- themes/new/24/write_flash.png
- themes/new/24/read_eeprom_file.png
- themes/new/24/clear.png
- themes/new/24/play.png
- themes/new/24/fuses.png
- themes/new/24/arrow-right.png
- themes/new/24/exit.png
- themes/new/24/moveup.png
- themes/new/24/read_eeprom.png
- themes/new/24/cut.png
- themes/new/24/arrow-left.png
- themes/new/24/write_eeprom_file.png
- themes/new/24/library.png
- themes/new/24/profiles.png
- themes/new/24/paste.png
- themes/new/24/print.png
- themes/new/24/compare.png
- themes/new/24/saveas.png
- themes/new/24/apppreferences.png
- themes/new/24/fwpreferences.png
- themes/new/24/movedown.png
- themes/new/24/currentmodel.png
- themes/new/24/read_flash.png
- themes/new/24/duplicate.png
- themes/new/24/add.png
- themes/new/24/update.png
- themes/new/24/contributors.png
- themes/new/24/stop.png
- themes/new/24/write_eeprom.png
- themes/new/32/paintbrush.png
- themes/new/32/open.png
- themes/new/32/edit.png
- themes/new/32/information.png
- themes/new/32/configure.png
- themes/new/32/list.png
- themes/new/32/wizard.png
- themes/new/32/logs.png
- themes/new/32/new.png
- themes/new/32/save.png
- themes/new/32/recentdocument.png
- themes/new/32/simulate.png
- themes/new/32/changelog.png
- themes/new/32/copy.png
- themes/new/32/write_flash.png
- themes/new/32/read_eeprom_file.png
- themes/new/32/clear.png
- themes/new/32/play.png
- themes/new/32/fuses.png
- themes/new/32/arrow-right.png
- themes/new/32/exit.png
- themes/new/32/moveup.png
- themes/new/32/read_eeprom.png
- themes/new/32/cut.png
- themes/new/32/arrow-left.png
- themes/new/32/write_eeprom_file.png
- themes/new/32/library.png
- themes/new/32/profiles.png
- themes/new/32/paste.png
- themes/new/32/print.png
- themes/new/32/compare.png
- themes/new/32/saveas.png
- themes/new/32/apppreferences.png
- themes/new/32/fwpreferences.png
- themes/new/32/movedown.png
- themes/new/32/currentmodel.png
- themes/new/32/read_flash.png
- themes/new/32/duplicate.png
- themes/new/32/add.png
- themes/new/32/update.png
- themes/new/32/contributors.png
- themes/new/32/stop.png
- themes/new/32/write_eeprom.png
- themes/new/48/paintbrush.png
- themes/new/48/open.png
- themes/new/48/edit.png
- themes/new/48/information.png
- themes/new/48/configure.png
- themes/new/48/list.png
- themes/new/48/wizard.png
- themes/new/48/logs.png
- themes/new/48/new.png
- themes/new/48/save.png
- themes/new/48/recentdocument.png
- themes/new/48/simulate.png
- themes/new/48/changelog.png
- themes/new/48/copy.png
- themes/new/48/write_flash.png
- themes/new/48/read_eeprom_file.png
- themes/new/48/clear.png
- themes/new/48/play.png
- themes/new/48/fuses.png
- themes/new/48/arrow-right.png
- themes/new/48/exit.png
- themes/new/48/moveup.png
- themes/new/48/read_eeprom.png
- themes/new/48/cut.png
- themes/new/48/arrow-left.png
- themes/new/48/write_eeprom_file.png
- themes/new/48/library.png
- themes/new/48/profiles.png
- themes/new/48/paste.png
- themes/new/48/print.png
- themes/new/48/compare.png
- themes/new/48/saveas.png
- themes/new/48/apppreferences.png
- themes/new/48/fwpreferences.png
- themes/new/48/movedown.png
- themes/new/48/currentmodel.png
- themes/new/48/read_flash.png
- themes/new/48/duplicate.png
- themes/new/48/add.png
- themes/new/48/update.png
- themes/new/48/contributors.png
- themes/new/48/stop.png
- themes/new/48/write_eeprom.png
+ themes/yerico/16/paintbrush.png
+ themes/yerico/16/open.png
+ themes/yerico/16/edit.png
+ themes/yerico/16/information.png
+ themes/yerico/16/configure.png
+ themes/yerico/16/list.png
+ themes/yerico/16/wizard.png
+ themes/yerico/16/logs.png
+ themes/yerico/16/new.png
+ themes/yerico/16/save.png
+ themes/yerico/16/recentdocument.png
+ themes/yerico/16/simulate.png
+ themes/yerico/16/changelog.png
+ themes/yerico/16/copy.png
+ themes/yerico/16/write_flash.png
+ themes/yerico/16/read_eeprom_file.png
+ themes/yerico/16/clear.png
+ themes/yerico/16/play.png
+ themes/yerico/16/fuses.png
+ themes/yerico/16/arrow-right.png
+ themes/yerico/16/exit.png
+ themes/yerico/16/moveup.png
+ themes/yerico/16/read_eeprom.png
+ themes/yerico/16/cut.png
+ themes/yerico/16/arrow-left.png
+ themes/yerico/16/write_eeprom_file.png
+ themes/yerico/16/library.png
+ themes/yerico/16/profiles.png
+ themes/yerico/16/paste.png
+ themes/yerico/16/print.png
+ themes/yerico/16/compare.png
+ themes/yerico/16/saveas.png
+ themes/yerico/16/apppreferences.png
+ themes/yerico/16/fwpreferences.png
+ themes/yerico/16/movedown.png
+ themes/yerico/16/currentmodel.png
+ themes/yerico/16/read_flash.png
+ themes/yerico/16/duplicate.png
+ themes/yerico/16/add.png
+ themes/yerico/16/update.png
+ themes/yerico/16/contributors.png
+ themes/yerico/16/stop.png
+ themes/yerico/16/write_eeprom.png
+ themes/yerico/24/paintbrush.png
+ themes/yerico/24/open.png
+ themes/yerico/24/edit.png
+ themes/yerico/24/information.png
+ themes/yerico/24/configure.png
+ themes/yerico/24/list.png
+ themes/yerico/24/wizard.png
+ themes/yerico/24/logs.png
+ themes/yerico/24/new.png
+ themes/yerico/24/save.png
+ themes/yerico/24/recentdocument.png
+ themes/yerico/24/simulate.png
+ themes/yerico/24/changelog.png
+ themes/yerico/24/copy.png
+ themes/yerico/24/write_flash.png
+ themes/yerico/24/read_eeprom_file.png
+ themes/yerico/24/clear.png
+ themes/yerico/24/play.png
+ themes/yerico/24/fuses.png
+ themes/yerico/24/arrow-right.png
+ themes/yerico/24/exit.png
+ themes/yerico/24/moveup.png
+ themes/yerico/24/read_eeprom.png
+ themes/yerico/24/cut.png
+ themes/yerico/24/arrow-left.png
+ themes/yerico/24/write_eeprom_file.png
+ themes/yerico/24/library.png
+ themes/yerico/24/profiles.png
+ themes/yerico/24/paste.png
+ themes/yerico/24/print.png
+ themes/yerico/24/compare.png
+ themes/yerico/24/saveas.png
+ themes/yerico/24/apppreferences.png
+ themes/yerico/24/fwpreferences.png
+ themes/yerico/24/movedown.png
+ themes/yerico/24/currentmodel.png
+ themes/yerico/24/read_flash.png
+ themes/yerico/24/duplicate.png
+ themes/yerico/24/add.png
+ themes/yerico/24/update.png
+ themes/yerico/24/contributors.png
+ themes/yerico/24/stop.png
+ themes/yerico/24/write_eeprom.png
+ themes/yerico/32/paintbrush.png
+ themes/yerico/32/open.png
+ themes/yerico/32/edit.png
+ themes/yerico/32/information.png
+ themes/yerico/32/configure.png
+ themes/yerico/32/list.png
+ themes/yerico/32/wizard.png
+ themes/yerico/32/logs.png
+ themes/yerico/32/new.png
+ themes/yerico/32/save.png
+ themes/yerico/32/recentdocument.png
+ themes/yerico/32/simulate.png
+ themes/yerico/32/changelog.png
+ themes/yerico/32/copy.png
+ themes/yerico/32/write_flash.png
+ themes/yerico/32/read_eeprom_file.png
+ themes/yerico/32/clear.png
+ themes/yerico/32/play.png
+ themes/yerico/32/fuses.png
+ themes/yerico/32/arrow-right.png
+ themes/yerico/32/exit.png
+ themes/yerico/32/moveup.png
+ themes/yerico/32/read_eeprom.png
+ themes/yerico/32/cut.png
+ themes/yerico/32/arrow-left.png
+ themes/yerico/32/write_eeprom_file.png
+ themes/yerico/32/library.png
+ themes/yerico/32/profiles.png
+ themes/yerico/32/paste.png
+ themes/yerico/32/print.png
+ themes/yerico/32/compare.png
+ themes/yerico/32/saveas.png
+ themes/yerico/32/apppreferences.png
+ themes/yerico/32/fwpreferences.png
+ themes/yerico/32/movedown.png
+ themes/yerico/32/currentmodel.png
+ themes/yerico/32/read_flash.png
+ themes/yerico/32/duplicate.png
+ themes/yerico/32/add.png
+ themes/yerico/32/update.png
+ themes/yerico/32/contributors.png
+ themes/yerico/32/stop.png
+ themes/yerico/32/write_eeprom.png
+ themes/yerico/48/paintbrush.png
+ themes/yerico/48/open.png
+ themes/yerico/48/edit.png
+ themes/yerico/48/information.png
+ themes/yerico/48/configure.png
+ themes/yerico/48/list.png
+ themes/yerico/48/wizard.png
+ themes/yerico/48/logs.png
+ themes/yerico/48/new.png
+ themes/yerico/48/save.png
+ themes/yerico/48/recentdocument.png
+ themes/yerico/48/simulate.png
+ themes/yerico/48/changelog.png
+ themes/yerico/48/copy.png
+ themes/yerico/48/write_flash.png
+ themes/yerico/48/read_eeprom_file.png
+ themes/yerico/48/clear.png
+ themes/yerico/48/play.png
+ themes/yerico/48/fuses.png
+ themes/yerico/48/arrow-right.png
+ themes/yerico/48/exit.png
+ themes/yerico/48/moveup.png
+ themes/yerico/48/read_eeprom.png
+ themes/yerico/48/cut.png
+ themes/yerico/48/arrow-left.png
+ themes/yerico/48/write_eeprom_file.png
+ themes/yerico/48/library.png
+ themes/yerico/48/profiles.png
+ themes/yerico/48/paste.png
+ themes/yerico/48/print.png
+ themes/yerico/48/compare.png
+ themes/yerico/48/saveas.png
+ themes/yerico/48/apppreferences.png
+ themes/yerico/48/fwpreferences.png
+ themes/yerico/48/movedown.png
+ themes/yerico/48/currentmodel.png
+ themes/yerico/48/read_flash.png
+ themes/yerico/48/duplicate.png
+ themes/yerico/48/add.png
+ themes/yerico/48/update.png
+ themes/yerico/48/contributors.png
+ themes/yerico/48/stop.png
+ themes/yerico/48/write_eeprom.png
diff --git a/companion/src/helpers.cpp b/companion/src/helpers.cpp
index 2f1f3a650..2cc30f22e 100644
--- a/companion/src/helpers.cpp
+++ b/companion/src/helpers.cpp
@@ -930,7 +930,7 @@ QString getTheme()
Theme="monoblue";
break;
default:
- Theme="new";
+ Theme="yerico";
break;
}
return Theme;
diff --git a/companion/src/images/originals/icons New/apppreferences.png b/companion/src/images/originals/icons New/apppreferences.png
deleted file mode 100644
index 597a9f68d..000000000
Binary files a/companion/src/images/originals/icons New/apppreferences.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/compare.png b/companion/src/images/originals/icons New/compare.png
deleted file mode 100644
index 5b7e41c4f..000000000
Binary files a/companion/src/images/originals/icons New/compare.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/configure.png b/companion/src/images/originals/icons New/configure.png
deleted file mode 100644
index ec6fad759..000000000
Binary files a/companion/src/images/originals/icons New/configure.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/copy.png b/companion/src/images/originals/icons New/copy.png
deleted file mode 100644
index 49e9835c0..000000000
Binary files a/companion/src/images/originals/icons New/copy.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/cut.png b/companion/src/images/originals/icons New/cut.png
deleted file mode 100644
index 910dff020..000000000
Binary files a/companion/src/images/originals/icons New/cut.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/fwpreferences.png b/companion/src/images/originals/icons New/fwpreferences.png
deleted file mode 100644
index 7574da86a..000000000
Binary files a/companion/src/images/originals/icons New/fwpreferences.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/information.png b/companion/src/images/originals/icons New/information.png
deleted file mode 100644
index 44c08b858..000000000
Binary files a/companion/src/images/originals/icons New/information.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/logs.png b/companion/src/images/originals/icons New/logs.png
deleted file mode 100644
index 8dc7ce194..000000000
Binary files a/companion/src/images/originals/icons New/logs.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/new.png b/companion/src/images/originals/icons New/new.png
deleted file mode 100644
index 53dd74e30..000000000
Binary files a/companion/src/images/originals/icons New/new.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/open.png b/companion/src/images/originals/icons New/open.png
deleted file mode 100644
index 4bf67c1b0..000000000
Binary files a/companion/src/images/originals/icons New/open.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/paintbrush.png b/companion/src/images/originals/icons New/paintbrush.png
deleted file mode 100644
index 814fdb47e..000000000
Binary files a/companion/src/images/originals/icons New/paintbrush.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/paste.png b/companion/src/images/originals/icons New/paste.png
deleted file mode 100644
index 2198b77c0..000000000
Binary files a/companion/src/images/originals/icons New/paste.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/print.png b/companion/src/images/originals/icons New/print.png
deleted file mode 100644
index 62d994f9e..000000000
Binary files a/companion/src/images/originals/icons New/print.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/profiles.png b/companion/src/images/originals/icons New/profiles.png
deleted file mode 100644
index bfa571cff..000000000
Binary files a/companion/src/images/originals/icons New/profiles.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/read_eeprom.png b/companion/src/images/originals/icons New/read_eeprom.png
deleted file mode 100644
index 08e861b31..000000000
Binary files a/companion/src/images/originals/icons New/read_eeprom.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/read_eeprom_file.png b/companion/src/images/originals/icons New/read_eeprom_file.png
deleted file mode 100644
index 67a41176b..000000000
Binary files a/companion/src/images/originals/icons New/read_eeprom_file.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/read_flash.png b/companion/src/images/originals/icons New/read_flash.png
deleted file mode 100644
index c9065819b..000000000
Binary files a/companion/src/images/originals/icons New/read_flash.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/recentdocument.png b/companion/src/images/originals/icons New/recentdocument.png
deleted file mode 100644
index 87ef05d0e..000000000
Binary files a/companion/src/images/originals/icons New/recentdocument.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/save.png b/companion/src/images/originals/icons New/save.png
deleted file mode 100644
index 20352a4f9..000000000
Binary files a/companion/src/images/originals/icons New/save.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/saveas.png b/companion/src/images/originals/icons New/saveas.png
deleted file mode 100644
index a7d234b20..000000000
Binary files a/companion/src/images/originals/icons New/saveas.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/simulate.png b/companion/src/images/originals/icons New/simulate.png
deleted file mode 100644
index 429e12b9a..000000000
Binary files a/companion/src/images/originals/icons New/simulate.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/update.png b/companion/src/images/originals/icons New/update.png
deleted file mode 100644
index 034ee58e8..000000000
Binary files a/companion/src/images/originals/icons New/update.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/write_eeprom.png b/companion/src/images/originals/icons New/write_eeprom.png
deleted file mode 100644
index 15e58d0a3..000000000
Binary files a/companion/src/images/originals/icons New/write_eeprom.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/write_eeprom_file.png b/companion/src/images/originals/icons New/write_eeprom_file.png
deleted file mode 100644
index 60d7c312e..000000000
Binary files a/companion/src/images/originals/icons New/write_eeprom_file.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/write_flash.png b/companion/src/images/originals/icons New/write_flash.png
deleted file mode 100644
index 1664cb228..000000000
Binary files a/companion/src/images/originals/icons New/write_flash.png and /dev/null differ
diff --git a/companion/src/images/originals/icons New/add.png b/companion/src/images/originals/icons Yerico/add.png
similarity index 100%
rename from companion/src/images/originals/icons New/add.png
rename to companion/src/images/originals/icons Yerico/add.png
diff --git a/companion/src/images/originals/icons New/arrow-left.png b/companion/src/images/originals/icons Yerico/arrow-left.png
similarity index 100%
rename from companion/src/images/originals/icons New/arrow-left.png
rename to companion/src/images/originals/icons Yerico/arrow-left.png
diff --git a/companion/src/images/originals/icons New/arrow-right.png b/companion/src/images/originals/icons Yerico/arrow-right.png
similarity index 100%
rename from companion/src/images/originals/icons New/arrow-right.png
rename to companion/src/images/originals/icons Yerico/arrow-right.png
diff --git a/companion/src/images/originals/icons New/changelog.png b/companion/src/images/originals/icons Yerico/changelog.png
similarity index 100%
rename from companion/src/images/originals/icons New/changelog.png
rename to companion/src/images/originals/icons Yerico/changelog.png
diff --git a/companion/src/images/originals/icons Yerico/clear.png b/companion/src/images/originals/icons Yerico/clear.png
new file mode 100644
index 000000000..1941bedf7
Binary files /dev/null and b/companion/src/images/originals/icons Yerico/clear.png differ
diff --git a/companion/src/images/originals/icons New/contributors.png b/companion/src/images/originals/icons Yerico/contributors.png
similarity index 100%
rename from companion/src/images/originals/icons New/contributors.png
rename to companion/src/images/originals/icons Yerico/contributors.png
diff --git a/companion/src/images/originals/icons New/currentmodel.png b/companion/src/images/originals/icons Yerico/currentmodel.png
similarity index 100%
rename from companion/src/images/originals/icons New/currentmodel.png
rename to companion/src/images/originals/icons Yerico/currentmodel.png
diff --git a/companion/src/images/originals/icons New/duplicate.png b/companion/src/images/originals/icons Yerico/duplicate.png
similarity index 100%
rename from companion/src/images/originals/icons New/duplicate.png
rename to companion/src/images/originals/icons Yerico/duplicate.png
diff --git a/companion/src/images/originals/icons New/edit.png b/companion/src/images/originals/icons Yerico/edit.png
similarity index 100%
rename from companion/src/images/originals/icons New/edit.png
rename to companion/src/images/originals/icons Yerico/edit.png
diff --git a/companion/src/images/originals/icons New/exit.png b/companion/src/images/originals/icons Yerico/exit.png
similarity index 100%
rename from companion/src/images/originals/icons New/exit.png
rename to companion/src/images/originals/icons Yerico/exit.png
diff --git a/companion/src/images/originals/icons New/fuses.png b/companion/src/images/originals/icons Yerico/fuses.png
similarity index 100%
rename from companion/src/images/originals/icons New/fuses.png
rename to companion/src/images/originals/icons Yerico/fuses.png
diff --git a/companion/src/images/originals/icons New/library.png b/companion/src/images/originals/icons Yerico/library.png
similarity index 100%
rename from companion/src/images/originals/icons New/library.png
rename to companion/src/images/originals/icons Yerico/library.png
diff --git a/companion/src/images/originals/icons New/list.png b/companion/src/images/originals/icons Yerico/list.png
similarity index 100%
rename from companion/src/images/originals/icons New/list.png
rename to companion/src/images/originals/icons Yerico/list.png
diff --git a/companion/src/images/originals/icons New/movedown.png b/companion/src/images/originals/icons Yerico/movedown.png
similarity index 100%
rename from companion/src/images/originals/icons New/movedown.png
rename to companion/src/images/originals/icons Yerico/movedown.png
diff --git a/companion/src/images/originals/icons New/moveup.png b/companion/src/images/originals/icons Yerico/moveup.png
similarity index 100%
rename from companion/src/images/originals/icons New/moveup.png
rename to companion/src/images/originals/icons Yerico/moveup.png
diff --git a/companion/src/images/originals/icons New/play.png b/companion/src/images/originals/icons Yerico/play.png
similarity index 100%
rename from companion/src/images/originals/icons New/play.png
rename to companion/src/images/originals/icons Yerico/play.png
diff --git a/companion/src/images/originals/icons New/stop.png b/companion/src/images/originals/icons Yerico/stop.png
similarity index 100%
rename from companion/src/images/originals/icons New/stop.png
rename to companion/src/images/originals/icons Yerico/stop.png
diff --git a/companion/src/images/originals/icons New/switch_dir.png b/companion/src/images/originals/icons Yerico/switch_dir.png
similarity index 100%
rename from companion/src/images/originals/icons New/switch_dir.png
rename to companion/src/images/originals/icons Yerico/switch_dir.png
diff --git a/companion/src/images/originals/icons New/wizard.png b/companion/src/images/originals/icons Yerico/wizard.png
similarity index 100%
rename from companion/src/images/originals/icons New/wizard.png
rename to companion/src/images/originals/icons Yerico/wizard.png
diff --git a/companion/src/images/originals/icons Yerico/yerico_icons_16.svg b/companion/src/images/originals/icons Yerico/yerico_icons_16.svg
new file mode 100644
index 000000000..ff1c2b31a
--- /dev/null
+++ b/companion/src/images/originals/icons Yerico/yerico_icons_16.svg
@@ -0,0 +1,5290 @@
+
+
+
+
diff --git a/companion/src/images/originals/icons Yerico/yerico_icons_24.svg b/companion/src/images/originals/icons Yerico/yerico_icons_24.svg
new file mode 100644
index 000000000..32221c916
--- /dev/null
+++ b/companion/src/images/originals/icons Yerico/yerico_icons_24.svg
@@ -0,0 +1,5677 @@
+
+
+
+
diff --git a/companion/src/images/originals/icons Yerico/yerico_icons_32.svg b/companion/src/images/originals/icons Yerico/yerico_icons_32.svg
new file mode 100644
index 000000000..7e7ac35ba
--- /dev/null
+++ b/companion/src/images/originals/icons Yerico/yerico_icons_32.svg
@@ -0,0 +1,8892 @@
+
+
+
+
diff --git a/companion/src/images/originals/icons Yerico/yerico_icons_48.svg b/companion/src/images/originals/icons Yerico/yerico_icons_48.svg
new file mode 100644
index 000000000..45060b024
--- /dev/null
+++ b/companion/src/images/originals/icons Yerico/yerico_icons_48.svg
@@ -0,0 +1,8018 @@
+
+
+
+
diff --git a/companion/src/images/originals/icons Yerico/yerico_icons_all.svg b/companion/src/images/originals/icons Yerico/yerico_icons_all.svg
new file mode 100644
index 000000000..2ee4a4c27
--- /dev/null
+++ b/companion/src/images/originals/icons Yerico/yerico_icons_all.svg
@@ -0,0 +1,16562 @@
+
+
+
+
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 9201680e9..5a924696b 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -1596,7 +1596,7 @@ void MainWindow::createActions()
QActionGroup *themeAlignGroup = new QActionGroup(this);
classicThemeAct = addAct( themeAlignGroup, tr("Classical"), tr("The classical Companion icon theme"), SLOT(setClassicTheme()));
- newThemeAct = addAct( themeAlignGroup, tr("New"), tr("The new Companion 2 icon theme"), SLOT(setNewTheme()));
+ yericoThemeAct = addAct( themeAlignGroup, tr("Yerico"), tr("Yellow round honey sweet icon theme"), SLOT(setYericoTheme()));
monoThemeAct = addAct( themeAlignGroup, tr("Monochrome"), tr("A monochrome black icon theme"), SLOT(setMonochromeTheme()));
monoWhiteAct = addAct( themeAlignGroup, tr("MonoWhite"), tr("A monochrome white icon theme"), SLOT(setMonoWhiteTheme()));
monoBlueAct = addAct( themeAlignGroup, tr("MonoBlue"), tr("A monochrome blue icon theme"), SLOT(setMonoBlueTheme()));
@@ -1701,7 +1701,7 @@ void MainWindow::createMenus()
settingsMenu->addMenu(themeMenu);
themeMenu->addAction(classicThemeAct);
- themeMenu->addAction(newThemeAct);
+ themeMenu->addAction(yericoThemeAct);
themeMenu->addAction(monoThemeAct);
themeMenu->addAction(monoBlueAct);
themeMenu->addAction(monoWhiteAct);
@@ -1950,7 +1950,7 @@ void MainWindow::updateIconThemeActions()
switch (g.theme())
{
case 0: classicThemeAct->setChecked(true); break;
- case 1: newThemeAct->setChecked(true); break;
+ case 1: yericoThemeAct->setChecked(true); break;
case 2: monoWhiteAct->setChecked(true); break;
case 3: monoThemeAct->setChecked(true); break;
case 4: monoBlueAct->setChecked(true); break;
diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h
index 0b175c1b9..f746b1eb8 100644
--- a/companion/src/mainwindow.h
+++ b/companion/src/mainwindow.h
@@ -99,7 +99,7 @@ private slots:
void setTheme(int index);
void setClassicTheme() {setTheme(0);};
- void setNewTheme() {setTheme(1);};
+ void setYericoTheme() {setTheme(1);};
void setMonoWhiteTheme() {setTheme(2);};
void setMonochromeTheme(){setTheme(3);};
void setMonoBlueTheme() {setTheme(4);};
@@ -256,7 +256,7 @@ private:
QAction *profileActs[MAX_PROFILES];
QAction *createProfileAct;
QAction *classicThemeAct;
- QAction *newThemeAct;
+ QAction *yericoThemeAct;
QAction *monoThemeAct;
QAction *monoBlueAct;
QAction *monoWhiteAct;
diff --git a/companion/src/themes/new/16/apppreferences.png b/companion/src/themes/new/16/apppreferences.png
deleted file mode 100644
index a39e89ef9..000000000
Binary files a/companion/src/themes/new/16/apppreferences.png and /dev/null differ
diff --git a/companion/src/themes/new/16/clear.png b/companion/src/themes/new/16/clear.png
deleted file mode 100644
index 7bdad0013..000000000
Binary files a/companion/src/themes/new/16/clear.png and /dev/null differ
diff --git a/companion/src/themes/new/16/compare.png b/companion/src/themes/new/16/compare.png
deleted file mode 100644
index eda5f13b9..000000000
Binary files a/companion/src/themes/new/16/compare.png and /dev/null differ
diff --git a/companion/src/themes/new/16/configure.png b/companion/src/themes/new/16/configure.png
deleted file mode 100644
index a627160f9..000000000
Binary files a/companion/src/themes/new/16/configure.png and /dev/null differ
diff --git a/companion/src/themes/new/16/copy.png b/companion/src/themes/new/16/copy.png
deleted file mode 100644
index 799b8c317..000000000
Binary files a/companion/src/themes/new/16/copy.png and /dev/null differ
diff --git a/companion/src/themes/new/16/cut.png b/companion/src/themes/new/16/cut.png
deleted file mode 100644
index 2701f6896..000000000
Binary files a/companion/src/themes/new/16/cut.png and /dev/null differ
diff --git a/companion/src/themes/new/16/exit.png b/companion/src/themes/new/16/exit.png
deleted file mode 100644
index 47f127f76..000000000
Binary files a/companion/src/themes/new/16/exit.png and /dev/null differ
diff --git a/companion/src/themes/new/16/fuses.png b/companion/src/themes/new/16/fuses.png
deleted file mode 100644
index fea12cc6d..000000000
Binary files a/companion/src/themes/new/16/fuses.png and /dev/null differ
diff --git a/companion/src/themes/new/16/fwpreferences.png b/companion/src/themes/new/16/fwpreferences.png
deleted file mode 100644
index e7a8ea790..000000000
Binary files a/companion/src/themes/new/16/fwpreferences.png and /dev/null differ
diff --git a/companion/src/themes/new/16/information.png b/companion/src/themes/new/16/information.png
deleted file mode 100644
index 1a3cfc535..000000000
Binary files a/companion/src/themes/new/16/information.png and /dev/null differ
diff --git a/companion/src/themes/new/16/logs.png b/companion/src/themes/new/16/logs.png
deleted file mode 100644
index 880923fb6..000000000
Binary files a/companion/src/themes/new/16/logs.png and /dev/null differ
diff --git a/companion/src/themes/new/16/movedown.png b/companion/src/themes/new/16/movedown.png
deleted file mode 100644
index 0c1e7b2bb..000000000
Binary files a/companion/src/themes/new/16/movedown.png and /dev/null differ
diff --git a/companion/src/themes/new/16/moveup.png b/companion/src/themes/new/16/moveup.png
deleted file mode 100644
index 322ed7606..000000000
Binary files a/companion/src/themes/new/16/moveup.png and /dev/null differ
diff --git a/companion/src/themes/new/16/new.png b/companion/src/themes/new/16/new.png
deleted file mode 100644
index d3661a194..000000000
Binary files a/companion/src/themes/new/16/new.png and /dev/null differ
diff --git a/companion/src/themes/new/16/open.png b/companion/src/themes/new/16/open.png
deleted file mode 100644
index 508be299e..000000000
Binary files a/companion/src/themes/new/16/open.png and /dev/null differ
diff --git a/companion/src/themes/new/16/paintbrush.png b/companion/src/themes/new/16/paintbrush.png
deleted file mode 100644
index fc99fd5f2..000000000
Binary files a/companion/src/themes/new/16/paintbrush.png and /dev/null differ
diff --git a/companion/src/themes/new/16/paste.png b/companion/src/themes/new/16/paste.png
deleted file mode 100644
index b434f103c..000000000
Binary files a/companion/src/themes/new/16/paste.png and /dev/null differ
diff --git a/companion/src/themes/new/16/print.png b/companion/src/themes/new/16/print.png
deleted file mode 100644
index 7041c1d4b..000000000
Binary files a/companion/src/themes/new/16/print.png and /dev/null differ
diff --git a/companion/src/themes/new/16/profiles.png b/companion/src/themes/new/16/profiles.png
deleted file mode 100644
index 8343cc5c1..000000000
Binary files a/companion/src/themes/new/16/profiles.png and /dev/null differ
diff --git a/companion/src/themes/new/16/read_eeprom.png b/companion/src/themes/new/16/read_eeprom.png
deleted file mode 100644
index c9ef59ca4..000000000
Binary files a/companion/src/themes/new/16/read_eeprom.png and /dev/null differ
diff --git a/companion/src/themes/new/16/read_eeprom_file.png b/companion/src/themes/new/16/read_eeprom_file.png
deleted file mode 100644
index 7617c17ba..000000000
Binary files a/companion/src/themes/new/16/read_eeprom_file.png and /dev/null differ
diff --git a/companion/src/themes/new/16/read_flash.png b/companion/src/themes/new/16/read_flash.png
deleted file mode 100644
index 3591516de..000000000
Binary files a/companion/src/themes/new/16/read_flash.png and /dev/null differ
diff --git a/companion/src/themes/new/16/recentdocument.png b/companion/src/themes/new/16/recentdocument.png
deleted file mode 100644
index 47cb004d3..000000000
Binary files a/companion/src/themes/new/16/recentdocument.png and /dev/null differ
diff --git a/companion/src/themes/new/16/save.png b/companion/src/themes/new/16/save.png
deleted file mode 100644
index cd0162b61..000000000
Binary files a/companion/src/themes/new/16/save.png and /dev/null differ
diff --git a/companion/src/themes/new/16/saveas.png b/companion/src/themes/new/16/saveas.png
deleted file mode 100644
index 3c3045a47..000000000
Binary files a/companion/src/themes/new/16/saveas.png and /dev/null differ
diff --git a/companion/src/themes/new/16/simulate.png b/companion/src/themes/new/16/simulate.png
deleted file mode 100644
index 94a8a4003..000000000
Binary files a/companion/src/themes/new/16/simulate.png and /dev/null differ
diff --git a/companion/src/themes/new/16/update.png b/companion/src/themes/new/16/update.png
deleted file mode 100644
index 0af079b3f..000000000
Binary files a/companion/src/themes/new/16/update.png and /dev/null differ
diff --git a/companion/src/themes/new/16/write_eeprom.png b/companion/src/themes/new/16/write_eeprom.png
deleted file mode 100644
index 3dd15566a..000000000
Binary files a/companion/src/themes/new/16/write_eeprom.png and /dev/null differ
diff --git a/companion/src/themes/new/16/write_eeprom_file.png b/companion/src/themes/new/16/write_eeprom_file.png
deleted file mode 100644
index efbce2843..000000000
Binary files a/companion/src/themes/new/16/write_eeprom_file.png and /dev/null differ
diff --git a/companion/src/themes/new/16/write_flash.png b/companion/src/themes/new/16/write_flash.png
deleted file mode 100644
index c82b8c9e8..000000000
Binary files a/companion/src/themes/new/16/write_flash.png and /dev/null differ
diff --git a/companion/src/themes/new/24/apppreferences.png b/companion/src/themes/new/24/apppreferences.png
deleted file mode 100644
index 8d81a5191..000000000
Binary files a/companion/src/themes/new/24/apppreferences.png and /dev/null differ
diff --git a/companion/src/themes/new/24/compare.png b/companion/src/themes/new/24/compare.png
deleted file mode 100644
index 2d9e035d8..000000000
Binary files a/companion/src/themes/new/24/compare.png and /dev/null differ
diff --git a/companion/src/themes/new/24/configure.png b/companion/src/themes/new/24/configure.png
deleted file mode 100644
index f3972b18f..000000000
Binary files a/companion/src/themes/new/24/configure.png and /dev/null differ
diff --git a/companion/src/themes/new/24/copy.png b/companion/src/themes/new/24/copy.png
deleted file mode 100644
index b9d6c8c26..000000000
Binary files a/companion/src/themes/new/24/copy.png and /dev/null differ
diff --git a/companion/src/themes/new/24/cut.png b/companion/src/themes/new/24/cut.png
deleted file mode 100644
index 29ca2122f..000000000
Binary files a/companion/src/themes/new/24/cut.png and /dev/null differ
diff --git a/companion/src/themes/new/24/fuses.png b/companion/src/themes/new/24/fuses.png
deleted file mode 100644
index 2620abd66..000000000
Binary files a/companion/src/themes/new/24/fuses.png and /dev/null differ
diff --git a/companion/src/themes/new/24/fwpreferences.png b/companion/src/themes/new/24/fwpreferences.png
deleted file mode 100644
index e62900a4a..000000000
Binary files a/companion/src/themes/new/24/fwpreferences.png and /dev/null differ
diff --git a/companion/src/themes/new/24/information.png b/companion/src/themes/new/24/information.png
deleted file mode 100644
index f94c8d7c1..000000000
Binary files a/companion/src/themes/new/24/information.png and /dev/null differ
diff --git a/companion/src/themes/new/24/logs.png b/companion/src/themes/new/24/logs.png
deleted file mode 100644
index a9c247b27..000000000
Binary files a/companion/src/themes/new/24/logs.png and /dev/null differ
diff --git a/companion/src/themes/new/24/new.png b/companion/src/themes/new/24/new.png
deleted file mode 100644
index 5e419a3b4..000000000
Binary files a/companion/src/themes/new/24/new.png and /dev/null differ
diff --git a/companion/src/themes/new/24/open.png b/companion/src/themes/new/24/open.png
deleted file mode 100644
index 824b3febb..000000000
Binary files a/companion/src/themes/new/24/open.png and /dev/null differ
diff --git a/companion/src/themes/new/24/paintbrush.png b/companion/src/themes/new/24/paintbrush.png
deleted file mode 100644
index de9e1806f..000000000
Binary files a/companion/src/themes/new/24/paintbrush.png and /dev/null differ
diff --git a/companion/src/themes/new/24/paste.png b/companion/src/themes/new/24/paste.png
deleted file mode 100644
index c5444dd67..000000000
Binary files a/companion/src/themes/new/24/paste.png and /dev/null differ
diff --git a/companion/src/themes/new/24/print.png b/companion/src/themes/new/24/print.png
deleted file mode 100644
index d7e15e59c..000000000
Binary files a/companion/src/themes/new/24/print.png and /dev/null differ
diff --git a/companion/src/themes/new/24/profiles.png b/companion/src/themes/new/24/profiles.png
deleted file mode 100644
index 394e8079f..000000000
Binary files a/companion/src/themes/new/24/profiles.png and /dev/null differ
diff --git a/companion/src/themes/new/24/read_eeprom.png b/companion/src/themes/new/24/read_eeprom.png
deleted file mode 100644
index 9a0bbd6b7..000000000
Binary files a/companion/src/themes/new/24/read_eeprom.png and /dev/null differ
diff --git a/companion/src/themes/new/24/read_eeprom_file.png b/companion/src/themes/new/24/read_eeprom_file.png
deleted file mode 100644
index 9f557a3c7..000000000
Binary files a/companion/src/themes/new/24/read_eeprom_file.png and /dev/null differ
diff --git a/companion/src/themes/new/24/read_flash.png b/companion/src/themes/new/24/read_flash.png
deleted file mode 100644
index ed77ff739..000000000
Binary files a/companion/src/themes/new/24/read_flash.png and /dev/null differ
diff --git a/companion/src/themes/new/24/recentdocument.png b/companion/src/themes/new/24/recentdocument.png
deleted file mode 100644
index 26075e8b9..000000000
Binary files a/companion/src/themes/new/24/recentdocument.png and /dev/null differ
diff --git a/companion/src/themes/new/24/save.png b/companion/src/themes/new/24/save.png
deleted file mode 100644
index 173dc986d..000000000
Binary files a/companion/src/themes/new/24/save.png and /dev/null differ
diff --git a/companion/src/themes/new/24/saveas.png b/companion/src/themes/new/24/saveas.png
deleted file mode 100644
index 478c4d2cb..000000000
Binary files a/companion/src/themes/new/24/saveas.png and /dev/null differ
diff --git a/companion/src/themes/new/24/simulate.png b/companion/src/themes/new/24/simulate.png
deleted file mode 100644
index 8bc4db398..000000000
Binary files a/companion/src/themes/new/24/simulate.png and /dev/null differ
diff --git a/companion/src/themes/new/24/update.png b/companion/src/themes/new/24/update.png
deleted file mode 100644
index f50b423b9..000000000
Binary files a/companion/src/themes/new/24/update.png and /dev/null differ
diff --git a/companion/src/themes/new/24/write_eeprom.png b/companion/src/themes/new/24/write_eeprom.png
deleted file mode 100644
index 8591f6f70..000000000
Binary files a/companion/src/themes/new/24/write_eeprom.png and /dev/null differ
diff --git a/companion/src/themes/new/24/write_eeprom_file.png b/companion/src/themes/new/24/write_eeprom_file.png
deleted file mode 100644
index a3cd7898c..000000000
Binary files a/companion/src/themes/new/24/write_eeprom_file.png and /dev/null differ
diff --git a/companion/src/themes/new/24/write_flash.png b/companion/src/themes/new/24/write_flash.png
deleted file mode 100644
index 8ef65965f..000000000
Binary files a/companion/src/themes/new/24/write_flash.png and /dev/null differ
diff --git a/companion/src/themes/new/32/apppreferences.png b/companion/src/themes/new/32/apppreferences.png
deleted file mode 100644
index 13fd76086..000000000
Binary files a/companion/src/themes/new/32/apppreferences.png and /dev/null differ
diff --git a/companion/src/themes/new/32/compare.png b/companion/src/themes/new/32/compare.png
deleted file mode 100644
index 4cf84e940..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 9fd4c2cd9..000000000
Binary files a/companion/src/themes/new/32/configure.png and /dev/null differ
diff --git a/companion/src/themes/new/32/copy.png b/companion/src/themes/new/32/copy.png
deleted file mode 100644
index ab899087c..000000000
Binary files a/companion/src/themes/new/32/copy.png and /dev/null differ
diff --git a/companion/src/themes/new/32/cut.png b/companion/src/themes/new/32/cut.png
deleted file mode 100644
index 89ce23045..000000000
Binary files a/companion/src/themes/new/32/cut.png and /dev/null differ
diff --git a/companion/src/themes/new/32/fuses.png b/companion/src/themes/new/32/fuses.png
deleted file mode 100644
index e229989bb..000000000
Binary files a/companion/src/themes/new/32/fuses.png and /dev/null differ
diff --git a/companion/src/themes/new/32/fwpreferences.png b/companion/src/themes/new/32/fwpreferences.png
deleted file mode 100644
index 42e933b33..000000000
Binary files a/companion/src/themes/new/32/fwpreferences.png and /dev/null differ
diff --git a/companion/src/themes/new/32/information.png b/companion/src/themes/new/32/information.png
deleted file mode 100644
index 48bf9f6f3..000000000
Binary files a/companion/src/themes/new/32/information.png and /dev/null differ
diff --git a/companion/src/themes/new/32/logs.png b/companion/src/themes/new/32/logs.png
deleted file mode 100644
index 11af72b25..000000000
Binary files a/companion/src/themes/new/32/logs.png and /dev/null differ
diff --git a/companion/src/themes/new/32/new.png b/companion/src/themes/new/32/new.png
deleted file mode 100644
index ee5d22a8c..000000000
Binary files a/companion/src/themes/new/32/new.png and /dev/null differ
diff --git a/companion/src/themes/new/32/open.png b/companion/src/themes/new/32/open.png
deleted file mode 100644
index 04914678f..000000000
Binary files a/companion/src/themes/new/32/open.png and /dev/null differ
diff --git a/companion/src/themes/new/32/paintbrush.png b/companion/src/themes/new/32/paintbrush.png
deleted file mode 100644
index 33d2249c0..000000000
Binary files a/companion/src/themes/new/32/paintbrush.png and /dev/null differ
diff --git a/companion/src/themes/new/32/paste.png b/companion/src/themes/new/32/paste.png
deleted file mode 100644
index c89889787..000000000
Binary files a/companion/src/themes/new/32/paste.png and /dev/null differ
diff --git a/companion/src/themes/new/32/print.png b/companion/src/themes/new/32/print.png
deleted file mode 100644
index ad2b82844..000000000
Binary files a/companion/src/themes/new/32/print.png and /dev/null differ
diff --git a/companion/src/themes/new/32/profiles.png b/companion/src/themes/new/32/profiles.png
deleted file mode 100644
index 03fab9601..000000000
Binary files a/companion/src/themes/new/32/profiles.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 9e1aa0e2a..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 6c6997046..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 2ebd0f34b..000000000
Binary files a/companion/src/themes/new/32/read_flash.png and /dev/null differ
diff --git a/companion/src/themes/new/32/recentdocument.png b/companion/src/themes/new/32/recentdocument.png
deleted file mode 100644
index 3f43a784e..000000000
Binary files a/companion/src/themes/new/32/recentdocument.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 05137c83f..000000000
Binary files a/companion/src/themes/new/32/save.png and /dev/null differ
diff --git a/companion/src/themes/new/32/saveas.png b/companion/src/themes/new/32/saveas.png
deleted file mode 100644
index 03c953632..000000000
Binary files a/companion/src/themes/new/32/saveas.png and /dev/null differ
diff --git a/companion/src/themes/new/32/simulate.png b/companion/src/themes/new/32/simulate.png
deleted file mode 100644
index c67e7cb99..000000000
Binary files a/companion/src/themes/new/32/simulate.png and /dev/null differ
diff --git a/companion/src/themes/new/32/update.png b/companion/src/themes/new/32/update.png
deleted file mode 100644
index 9f57be2d7..000000000
Binary files a/companion/src/themes/new/32/update.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 005766b0b..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 1ead1095b..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 231b72041..000000000
Binary files a/companion/src/themes/new/32/write_flash.png and /dev/null differ
diff --git a/companion/src/themes/new/48/apppreferences.png b/companion/src/themes/new/48/apppreferences.png
deleted file mode 100644
index be06b9a3f..000000000
Binary files a/companion/src/themes/new/48/apppreferences.png and /dev/null differ
diff --git a/companion/src/themes/new/48/clear.png b/companion/src/themes/new/48/clear.png
deleted file mode 100644
index 445702cc8..000000000
Binary files a/companion/src/themes/new/48/clear.png and /dev/null differ
diff --git a/companion/src/themes/new/48/compare.png b/companion/src/themes/new/48/compare.png
deleted file mode 100644
index 499c40192..000000000
Binary files a/companion/src/themes/new/48/compare.png and /dev/null differ
diff --git a/companion/src/themes/new/48/configure.png b/companion/src/themes/new/48/configure.png
deleted file mode 100644
index 9b0506ed5..000000000
Binary files a/companion/src/themes/new/48/configure.png and /dev/null differ
diff --git a/companion/src/themes/new/48/copy.png b/companion/src/themes/new/48/copy.png
deleted file mode 100644
index 49e9835c0..000000000
Binary files a/companion/src/themes/new/48/copy.png and /dev/null differ
diff --git a/companion/src/themes/new/48/cut.png b/companion/src/themes/new/48/cut.png
deleted file mode 100644
index e8c987802..000000000
Binary files a/companion/src/themes/new/48/cut.png and /dev/null differ
diff --git a/companion/src/themes/new/48/fuses.png b/companion/src/themes/new/48/fuses.png
deleted file mode 100644
index f5cf7e680..000000000
Binary files a/companion/src/themes/new/48/fuses.png and /dev/null differ
diff --git a/companion/src/themes/new/48/fwpreferences.png b/companion/src/themes/new/48/fwpreferences.png
deleted file mode 100644
index 4198f7553..000000000
Binary files a/companion/src/themes/new/48/fwpreferences.png and /dev/null differ
diff --git a/companion/src/themes/new/48/information.png b/companion/src/themes/new/48/information.png
deleted file mode 100644
index d7cb2c224..000000000
Binary files a/companion/src/themes/new/48/information.png and /dev/null differ
diff --git a/companion/src/themes/new/48/logs.png b/companion/src/themes/new/48/logs.png
deleted file mode 100644
index 55c6f8d0b..000000000
Binary files a/companion/src/themes/new/48/logs.png and /dev/null differ
diff --git a/companion/src/themes/new/48/new.png b/companion/src/themes/new/48/new.png
deleted file mode 100644
index 53dd74e30..000000000
Binary files a/companion/src/themes/new/48/new.png and /dev/null differ
diff --git a/companion/src/themes/new/48/open.png b/companion/src/themes/new/48/open.png
deleted file mode 100644
index 590e37acf..000000000
Binary files a/companion/src/themes/new/48/open.png and /dev/null differ
diff --git a/companion/src/themes/new/48/paintbrush.png b/companion/src/themes/new/48/paintbrush.png
deleted file mode 100644
index 8f90906c7..000000000
Binary files a/companion/src/themes/new/48/paintbrush.png and /dev/null differ
diff --git a/companion/src/themes/new/48/paste.png b/companion/src/themes/new/48/paste.png
deleted file mode 100644
index 2198b77c0..000000000
Binary files a/companion/src/themes/new/48/paste.png and /dev/null differ
diff --git a/companion/src/themes/new/48/print.png b/companion/src/themes/new/48/print.png
deleted file mode 100644
index 5586786e2..000000000
Binary files a/companion/src/themes/new/48/print.png and /dev/null differ
diff --git a/companion/src/themes/new/48/profiles.png b/companion/src/themes/new/48/profiles.png
deleted file mode 100644
index 52721bd5f..000000000
Binary files a/companion/src/themes/new/48/profiles.png and /dev/null differ
diff --git a/companion/src/themes/new/48/read_eeprom.png b/companion/src/themes/new/48/read_eeprom.png
deleted file mode 100644
index a7ef5d2c0..000000000
Binary files a/companion/src/themes/new/48/read_eeprom.png and /dev/null differ
diff --git a/companion/src/themes/new/48/read_eeprom_file.png b/companion/src/themes/new/48/read_eeprom_file.png
deleted file mode 100644
index fdd2e5588..000000000
Binary files a/companion/src/themes/new/48/read_eeprom_file.png and /dev/null differ
diff --git a/companion/src/themes/new/48/read_flash.png b/companion/src/themes/new/48/read_flash.png
deleted file mode 100644
index 0b5440588..000000000
Binary files a/companion/src/themes/new/48/read_flash.png and /dev/null differ
diff --git a/companion/src/themes/new/48/recentdocument.png b/companion/src/themes/new/48/recentdocument.png
deleted file mode 100644
index 95510e14f..000000000
Binary files a/companion/src/themes/new/48/recentdocument.png and /dev/null differ
diff --git a/companion/src/themes/new/48/save.png b/companion/src/themes/new/48/save.png
deleted file mode 100644
index 20352a4f9..000000000
Binary files a/companion/src/themes/new/48/save.png and /dev/null differ
diff --git a/companion/src/themes/new/48/saveas.png b/companion/src/themes/new/48/saveas.png
deleted file mode 100644
index f44fdb0b7..000000000
Binary files a/companion/src/themes/new/48/saveas.png and /dev/null differ
diff --git a/companion/src/themes/new/48/simulate.png b/companion/src/themes/new/48/simulate.png
deleted file mode 100644
index e9c338619..000000000
Binary files a/companion/src/themes/new/48/simulate.png and /dev/null differ
diff --git a/companion/src/themes/new/48/update.png b/companion/src/themes/new/48/update.png
deleted file mode 100644
index 27112e871..000000000
Binary files a/companion/src/themes/new/48/update.png and /dev/null differ
diff --git a/companion/src/themes/new/48/write_eeprom.png b/companion/src/themes/new/48/write_eeprom.png
deleted file mode 100644
index 1c873f8e0..000000000
Binary files a/companion/src/themes/new/48/write_eeprom.png and /dev/null differ
diff --git a/companion/src/themes/new/48/write_eeprom_file.png b/companion/src/themes/new/48/write_eeprom_file.png
deleted file mode 100644
index 57804bd68..000000000
Binary files a/companion/src/themes/new/48/write_eeprom_file.png and /dev/null differ
diff --git a/companion/src/themes/new/48/write_flash.png b/companion/src/themes/new/48/write_flash.png
deleted file mode 100644
index 3600b5e37..000000000
Binary files a/companion/src/themes/new/48/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/yerico/16/apppreferences.png b/companion/src/themes/yerico/16/apppreferences.png
new file mode 100644
index 000000000..eec3a9bab
Binary files /dev/null and b/companion/src/themes/yerico/16/apppreferences.png differ
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/yerico/16/clear.png b/companion/src/themes/yerico/16/clear.png
new file mode 100644
index 000000000..0a8c6dcc9
Binary files /dev/null and b/companion/src/themes/yerico/16/clear.png differ
diff --git a/companion/src/themes/yerico/16/compare.png b/companion/src/themes/yerico/16/compare.png
new file mode 100644
index 000000000..3c66fa8d1
Binary files /dev/null and b/companion/src/themes/yerico/16/compare.png differ
diff --git a/companion/src/themes/yerico/16/configure.png b/companion/src/themes/yerico/16/configure.png
new file mode 100644
index 000000000..a25340787
Binary files /dev/null and b/companion/src/themes/yerico/16/configure.png differ
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/yerico/16/copy.png b/companion/src/themes/yerico/16/copy.png
new file mode 100644
index 000000000..39fd9415e
Binary files /dev/null and b/companion/src/themes/yerico/16/copy.png differ
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/yerico/16/cut.png b/companion/src/themes/yerico/16/cut.png
new file mode 100644
index 000000000..a24850323
Binary files /dev/null and b/companion/src/themes/yerico/16/cut.png differ
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/yerico/16/exit.png b/companion/src/themes/yerico/16/exit.png
new file mode 100644
index 000000000..0bbf02d0e
Binary files /dev/null and b/companion/src/themes/yerico/16/exit.png differ
diff --git a/companion/src/themes/yerico/16/fuses.png b/companion/src/themes/yerico/16/fuses.png
new file mode 100644
index 000000000..512a067ed
Binary files /dev/null and b/companion/src/themes/yerico/16/fuses.png differ
diff --git a/companion/src/themes/yerico/16/fwpreferences.png b/companion/src/themes/yerico/16/fwpreferences.png
new file mode 100644
index 000000000..bc22a9f16
Binary files /dev/null and b/companion/src/themes/yerico/16/fwpreferences.png differ
diff --git a/companion/src/themes/yerico/16/information.png b/companion/src/themes/yerico/16/information.png
new file mode 100644
index 000000000..381173a58
Binary files /dev/null and b/companion/src/themes/yerico/16/information.png differ
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/yerico/16/logs.png b/companion/src/themes/yerico/16/logs.png
new file mode 100644
index 000000000..76fc4ff0d
Binary files /dev/null and b/companion/src/themes/yerico/16/logs.png differ
diff --git a/companion/src/themes/yerico/16/movedown.png b/companion/src/themes/yerico/16/movedown.png
new file mode 100644
index 000000000..1bf6d77a9
Binary files /dev/null and b/companion/src/themes/yerico/16/movedown.png differ
diff --git a/companion/src/themes/yerico/16/moveup.png b/companion/src/themes/yerico/16/moveup.png
new file mode 100644
index 000000000..0bf5d5fc8
Binary files /dev/null and b/companion/src/themes/yerico/16/moveup.png differ
diff --git a/companion/src/themes/yerico/16/new.png b/companion/src/themes/yerico/16/new.png
new file mode 100644
index 000000000..3dfa467fa
Binary files /dev/null and b/companion/src/themes/yerico/16/new.png differ
diff --git a/companion/src/themes/yerico/16/open.png b/companion/src/themes/yerico/16/open.png
new file mode 100644
index 000000000..0c5311f59
Binary files /dev/null and b/companion/src/themes/yerico/16/open.png differ
diff --git a/companion/src/themes/yerico/16/paintbrush.png b/companion/src/themes/yerico/16/paintbrush.png
new file mode 100644
index 000000000..d113512ac
Binary files /dev/null and b/companion/src/themes/yerico/16/paintbrush.png differ
diff --git a/companion/src/themes/yerico/16/paste.png b/companion/src/themes/yerico/16/paste.png
new file mode 100644
index 000000000..f45a3837a
Binary files /dev/null and b/companion/src/themes/yerico/16/paste.png differ
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/yerico/16/print.png b/companion/src/themes/yerico/16/print.png
new file mode 100644
index 000000000..f5f22ea39
Binary files /dev/null and b/companion/src/themes/yerico/16/print.png differ
diff --git a/companion/src/themes/yerico/16/profiles.png b/companion/src/themes/yerico/16/profiles.png
new file mode 100644
index 000000000..db68156bc
Binary files /dev/null and b/companion/src/themes/yerico/16/profiles.png differ
diff --git a/companion/src/themes/yerico/16/read_eeprom.png b/companion/src/themes/yerico/16/read_eeprom.png
new file mode 100644
index 000000000..c94d3b766
Binary files /dev/null and b/companion/src/themes/yerico/16/read_eeprom.png differ
diff --git a/companion/src/themes/yerico/16/read_eeprom_file.png b/companion/src/themes/yerico/16/read_eeprom_file.png
new file mode 100644
index 000000000..42054a6f5
Binary files /dev/null and b/companion/src/themes/yerico/16/read_eeprom_file.png differ
diff --git a/companion/src/themes/yerico/16/read_flash.png b/companion/src/themes/yerico/16/read_flash.png
new file mode 100644
index 000000000..e9393135b
Binary files /dev/null and b/companion/src/themes/yerico/16/read_flash.png differ
diff --git a/companion/src/themes/yerico/16/recentdocument.png b/companion/src/themes/yerico/16/recentdocument.png
new file mode 100644
index 000000000..eee942c2d
Binary files /dev/null and b/companion/src/themes/yerico/16/recentdocument.png differ
diff --git a/companion/src/themes/yerico/16/save.png b/companion/src/themes/yerico/16/save.png
new file mode 100644
index 000000000..916eb37dd
Binary files /dev/null and b/companion/src/themes/yerico/16/save.png differ
diff --git a/companion/src/themes/yerico/16/saveas.png b/companion/src/themes/yerico/16/saveas.png
new file mode 100644
index 000000000..b38228708
Binary files /dev/null and b/companion/src/themes/yerico/16/saveas.png differ
diff --git a/companion/src/themes/yerico/16/simulate.png b/companion/src/themes/yerico/16/simulate.png
new file mode 100644
index 000000000..64f07c6c7
Binary files /dev/null and b/companion/src/themes/yerico/16/simulate.png differ
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/yerico/16/update.png b/companion/src/themes/yerico/16/update.png
new file mode 100644
index 000000000..cfe85332d
Binary files /dev/null and b/companion/src/themes/yerico/16/update.png differ
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/yerico/16/write_eeprom.png b/companion/src/themes/yerico/16/write_eeprom.png
new file mode 100644
index 000000000..02a95a633
Binary files /dev/null and b/companion/src/themes/yerico/16/write_eeprom.png differ
diff --git a/companion/src/themes/yerico/16/write_eeprom_file.png b/companion/src/themes/yerico/16/write_eeprom_file.png
new file mode 100644
index 000000000..cf14db557
Binary files /dev/null and b/companion/src/themes/yerico/16/write_eeprom_file.png differ
diff --git a/companion/src/themes/yerico/16/write_flash.png b/companion/src/themes/yerico/16/write_flash.png
new file mode 100644
index 000000000..a4a85327c
Binary files /dev/null and b/companion/src/themes/yerico/16/write_flash.png differ
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/yerico/24/apppreferences.png b/companion/src/themes/yerico/24/apppreferences.png
new file mode 100644
index 000000000..2e8de5c96
Binary files /dev/null and b/companion/src/themes/yerico/24/apppreferences.png differ
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/yerico/24/compare.png b/companion/src/themes/yerico/24/compare.png
new file mode 100644
index 000000000..d2955dbeb
Binary files /dev/null and b/companion/src/themes/yerico/24/compare.png differ
diff --git a/companion/src/themes/yerico/24/configure.png b/companion/src/themes/yerico/24/configure.png
new file mode 100644
index 000000000..867a98b7e
Binary files /dev/null and b/companion/src/themes/yerico/24/configure.png differ
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/yerico/24/copy.png b/companion/src/themes/yerico/24/copy.png
new file mode 100644
index 000000000..77b37481d
Binary files /dev/null and b/companion/src/themes/yerico/24/copy.png differ
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/yerico/24/cut.png b/companion/src/themes/yerico/24/cut.png
new file mode 100644
index 000000000..6578d29cc
Binary files /dev/null and b/companion/src/themes/yerico/24/cut.png differ
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/yerico/24/fuses.png b/companion/src/themes/yerico/24/fuses.png
new file mode 100644
index 000000000..38ce749a1
Binary files /dev/null and b/companion/src/themes/yerico/24/fuses.png differ
diff --git a/companion/src/themes/yerico/24/fwpreferences.png b/companion/src/themes/yerico/24/fwpreferences.png
new file mode 100644
index 000000000..5f7ef8db3
Binary files /dev/null and b/companion/src/themes/yerico/24/fwpreferences.png differ
diff --git a/companion/src/themes/yerico/24/information.png b/companion/src/themes/yerico/24/information.png
new file mode 100644
index 000000000..4f4b0b7be
Binary files /dev/null and b/companion/src/themes/yerico/24/information.png differ
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/yerico/24/logs.png b/companion/src/themes/yerico/24/logs.png
new file mode 100644
index 000000000..44cd3796f
Binary files /dev/null and b/companion/src/themes/yerico/24/logs.png differ
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/yerico/24/new.png b/companion/src/themes/yerico/24/new.png
new file mode 100644
index 000000000..4b5a515ab
Binary files /dev/null and b/companion/src/themes/yerico/24/new.png differ
diff --git a/companion/src/themes/yerico/24/open.png b/companion/src/themes/yerico/24/open.png
new file mode 100644
index 000000000..334272766
Binary files /dev/null and b/companion/src/themes/yerico/24/open.png differ
diff --git a/companion/src/themes/yerico/24/paintbrush.png b/companion/src/themes/yerico/24/paintbrush.png
new file mode 100644
index 000000000..4e2ca9f70
Binary files /dev/null and b/companion/src/themes/yerico/24/paintbrush.png differ
diff --git a/companion/src/themes/yerico/24/paste.png b/companion/src/themes/yerico/24/paste.png
new file mode 100644
index 000000000..53ffad121
Binary files /dev/null and b/companion/src/themes/yerico/24/paste.png differ
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/yerico/24/print.png b/companion/src/themes/yerico/24/print.png
new file mode 100644
index 000000000..ba056458a
Binary files /dev/null and b/companion/src/themes/yerico/24/print.png differ
diff --git a/companion/src/themes/yerico/24/profiles.png b/companion/src/themes/yerico/24/profiles.png
new file mode 100644
index 000000000..f2935ee96
Binary files /dev/null and b/companion/src/themes/yerico/24/profiles.png differ
diff --git a/companion/src/themes/yerico/24/read_eeprom.png b/companion/src/themes/yerico/24/read_eeprom.png
new file mode 100644
index 000000000..de4c08865
Binary files /dev/null and b/companion/src/themes/yerico/24/read_eeprom.png differ
diff --git a/companion/src/themes/yerico/24/read_eeprom_file.png b/companion/src/themes/yerico/24/read_eeprom_file.png
new file mode 100644
index 000000000..3f342b152
Binary files /dev/null and b/companion/src/themes/yerico/24/read_eeprom_file.png differ
diff --git a/companion/src/themes/yerico/24/read_flash.png b/companion/src/themes/yerico/24/read_flash.png
new file mode 100644
index 000000000..76a63823f
Binary files /dev/null and b/companion/src/themes/yerico/24/read_flash.png differ
diff --git a/companion/src/themes/yerico/24/recentdocument.png b/companion/src/themes/yerico/24/recentdocument.png
new file mode 100644
index 000000000..1048efd23
Binary files /dev/null and b/companion/src/themes/yerico/24/recentdocument.png differ
diff --git a/companion/src/themes/yerico/24/save.png b/companion/src/themes/yerico/24/save.png
new file mode 100644
index 000000000..97faf17cb
Binary files /dev/null and b/companion/src/themes/yerico/24/save.png differ
diff --git a/companion/src/themes/yerico/24/saveas.png b/companion/src/themes/yerico/24/saveas.png
new file mode 100644
index 000000000..c8f87f56a
Binary files /dev/null and b/companion/src/themes/yerico/24/saveas.png differ
diff --git a/companion/src/themes/yerico/24/simulate.png b/companion/src/themes/yerico/24/simulate.png
new file mode 100644
index 000000000..0f50deb7c
Binary files /dev/null and b/companion/src/themes/yerico/24/simulate.png differ
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/yerico/24/update.png b/companion/src/themes/yerico/24/update.png
new file mode 100644
index 000000000..03ea6bb01
Binary files /dev/null and b/companion/src/themes/yerico/24/update.png differ
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/yerico/24/write_eeprom.png b/companion/src/themes/yerico/24/write_eeprom.png
new file mode 100644
index 000000000..6e9542133
Binary files /dev/null and b/companion/src/themes/yerico/24/write_eeprom.png differ
diff --git a/companion/src/themes/yerico/24/write_eeprom_file.png b/companion/src/themes/yerico/24/write_eeprom_file.png
new file mode 100644
index 000000000..f89894945
Binary files /dev/null and b/companion/src/themes/yerico/24/write_eeprom_file.png differ
diff --git a/companion/src/themes/yerico/24/write_flash.png b/companion/src/themes/yerico/24/write_flash.png
new file mode 100644
index 000000000..8b97170ca
Binary files /dev/null and b/companion/src/themes/yerico/24/write_flash.png differ
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/yerico/32/apppreferences.png b/companion/src/themes/yerico/32/apppreferences.png
new file mode 100644
index 000000000..1389fa38c
Binary files /dev/null and b/companion/src/themes/yerico/32/apppreferences.png differ
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..b987f74b8
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/yerico/32/copy.png b/companion/src/themes/yerico/32/copy.png
new file mode 100644
index 000000000..7c2a7ff3f
Binary files /dev/null and b/companion/src/themes/yerico/32/copy.png differ
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/yerico/32/cut.png b/companion/src/themes/yerico/32/cut.png
new file mode 100644
index 000000000..c089b35da
Binary files /dev/null and b/companion/src/themes/yerico/32/cut.png differ
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/yerico/32/fuses.png b/companion/src/themes/yerico/32/fuses.png
new file mode 100644
index 000000000..c0bb8bf4c
Binary files /dev/null and b/companion/src/themes/yerico/32/fuses.png differ
diff --git a/companion/src/themes/yerico/32/fwpreferences.png b/companion/src/themes/yerico/32/fwpreferences.png
new file mode 100644
index 000000000..2c79e0042
Binary files /dev/null and b/companion/src/themes/yerico/32/fwpreferences.png differ
diff --git a/companion/src/themes/yerico/32/information.png b/companion/src/themes/yerico/32/information.png
new file mode 100644
index 000000000..f7c426baf
Binary files /dev/null and b/companion/src/themes/yerico/32/information.png differ
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/yerico/32/logs.png b/companion/src/themes/yerico/32/logs.png
new file mode 100644
index 000000000..83cf51512
Binary files /dev/null and b/companion/src/themes/yerico/32/logs.png differ
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/yerico/32/new.png b/companion/src/themes/yerico/32/new.png
new file mode 100644
index 000000000..0aa6d568a
Binary files /dev/null and b/companion/src/themes/yerico/32/new.png differ
diff --git a/companion/src/themes/yerico/32/open.png b/companion/src/themes/yerico/32/open.png
new file mode 100644
index 000000000..72eed7f24
Binary files /dev/null and b/companion/src/themes/yerico/32/open.png differ
diff --git a/companion/src/themes/yerico/32/paintbrush.png b/companion/src/themes/yerico/32/paintbrush.png
new file mode 100644
index 000000000..18dbeb214
Binary files /dev/null and b/companion/src/themes/yerico/32/paintbrush.png differ
diff --git a/companion/src/themes/yerico/32/paste.png b/companion/src/themes/yerico/32/paste.png
new file mode 100644
index 000000000..61f402155
Binary files /dev/null and b/companion/src/themes/yerico/32/paste.png differ
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/yerico/32/print.png b/companion/src/themes/yerico/32/print.png
new file mode 100644
index 000000000..75d3d8b2b
Binary files /dev/null and b/companion/src/themes/yerico/32/print.png differ
diff --git a/companion/src/themes/yerico/32/profiles.png b/companion/src/themes/yerico/32/profiles.png
new file mode 100644
index 000000000..aac8f4291
Binary files /dev/null and b/companion/src/themes/yerico/32/profiles.png differ
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..6df6bd7c6
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/yerico/32/recentdocument.png b/companion/src/themes/yerico/32/recentdocument.png
new file mode 100644
index 000000000..d7919fef3
Binary files /dev/null and b/companion/src/themes/yerico/32/recentdocument.png differ
diff --git a/companion/src/themes/yerico/32/save.png b/companion/src/themes/yerico/32/save.png
new file mode 100644
index 000000000..c98afaf78
Binary files /dev/null and b/companion/src/themes/yerico/32/save.png differ
diff --git a/companion/src/themes/yerico/32/saveas.png b/companion/src/themes/yerico/32/saveas.png
new file mode 100644
index 000000000..54e046ed4
Binary files /dev/null and b/companion/src/themes/yerico/32/saveas.png differ
diff --git a/companion/src/themes/yerico/32/simulate.png b/companion/src/themes/yerico/32/simulate.png
new file mode 100644
index 000000000..d6bf5825f
Binary files /dev/null and b/companion/src/themes/yerico/32/simulate.png differ
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/yerico/32/update.png b/companion/src/themes/yerico/32/update.png
new file mode 100644
index 000000000..22cc1d9f3
Binary files /dev/null and b/companion/src/themes/yerico/32/update.png differ
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..1701b56e3
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/yerico/48/apppreferences.png b/companion/src/themes/yerico/48/apppreferences.png
new file mode 100644
index 000000000..2f60f6ee0
Binary files /dev/null and b/companion/src/themes/yerico/48/apppreferences.png differ
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/images/originals/icons New/clear.png b/companion/src/themes/yerico/48/clear.png
similarity index 100%
rename from companion/src/images/originals/icons New/clear.png
rename to companion/src/themes/yerico/48/clear.png
diff --git a/companion/src/themes/yerico/48/compare.png b/companion/src/themes/yerico/48/compare.png
new file mode 100644
index 000000000..a9e965791
Binary files /dev/null and b/companion/src/themes/yerico/48/compare.png differ
diff --git a/companion/src/themes/yerico/48/configure.png b/companion/src/themes/yerico/48/configure.png
new file mode 100644
index 000000000..9e1fc5300
Binary files /dev/null and b/companion/src/themes/yerico/48/configure.png differ
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/yerico/48/copy.png b/companion/src/themes/yerico/48/copy.png
new file mode 100644
index 000000000..65dcd3d93
Binary files /dev/null and b/companion/src/themes/yerico/48/copy.png differ
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/yerico/48/cut.png b/companion/src/themes/yerico/48/cut.png
new file mode 100644
index 000000000..1d423464b
Binary files /dev/null and b/companion/src/themes/yerico/48/cut.png differ
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/yerico/48/fuses.png b/companion/src/themes/yerico/48/fuses.png
new file mode 100644
index 000000000..d7fb789c4
Binary files /dev/null and b/companion/src/themes/yerico/48/fuses.png differ
diff --git a/companion/src/themes/yerico/48/fwpreferences.png b/companion/src/themes/yerico/48/fwpreferences.png
new file mode 100644
index 000000000..9b9946eb4
Binary files /dev/null and b/companion/src/themes/yerico/48/fwpreferences.png differ
diff --git a/companion/src/themes/yerico/48/information.png b/companion/src/themes/yerico/48/information.png
new file mode 100644
index 000000000..16d186a78
Binary files /dev/null and b/companion/src/themes/yerico/48/information.png differ
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/yerico/48/logs.png b/companion/src/themes/yerico/48/logs.png
new file mode 100644
index 000000000..131634304
Binary files /dev/null and b/companion/src/themes/yerico/48/logs.png differ
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/yerico/48/new.png b/companion/src/themes/yerico/48/new.png
new file mode 100644
index 000000000..0179eecb8
Binary files /dev/null and b/companion/src/themes/yerico/48/new.png differ
diff --git a/companion/src/themes/yerico/48/open.png b/companion/src/themes/yerico/48/open.png
new file mode 100644
index 000000000..d7847e4b8
Binary files /dev/null and b/companion/src/themes/yerico/48/open.png differ
diff --git a/companion/src/themes/yerico/48/paintbrush.png b/companion/src/themes/yerico/48/paintbrush.png
new file mode 100644
index 000000000..0c06180d9
Binary files /dev/null and b/companion/src/themes/yerico/48/paintbrush.png differ
diff --git a/companion/src/themes/yerico/48/paste.png b/companion/src/themes/yerico/48/paste.png
new file mode 100644
index 000000000..f9338e4e1
Binary files /dev/null and b/companion/src/themes/yerico/48/paste.png differ
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/yerico/48/print.png b/companion/src/themes/yerico/48/print.png
new file mode 100644
index 000000000..8cc3b9ba5
Binary files /dev/null and b/companion/src/themes/yerico/48/print.png differ
diff --git a/companion/src/themes/yerico/48/profiles.png b/companion/src/themes/yerico/48/profiles.png
new file mode 100644
index 000000000..bc9b3749b
Binary files /dev/null and b/companion/src/themes/yerico/48/profiles.png differ
diff --git a/companion/src/themes/yerico/48/read_eeprom.png b/companion/src/themes/yerico/48/read_eeprom.png
new file mode 100644
index 000000000..340f717d3
Binary files /dev/null and b/companion/src/themes/yerico/48/read_eeprom.png differ
diff --git a/companion/src/themes/yerico/48/read_eeprom_file.png b/companion/src/themes/yerico/48/read_eeprom_file.png
new file mode 100644
index 000000000..aea295a1d
Binary files /dev/null and b/companion/src/themes/yerico/48/read_eeprom_file.png differ
diff --git a/companion/src/themes/yerico/48/read_flash.png b/companion/src/themes/yerico/48/read_flash.png
new file mode 100644
index 000000000..46ed3b6bf
Binary files /dev/null and b/companion/src/themes/yerico/48/read_flash.png differ
diff --git a/companion/src/themes/yerico/48/recentdocument.png b/companion/src/themes/yerico/48/recentdocument.png
new file mode 100644
index 000000000..fc3000c9d
Binary files /dev/null and b/companion/src/themes/yerico/48/recentdocument.png differ
diff --git a/companion/src/themes/yerico/48/save.png b/companion/src/themes/yerico/48/save.png
new file mode 100644
index 000000000..deed3981d
Binary files /dev/null and b/companion/src/themes/yerico/48/save.png differ
diff --git a/companion/src/themes/yerico/48/saveas.png b/companion/src/themes/yerico/48/saveas.png
new file mode 100644
index 000000000..87b5c7c1c
Binary files /dev/null and b/companion/src/themes/yerico/48/saveas.png differ
diff --git a/companion/src/themes/yerico/48/simulate.png b/companion/src/themes/yerico/48/simulate.png
new file mode 100644
index 000000000..2a69b4368
Binary files /dev/null and b/companion/src/themes/yerico/48/simulate.png differ
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/yerico/48/update.png b/companion/src/themes/yerico/48/update.png
new file mode 100644
index 000000000..99ea196b4
Binary files /dev/null and b/companion/src/themes/yerico/48/update.png differ
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/yerico/48/write_eeprom.png b/companion/src/themes/yerico/48/write_eeprom.png
new file mode 100644
index 000000000..eb364f90a
Binary files /dev/null and b/companion/src/themes/yerico/48/write_eeprom.png differ
diff --git a/companion/src/themes/yerico/48/write_eeprom_file.png b/companion/src/themes/yerico/48/write_eeprom_file.png
new file mode 100644
index 000000000..1a19dd8df
Binary files /dev/null and b/companion/src/themes/yerico/48/write_eeprom_file.png differ
diff --git a/companion/src/themes/yerico/48/write_flash.png b/companion/src/themes/yerico/48/write_flash.png
new file mode 100644
index 000000000..e031f0ccb
Binary files /dev/null and b/companion/src/themes/yerico/48/write_flash.png differ