diff --git a/res/images/preferences/dark/ic_preferences_autodj.svg b/res/images/preferences/dark/ic_preferences_autodj.svg
deleted file mode 100644
index 2ff8701be13c..000000000000
--- a/res/images/preferences/dark/ic_preferences_autodj.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_bpmdetect.svg b/res/images/preferences/dark/ic_preferences_bpmdetect.svg
deleted file mode 100644
index 25ecf03c0c14..000000000000
--- a/res/images/preferences/dark/ic_preferences_bpmdetect.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_broadcast.svg b/res/images/preferences/dark/ic_preferences_broadcast.svg
deleted file mode 100644
index 05bb64fb88a9..000000000000
--- a/res/images/preferences/dark/ic_preferences_broadcast.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_colors.svg b/res/images/preferences/dark/ic_preferences_colors.svg
deleted file mode 100644
index 214b78d58fb3..000000000000
--- a/res/images/preferences/dark/ic_preferences_colors.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_controllers.svg b/res/images/preferences/dark/ic_preferences_controllers.svg
deleted file mode 100644
index fc34415d2e1f..000000000000
--- a/res/images/preferences/dark/ic_preferences_controllers.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_crossfader.svg b/res/images/preferences/dark/ic_preferences_crossfader.svg
deleted file mode 100644
index d70d4f6fb8d4..000000000000
--- a/res/images/preferences/dark/ic_preferences_crossfader.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_decks.svg b/res/images/preferences/dark/ic_preferences_decks.svg
deleted file mode 100644
index e2e6d721a955..000000000000
--- a/res/images/preferences/dark/ic_preferences_decks.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_effects.svg b/res/images/preferences/dark/ic_preferences_effects.svg
deleted file mode 100644
index 9a292ee13b68..000000000000
--- a/res/images/preferences/dark/ic_preferences_effects.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_equalizers.svg b/res/images/preferences/dark/ic_preferences_equalizers.svg
deleted file mode 100644
index add3b2f0f256..000000000000
--- a/res/images/preferences/dark/ic_preferences_equalizers.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_interface.svg b/res/images/preferences/dark/ic_preferences_interface.svg
deleted file mode 100644
index 2e3209eca992..000000000000
--- a/res/images/preferences/dark/ic_preferences_interface.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_keydetect.svg b/res/images/preferences/dark/ic_preferences_keydetect.svg
deleted file mode 100644
index 86c71d68b3a7..000000000000
--- a/res/images/preferences/dark/ic_preferences_keydetect.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_library.svg b/res/images/preferences/dark/ic_preferences_library.svg
deleted file mode 100644
index 8788cd5e9644..000000000000
--- a/res/images/preferences/dark/ic_preferences_library.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_lv2.svg b/res/images/preferences/dark/ic_preferences_lv2.svg
deleted file mode 100644
index 2f13a81b5ad2..000000000000
--- a/res/images/preferences/dark/ic_preferences_lv2.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_midicontrollers.svg b/res/images/preferences/dark/ic_preferences_midicontrollers.svg
deleted file mode 100644
index 142a8779701a..000000000000
--- a/res/images/preferences/dark/ic_preferences_midicontrollers.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_modplug.svg b/res/images/preferences/dark/ic_preferences_modplug.svg
deleted file mode 100644
index 302e03632b5e..000000000000
--- a/res/images/preferences/dark/ic_preferences_modplug.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_recording.svg b/res/images/preferences/dark/ic_preferences_recording.svg
deleted file mode 100644
index 0b731101e420..000000000000
--- a/res/images/preferences/dark/ic_preferences_recording.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_replaygain.svg b/res/images/preferences/dark/ic_preferences_replaygain.svg
deleted file mode 100644
index 22cbef665ced..000000000000
--- a/res/images/preferences/dark/ic_preferences_replaygain.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_sampler.svg b/res/images/preferences/dark/ic_preferences_sampler.svg
deleted file mode 100644
index c3e3f5d8b84e..000000000000
--- a/res/images/preferences/dark/ic_preferences_sampler.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_soundhardware.svg b/res/images/preferences/dark/ic_preferences_soundhardware.svg
deleted file mode 100644
index 39c62ff9ea68..000000000000
--- a/res/images/preferences/dark/ic_preferences_soundhardware.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_vinyl.svg b/res/images/preferences/dark/ic_preferences_vinyl.svg
deleted file mode 100644
index 391c105652ab..000000000000
--- a/res/images/preferences/dark/ic_preferences_vinyl.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/res/images/preferences/dark/ic_preferences_waveforms.svg b/res/images/preferences/dark/ic_preferences_waveforms.svg
deleted file mode 100644
index cc25285087f7..000000000000
--- a/res/images/preferences/dark/ic_preferences_waveforms.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/ic_preferences_autodj.svg b/res/images/preferences/ic_preferences_autodj.svg
new file mode 100644
index 000000000000..40683a2bb1a5
--- /dev/null
+++ b/res/images/preferences/ic_preferences_autodj.svg
@@ -0,0 +1,375 @@
+
+
diff --git a/res/images/preferences/ic_preferences_bpmdetect.svg b/res/images/preferences/ic_preferences_bpmdetect.svg
new file mode 100644
index 000000000000..fe70517e1baf
--- /dev/null
+++ b/res/images/preferences/ic_preferences_bpmdetect.svg
@@ -0,0 +1,365 @@
+
+
diff --git a/res/images/preferences/ic_preferences_broadcast.svg b/res/images/preferences/ic_preferences_broadcast.svg
new file mode 100644
index 000000000000..80eefee4e14d
--- /dev/null
+++ b/res/images/preferences/ic_preferences_broadcast.svg
@@ -0,0 +1,419 @@
+
+
diff --git a/res/images/preferences/ic_preferences_colors.svg b/res/images/preferences/ic_preferences_colors.svg
new file mode 100644
index 000000000000..cb7199750b8f
--- /dev/null
+++ b/res/images/preferences/ic_preferences_colors.svg
@@ -0,0 +1,7 @@
+
diff --git a/res/images/preferences/ic_preferences_controllers.svg b/res/images/preferences/ic_preferences_controllers.svg
new file mode 100644
index 000000000000..ce6b0b94554b
--- /dev/null
+++ b/res/images/preferences/ic_preferences_controllers.svg
@@ -0,0 +1,405 @@
+
+
diff --git a/res/images/preferences/ic_preferences_crossfader.svg b/res/images/preferences/ic_preferences_crossfader.svg
new file mode 100644
index 000000000000..9c995c0aac59
--- /dev/null
+++ b/res/images/preferences/ic_preferences_crossfader.svg
@@ -0,0 +1,487 @@
+
+
diff --git a/res/images/preferences/ic_preferences_decks.svg b/res/images/preferences/ic_preferences_decks.svg
new file mode 100644
index 000000000000..610d154e3946
--- /dev/null
+++ b/res/images/preferences/ic_preferences_decks.svg
@@ -0,0 +1,615 @@
+
+
diff --git a/res/images/preferences/ic_preferences_effects.svg b/res/images/preferences/ic_preferences_effects.svg
new file mode 100644
index 000000000000..4c0effcf8c93
--- /dev/null
+++ b/res/images/preferences/ic_preferences_effects.svg
@@ -0,0 +1,486 @@
+
+
diff --git a/res/images/preferences/ic_preferences_equalizers.svg b/res/images/preferences/ic_preferences_equalizers.svg
new file mode 100644
index 000000000000..6ffaa6b61eef
--- /dev/null
+++ b/res/images/preferences/ic_preferences_equalizers.svg
@@ -0,0 +1,796 @@
+
+
diff --git a/res/images/preferences/ic_preferences_interface.svg b/res/images/preferences/ic_preferences_interface.svg
new file mode 100644
index 000000000000..7dfcf4db4a52
--- /dev/null
+++ b/res/images/preferences/ic_preferences_interface.svg
@@ -0,0 +1,646 @@
+
+
diff --git a/res/images/preferences/ic_preferences_keydetect.svg b/res/images/preferences/ic_preferences_keydetect.svg
new file mode 100644
index 000000000000..c65160da675d
--- /dev/null
+++ b/res/images/preferences/ic_preferences_keydetect.svg
@@ -0,0 +1,512 @@
+
+
diff --git a/res/images/preferences/ic_preferences_library.svg b/res/images/preferences/ic_preferences_library.svg
new file mode 100644
index 000000000000..098833b7bed8
--- /dev/null
+++ b/res/images/preferences/ic_preferences_library.svg
@@ -0,0 +1,538 @@
+
+
diff --git a/res/images/preferences/ic_preferences_lv2.svg b/res/images/preferences/ic_preferences_lv2.svg
new file mode 100644
index 000000000000..407f50ed0c6e
--- /dev/null
+++ b/res/images/preferences/ic_preferences_lv2.svg
@@ -0,0 +1,436 @@
+
+
diff --git a/res/images/preferences/ic_preferences_midicontrollers.svg b/res/images/preferences/ic_preferences_midicontrollers.svg
new file mode 100644
index 000000000000..4bda7004c968
--- /dev/null
+++ b/res/images/preferences/ic_preferences_midicontrollers.svg
@@ -0,0 +1,560 @@
+
+
diff --git a/res/images/preferences/ic_preferences_modplug.svg b/res/images/preferences/ic_preferences_modplug.svg
new file mode 100644
index 000000000000..694e005d6cff
--- /dev/null
+++ b/res/images/preferences/ic_preferences_modplug.svg
@@ -0,0 +1,503 @@
+
+
diff --git a/res/images/preferences/ic_preferences_recording.svg b/res/images/preferences/ic_preferences_recording.svg
new file mode 100644
index 000000000000..1a3a1979f820
--- /dev/null
+++ b/res/images/preferences/ic_preferences_recording.svg
@@ -0,0 +1,438 @@
+
+
diff --git a/res/images/preferences/ic_preferences_replaygain.svg b/res/images/preferences/ic_preferences_replaygain.svg
new file mode 100644
index 000000000000..af5b92f0b14b
--- /dev/null
+++ b/res/images/preferences/ic_preferences_replaygain.svg
@@ -0,0 +1,610 @@
+
+
diff --git a/res/images/preferences/ic_preferences_sampler.svg b/res/images/preferences/ic_preferences_sampler.svg
new file mode 100644
index 000000000000..ac40c1fc28fa
--- /dev/null
+++ b/res/images/preferences/ic_preferences_sampler.svg
@@ -0,0 +1,606 @@
+
+
diff --git a/res/images/preferences/ic_preferences_soundhardware.svg b/res/images/preferences/ic_preferences_soundhardware.svg
new file mode 100644
index 000000000000..e2b0386a743c
--- /dev/null
+++ b/res/images/preferences/ic_preferences_soundhardware.svg
@@ -0,0 +1,713 @@
+
+
diff --git a/res/images/preferences/ic_preferences_vinyl.svg b/res/images/preferences/ic_preferences_vinyl.svg
new file mode 100644
index 000000000000..78cec69a19d9
--- /dev/null
+++ b/res/images/preferences/ic_preferences_vinyl.svg
@@ -0,0 +1,673 @@
+
+
diff --git a/res/images/preferences/ic_preferences_waveforms.svg b/res/images/preferences/ic_preferences_waveforms.svg
new file mode 100644
index 000000000000..e3954fdc1ca1
--- /dev/null
+++ b/res/images/preferences/ic_preferences_waveforms.svg
@@ -0,0 +1,643 @@
+
+
diff --git a/res/images/preferences/light/ic_preferences_autodj.svg b/res/images/preferences/light/ic_preferences_autodj.svg
deleted file mode 100644
index 4d6b4af906b2..000000000000
--- a/res/images/preferences/light/ic_preferences_autodj.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_bpmdetect.svg b/res/images/preferences/light/ic_preferences_bpmdetect.svg
deleted file mode 100644
index 5566885dc8bd..000000000000
--- a/res/images/preferences/light/ic_preferences_bpmdetect.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_broadcast.svg b/res/images/preferences/light/ic_preferences_broadcast.svg
deleted file mode 100644
index eda9ab0123d8..000000000000
--- a/res/images/preferences/light/ic_preferences_broadcast.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_colors.svg b/res/images/preferences/light/ic_preferences_colors.svg
deleted file mode 100644
index 9421215b3916..000000000000
--- a/res/images/preferences/light/ic_preferences_colors.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_controllers.svg b/res/images/preferences/light/ic_preferences_controllers.svg
deleted file mode 100644
index 8d36f4d0147f..000000000000
--- a/res/images/preferences/light/ic_preferences_controllers.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_crossfader.svg b/res/images/preferences/light/ic_preferences_crossfader.svg
deleted file mode 100644
index 786128b92568..000000000000
--- a/res/images/preferences/light/ic_preferences_crossfader.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_decks.svg b/res/images/preferences/light/ic_preferences_decks.svg
deleted file mode 100644
index 79b874e6fd4a..000000000000
--- a/res/images/preferences/light/ic_preferences_decks.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_effects.svg b/res/images/preferences/light/ic_preferences_effects.svg
deleted file mode 100644
index f3fb6af38723..000000000000
--- a/res/images/preferences/light/ic_preferences_effects.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_equalizers.svg b/res/images/preferences/light/ic_preferences_equalizers.svg
deleted file mode 100644
index b9371aad9b27..000000000000
--- a/res/images/preferences/light/ic_preferences_equalizers.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_interface.svg b/res/images/preferences/light/ic_preferences_interface.svg
deleted file mode 100644
index cfd48cb57e97..000000000000
--- a/res/images/preferences/light/ic_preferences_interface.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_keydetect.svg b/res/images/preferences/light/ic_preferences_keydetect.svg
deleted file mode 100644
index 9afb445fa689..000000000000
--- a/res/images/preferences/light/ic_preferences_keydetect.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_library.svg b/res/images/preferences/light/ic_preferences_library.svg
deleted file mode 100644
index 34abdab3b346..000000000000
--- a/res/images/preferences/light/ic_preferences_library.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_lv2.svg b/res/images/preferences/light/ic_preferences_lv2.svg
deleted file mode 100644
index 9742706279e8..000000000000
--- a/res/images/preferences/light/ic_preferences_lv2.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_midicontrollers.svg b/res/images/preferences/light/ic_preferences_midicontrollers.svg
deleted file mode 100644
index 68f55cbdf9e3..000000000000
--- a/res/images/preferences/light/ic_preferences_midicontrollers.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_modplug.svg b/res/images/preferences/light/ic_preferences_modplug.svg
deleted file mode 100644
index d684fe09bc43..000000000000
--- a/res/images/preferences/light/ic_preferences_modplug.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_recording.svg b/res/images/preferences/light/ic_preferences_recording.svg
deleted file mode 100644
index 25fe3a239356..000000000000
--- a/res/images/preferences/light/ic_preferences_recording.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_replaygain.svg b/res/images/preferences/light/ic_preferences_replaygain.svg
deleted file mode 100644
index 08c8dfe67ef6..000000000000
--- a/res/images/preferences/light/ic_preferences_replaygain.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_sampler.svg b/res/images/preferences/light/ic_preferences_sampler.svg
deleted file mode 100644
index e0766ac4490a..000000000000
--- a/res/images/preferences/light/ic_preferences_sampler.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_soundhardware.svg b/res/images/preferences/light/ic_preferences_soundhardware.svg
deleted file mode 100644
index 67fafc3bb875..000000000000
--- a/res/images/preferences/light/ic_preferences_soundhardware.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_vinyl.svg b/res/images/preferences/light/ic_preferences_vinyl.svg
deleted file mode 100644
index 7f895e62b893..000000000000
--- a/res/images/preferences/light/ic_preferences_vinyl.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
diff --git a/res/images/preferences/light/ic_preferences_waveforms.svg b/res/images/preferences/light/ic_preferences_waveforms.svg
deleted file mode 100644
index 409e43f0eb55..000000000000
--- a/res/images/preferences/light/ic_preferences_waveforms.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/res/mixxx.qrc b/res/mixxx.qrc
index dc000de5d716..bf31f950ab96 100644
--- a/res/mixxx.qrc
+++ b/res/mixxx.qrc
@@ -37,45 +37,26 @@
images/ic_delete.svg
images/ic_mixxx_symbolic.svg
images/ic_none.svg
- images/preferences/dark/ic_preferences_autodj.svg
- images/preferences/dark/ic_preferences_bpmdetect.svg
- images/preferences/dark/ic_preferences_broadcast.svg
- images/preferences/dark/ic_preferences_colors.svg
- images/preferences/dark/ic_preferences_controllers.svg
- images/preferences/dark/ic_preferences_crossfader.svg
- images/preferences/dark/ic_preferences_decks.svg
- images/preferences/dark/ic_preferences_effects.svg
- images/preferences/dark/ic_preferences_equalizers.svg
- images/preferences/dark/ic_preferences_interface.svg
- images/preferences/dark/ic_preferences_keydetect.svg
- images/preferences/dark/ic_preferences_library.svg
- images/preferences/dark/ic_preferences_lv2.svg
- images/preferences/dark/ic_preferences_modplug.svg
- images/preferences/dark/ic_preferences_recording.svg
- images/preferences/dark/ic_preferences_replaygain.svg
- images/preferences/dark/ic_preferences_soundhardware.svg
- images/preferences/dark/ic_preferences_vinyl.svg
- images/preferences/dark/ic_preferences_waveforms.svg
- images/preferences/light/ic_preferences_autodj.svg
- images/preferences/light/ic_preferences_bpmdetect.svg
- images/preferences/light/ic_preferences_broadcast.svg
- images/preferences/light/ic_preferences_colors.svg
- images/preferences/light/ic_preferences_controllers.svg
- images/preferences/light/ic_preferences_crossfader.svg
- images/preferences/light/ic_preferences_decks.svg
- images/preferences/light/ic_preferences_effects.svg
- images/preferences/light/ic_preferences_equalizers.svg
- images/preferences/light/ic_preferences_interface.svg
- images/preferences/light/ic_preferences_keydetect.svg
- images/preferences/light/ic_preferences_library.svg
- images/preferences/light/ic_preferences_lv2.svg
- images/preferences/light/ic_preferences_modplug.svg
- images/preferences/light/ic_preferences_recording.svg
- images/preferences/light/ic_preferences_replaygain.svg
- images/preferences/light/ic_preferences_soundhardware.svg
- images/preferences/light/ic_preferences_vinyl.svg
- images/preferences/light/ic_preferences_waveforms.svg
+ images/preferences/ic_preferences_autodj.svg
+ images/preferences/ic_preferences_bpmdetect.svg
+ images/preferences/ic_preferences_broadcast.svg
+ images/preferences/ic_preferences_colors.svg
+ images/preferences/ic_preferences_controllers.svg
+ images/preferences/ic_preferences_crossfader.svg
+ images/preferences/ic_preferences_decks.svg
+ images/preferences/ic_preferences_effects.svg
+ images/preferences/ic_preferences_equalizers.svg
+ images/preferences/ic_preferences_interface.svg
+ images/preferences/ic_preferences_keydetect.svg
+ images/preferences/ic_preferences_library.svg
+ images/preferences/ic_preferences_lv2.svg
+ images/preferences/ic_preferences_modplug.svg
+ images/preferences/ic_preferences_recording.svg
+ images/preferences/ic_preferences_replaygain.svg
+ images/preferences/ic_preferences_soundhardware.svg
+ images/preferences/ic_preferences_vinyl.svg
images/preferences/ic_preferences_warning.svg
+ images/preferences/ic_preferences_waveforms.svg
schema.xml
shaders/filteredsignal.frag
shaders/passthrough.vert