diff --git a/resources/icons/Solaar-fail.png b/resources/icons/Solaar-fail.png
deleted file mode 100644
index b60a0304..00000000
Binary files a/resources/icons/Solaar-fail.png and /dev/null differ
diff --git a/resources/icons/Solaar.png b/resources/icons/Solaar.png
deleted file mode 100644
index 5407605a..00000000
Binary files a/resources/icons/Solaar.png and /dev/null differ
diff --git a/resources/icons/Unifying Receiver.png b/resources/icons/Unifying Receiver.png
deleted file mode 100644
index aa4f122a..00000000
Binary files a/resources/icons/Unifying Receiver.png and /dev/null differ
diff --git a/resources/icons/Wireless Solar Keyboard K750.png b/resources/icons/Wireless Solar Keyboard K750.png
deleted file mode 100644
index 719c8bf8..00000000
Binary files a/resources/icons/Wireless Solar Keyboard K750.png and /dev/null differ
diff --git a/resources/icons/battery_00.png b/resources/icons/battery_00.png
deleted file mode 100644
index 0b6a41a9..00000000
Binary files a/resources/icons/battery_00.png and /dev/null differ
diff --git a/resources/icons/battery_100.png b/resources/icons/battery_100.png
deleted file mode 100644
index 3561ffb0..00000000
Binary files a/resources/icons/battery_100.png and /dev/null differ
diff --git a/resources/icons/battery_20.png b/resources/icons/battery_20.png
deleted file mode 100644
index dd86a944..00000000
Binary files a/resources/icons/battery_20.png and /dev/null differ
diff --git a/resources/icons/battery_40.png b/resources/icons/battery_40.png
deleted file mode 100644
index d03dd593..00000000
Binary files a/resources/icons/battery_40.png and /dev/null differ
diff --git a/resources/icons/battery_60.png b/resources/icons/battery_60.png
deleted file mode 100644
index bc774f8b..00000000
Binary files a/resources/icons/battery_60.png and /dev/null differ
diff --git a/resources/icons/battery_80.png b/resources/icons/battery_80.png
deleted file mode 100644
index 23e72ac3..00000000
Binary files a/resources/icons/battery_80.png and /dev/null differ
diff --git a/resources/icons/battery_unknown.png b/resources/icons/battery_unknown.png
deleted file mode 100644
index 9f6cc466..00000000
Binary files a/resources/icons/battery_unknown.png and /dev/null differ
diff --git a/resources/icons/hicolor/128x128/apps/Solaar-fail.png b/resources/icons/hicolor/128x128/apps/Solaar-fail.png
new file mode 100644
index 00000000..288807e0
Binary files /dev/null and b/resources/icons/hicolor/128x128/apps/Solaar-fail.png differ
diff --git a/resources/icons/hicolor/128x128/apps/Solaar.png b/resources/icons/hicolor/128x128/apps/Solaar.png
new file mode 100644
index 00000000..0a028249
Binary files /dev/null and b/resources/icons/hicolor/128x128/apps/Solaar.png differ
diff --git a/resources/icons/hicolor/128x128/devices/Unifying Receiver.png b/resources/icons/hicolor/128x128/devices/Unifying Receiver.png
new file mode 100644
index 00000000..d4811234
Binary files /dev/null and b/resources/icons/hicolor/128x128/devices/Unifying Receiver.png differ
diff --git a/resources/icons/hicolor/128x128/devices/Wireless Solar Keyboard K750.png b/resources/icons/hicolor/128x128/devices/Wireless Solar Keyboard K750.png
new file mode 100644
index 00000000..6010e2ee
Binary files /dev/null and b/resources/icons/hicolor/128x128/devices/Wireless Solar Keyboard K750.png differ
diff --git a/resources/icons/hicolor/128x128/status/battery_00.png b/resources/icons/hicolor/128x128/status/battery_00.png
new file mode 100644
index 00000000..e9d1adf5
Binary files /dev/null and b/resources/icons/hicolor/128x128/status/battery_00.png differ
diff --git a/resources/icons/hicolor/128x128/status/battery_100.png b/resources/icons/hicolor/128x128/status/battery_100.png
new file mode 100644
index 00000000..cb1b2ea2
Binary files /dev/null and b/resources/icons/hicolor/128x128/status/battery_100.png differ
diff --git a/resources/icons/hicolor/128x128/status/battery_20.png b/resources/icons/hicolor/128x128/status/battery_20.png
new file mode 100644
index 00000000..cfdf8990
Binary files /dev/null and b/resources/icons/hicolor/128x128/status/battery_20.png differ
diff --git a/resources/icons/hicolor/128x128/status/battery_40.png b/resources/icons/hicolor/128x128/status/battery_40.png
new file mode 100644
index 00000000..add6cfa8
Binary files /dev/null and b/resources/icons/hicolor/128x128/status/battery_40.png differ
diff --git a/resources/icons/hicolor/128x128/status/battery_60.png b/resources/icons/hicolor/128x128/status/battery_60.png
new file mode 100644
index 00000000..0ee97cb7
Binary files /dev/null and b/resources/icons/hicolor/128x128/status/battery_60.png differ
diff --git a/resources/icons/hicolor/128x128/status/battery_80.png b/resources/icons/hicolor/128x128/status/battery_80.png
new file mode 100644
index 00000000..9ec6a865
Binary files /dev/null and b/resources/icons/hicolor/128x128/status/battery_80.png differ
diff --git a/resources/icons/hicolor/128x128/status/battery_unknown.png b/resources/icons/hicolor/128x128/status/battery_unknown.png
new file mode 100644
index 00000000..11ea875b
Binary files /dev/null and b/resources/icons/hicolor/128x128/status/battery_unknown.png differ
diff --git a/resources/icons/light_00.png b/resources/icons/hicolor/128x128/status/light_00.png
similarity index 100%
rename from resources/icons/light_00.png
rename to resources/icons/hicolor/128x128/status/light_00.png
diff --git a/resources/icons/light_100.png b/resources/icons/hicolor/128x128/status/light_100.png
similarity index 100%
rename from resources/icons/light_100.png
rename to resources/icons/hicolor/128x128/status/light_100.png
diff --git a/resources/icons/hicolor/128x128/status/light_20.png b/resources/icons/hicolor/128x128/status/light_20.png
new file mode 100644
index 00000000..9bd58ee2
Binary files /dev/null and b/resources/icons/hicolor/128x128/status/light_20.png differ
diff --git a/resources/icons/light_40.png b/resources/icons/hicolor/128x128/status/light_40.png
similarity index 100%
rename from resources/icons/light_40.png
rename to resources/icons/hicolor/128x128/status/light_40.png
diff --git a/resources/icons/light_60.png b/resources/icons/hicolor/128x128/status/light_60.png
similarity index 100%
rename from resources/icons/light_60.png
rename to resources/icons/hicolor/128x128/status/light_60.png
diff --git a/resources/icons/light_80.png b/resources/icons/hicolor/128x128/status/light_80.png
similarity index 100%
rename from resources/icons/light_80.png
rename to resources/icons/hicolor/128x128/status/light_80.png
diff --git a/resources/icons/light_unknown.png b/resources/icons/hicolor/128x128/status/light_unknown.png
similarity index 100%
rename from resources/icons/light_unknown.png
rename to resources/icons/hicolor/128x128/status/light_unknown.png
diff --git a/resources/icons/light_20.png b/resources/icons/light_20.png
deleted file mode 100644
index 2a61b19c..00000000
Binary files a/resources/icons/light_20.png and /dev/null differ