diff --git a/rtdata/images/themed/png/dark/square-toggle-black-off.png b/rtdata/images/themed/png/dark/square-toggle-black-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-black-off.png
rename to rtdata/images/themed/png/dark/square-toggle-black-off-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-black-on.png b/rtdata/images/themed/png/dark/square-toggle-black-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-black-on.png
rename to rtdata/images/themed/png/dark/square-toggle-black-on-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-blue-off.png b/rtdata/images/themed/png/dark/square-toggle-blue-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-blue-off.png
rename to rtdata/images/themed/png/dark/square-toggle-blue-off-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-blue-on.png b/rtdata/images/themed/png/dark/square-toggle-blue-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-blue-on.png
rename to rtdata/images/themed/png/dark/square-toggle-blue-on-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-gray-off.png b/rtdata/images/themed/png/dark/square-toggle-gray-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-gray-off.png
rename to rtdata/images/themed/png/dark/square-toggle-gray-off-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-gray-on.png b/rtdata/images/themed/png/dark/square-toggle-gray-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-gray-on.png
rename to rtdata/images/themed/png/dark/square-toggle-gray-on-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-green-off.png b/rtdata/images/themed/png/dark/square-toggle-green-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-green-off.png
rename to rtdata/images/themed/png/dark/square-toggle-green-off-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-green-on.png b/rtdata/images/themed/png/dark/square-toggle-green-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-green-on.png
rename to rtdata/images/themed/png/dark/square-toggle-green-on-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-luminosity-off.png b/rtdata/images/themed/png/dark/square-toggle-luminosity-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-luminosity-off.png
rename to rtdata/images/themed/png/dark/square-toggle-luminosity-off-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-luminosity-on.png b/rtdata/images/themed/png/dark/square-toggle-luminosity-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-luminosity-on.png
rename to rtdata/images/themed/png/dark/square-toggle-luminosity-on-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-red-off.png b/rtdata/images/themed/png/dark/square-toggle-red-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-red-off.png
rename to rtdata/images/themed/png/dark/square-toggle-red-off-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-red-on.png b/rtdata/images/themed/png/dark/square-toggle-red-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-red-on.png
rename to rtdata/images/themed/png/dark/square-toggle-red-on-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-theme-off.png b/rtdata/images/themed/png/dark/square-toggle-theme-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-theme-off.png
rename to rtdata/images/themed/png/dark/square-toggle-theme-off-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-theme-on.png b/rtdata/images/themed/png/dark/square-toggle-theme-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-theme-on.png
rename to rtdata/images/themed/png/dark/square-toggle-theme-on-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-white-off.png b/rtdata/images/themed/png/dark/square-toggle-white-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-white-off.png
rename to rtdata/images/themed/png/dark/square-toggle-white-off-narrow.png
diff --git a/rtdata/images/themed/png/dark/square-toggle-white-on.png b/rtdata/images/themed/png/dark/square-toggle-white-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/dark/square-toggle-white-on.png
rename to rtdata/images/themed/png/dark/square-toggle-white-on-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-black-off.png b/rtdata/images/themed/png/light/square-toggle-black-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-black-off.png
rename to rtdata/images/themed/png/light/square-toggle-black-off-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-black-on.png b/rtdata/images/themed/png/light/square-toggle-black-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-black-on.png
rename to rtdata/images/themed/png/light/square-toggle-black-on-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-blue-off.png b/rtdata/images/themed/png/light/square-toggle-blue-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-blue-off.png
rename to rtdata/images/themed/png/light/square-toggle-blue-off-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-blue-on.png b/rtdata/images/themed/png/light/square-toggle-blue-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-blue-on.png
rename to rtdata/images/themed/png/light/square-toggle-blue-on-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-gray-off.png b/rtdata/images/themed/png/light/square-toggle-gray-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-gray-off.png
rename to rtdata/images/themed/png/light/square-toggle-gray-off-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-gray-on.png b/rtdata/images/themed/png/light/square-toggle-gray-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-gray-on.png
rename to rtdata/images/themed/png/light/square-toggle-gray-on-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-green-off.png b/rtdata/images/themed/png/light/square-toggle-green-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-green-off.png
rename to rtdata/images/themed/png/light/square-toggle-green-off-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-green-on.png b/rtdata/images/themed/png/light/square-toggle-green-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-green-on.png
rename to rtdata/images/themed/png/light/square-toggle-green-on-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-luminosity-off.png b/rtdata/images/themed/png/light/square-toggle-luminosity-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-luminosity-off.png
rename to rtdata/images/themed/png/light/square-toggle-luminosity-off-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-luminosity-on.png b/rtdata/images/themed/png/light/square-toggle-luminosity-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-luminosity-on.png
rename to rtdata/images/themed/png/light/square-toggle-luminosity-on-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-red-off.png b/rtdata/images/themed/png/light/square-toggle-red-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-red-off.png
rename to rtdata/images/themed/png/light/square-toggle-red-off-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-red-on.png b/rtdata/images/themed/png/light/square-toggle-red-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-red-on.png
rename to rtdata/images/themed/png/light/square-toggle-red-on-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-theme-off.png b/rtdata/images/themed/png/light/square-toggle-theme-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-theme-off.png
rename to rtdata/images/themed/png/light/square-toggle-theme-off-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-theme-on.png b/rtdata/images/themed/png/light/square-toggle-theme-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-theme-on.png
rename to rtdata/images/themed/png/light/square-toggle-theme-on-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-white-off.png b/rtdata/images/themed/png/light/square-toggle-white-off-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-white-off.png
rename to rtdata/images/themed/png/light/square-toggle-white-off-narrow.png
diff --git a/rtdata/images/themed/png/light/square-toggle-white-on.png b/rtdata/images/themed/png/light/square-toggle-white-on-narrow.png
similarity index 100%
rename from rtdata/images/themed/png/light/square-toggle-white-on.png
rename to rtdata/images/themed/png/light/square-toggle-white-on-narrow.png
diff --git a/rtdata/images/themed/svg/square-toggle-black-off.svg b/rtdata/images/themed/svg/square-toggle-black-off-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-black-off.svg
rename to rtdata/images/themed/svg/square-toggle-black-off-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-black-on.svg b/rtdata/images/themed/svg/square-toggle-black-on-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-black-on.svg
rename to rtdata/images/themed/svg/square-toggle-black-on-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-blue-off.svg b/rtdata/images/themed/svg/square-toggle-blue-off-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-blue-off.svg
rename to rtdata/images/themed/svg/square-toggle-blue-off-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-blue-on.svg b/rtdata/images/themed/svg/square-toggle-blue-on-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-blue-on.svg
rename to rtdata/images/themed/svg/square-toggle-blue-on-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-gray-off.svg b/rtdata/images/themed/svg/square-toggle-gray-off-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-gray-off.svg
rename to rtdata/images/themed/svg/square-toggle-gray-off-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-gray-on.svg b/rtdata/images/themed/svg/square-toggle-gray-on-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-gray-on.svg
rename to rtdata/images/themed/svg/square-toggle-gray-on-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-green-off.svg b/rtdata/images/themed/svg/square-toggle-green-off-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-green-off.svg
rename to rtdata/images/themed/svg/square-toggle-green-off-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-green-on.svg b/rtdata/images/themed/svg/square-toggle-green-on-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-green-on.svg
rename to rtdata/images/themed/svg/square-toggle-green-on-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-luminosity-off.svg b/rtdata/images/themed/svg/square-toggle-luminosity-off-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-luminosity-off.svg
rename to rtdata/images/themed/svg/square-toggle-luminosity-off-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-luminosity-on.svg b/rtdata/images/themed/svg/square-toggle-luminosity-on-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-luminosity-on.svg
rename to rtdata/images/themed/svg/square-toggle-luminosity-on-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-red-off.svg b/rtdata/images/themed/svg/square-toggle-red-off-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-red-off.svg
rename to rtdata/images/themed/svg/square-toggle-red-off-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-red-on.svg b/rtdata/images/themed/svg/square-toggle-red-on-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-red-on.svg
rename to rtdata/images/themed/svg/square-toggle-red-on-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-theme-off.svg b/rtdata/images/themed/svg/square-toggle-theme-off-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-theme-off.svg
rename to rtdata/images/themed/svg/square-toggle-theme-off-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-theme-on.svg b/rtdata/images/themed/svg/square-toggle-theme-on-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-theme-on.svg
rename to rtdata/images/themed/svg/square-toggle-theme-on-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-white-off.svg b/rtdata/images/themed/svg/square-toggle-white-off-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-white-off.svg
rename to rtdata/images/themed/svg/square-toggle-white-off-narrow.svg
diff --git a/rtdata/images/themed/svg/square-toggle-white-on.svg b/rtdata/images/themed/svg/square-toggle-white-on-narrow.svg
similarity index 100%
rename from rtdata/images/themed/svg/square-toggle-white-on.svg
rename to rtdata/images/themed/svg/square-toggle-white-on-narrow.svg
diff --git a/rtgui/previewmodepanel.cc b/rtgui/previewmodepanel.cc
index 4b821f298..086f6ab17 100644
--- a/rtgui/previewmodepanel.cc
+++ b/rtgui/previewmodepanel.cc
@@ -24,23 +24,23 @@
 PreviewModePanel::PreviewModePanel (ImageArea* ia) : imageArea(ia)
 {
 
-    iR  = new RTImage ("square-toggle-red-on.png");
-    iG  = new RTImage ("square-toggle-green-on.png");
-    iB  = new RTImage ("square-toggle-blue-on.png");
-    iL  = new RTImage ("square-toggle-luminosity-on.png");
-    iBC0 = new RTImage ("square-toggle-theme-on.png");
-    iBC1 = new RTImage ("square-toggle-black-on.png");
-    iBC2 = new RTImage ("square-toggle-white-on.png");
-    iBC3 = new RTImage ("square-toggle-gray-on.png");
+    iR  = new RTImage ("square-toggle-red-on-narrow.png");
+    iG  = new RTImage ("square-toggle-green-on-narrow.png");
+    iB  = new RTImage ("square-toggle-blue-on-narrow.png");
+    iL  = new RTImage ("square-toggle-luminosity-on-narrow.png");
+    iBC0 = new RTImage ("square-toggle-theme-on-narrow.png");
+    iBC1 = new RTImage ("square-toggle-black-on-narrow.png");
+    iBC2 = new RTImage ("square-toggle-white-on-narrow.png");
+    iBC3 = new RTImage ("square-toggle-gray-on-narrow.png");
 
-    igR = new RTImage ("square-toggle-red-off.png");
-    igG = new RTImage ("square-toggle-green-off.png");
-    igB = new RTImage ("square-toggle-blue-off.png");
-    igL = new RTImage ("square-toggle-luminosity-off.png");
-    igBC0 = new RTImage ("square-toggle-theme-off.png");
-    igBC1 = new RTImage ("square-toggle-black-off.png");
-    igBC2 = new RTImage ("square-toggle-white-off.png");
-    igBC3 = new RTImage ("square-toggle-gray-off.png");
+    igR = new RTImage ("square-toggle-red-off-narrow.png");
+    igG = new RTImage ("square-toggle-green-off-narrow.png");
+    igB = new RTImage ("square-toggle-blue-off-narrow.png");
+    igL = new RTImage ("square-toggle-luminosity-off-narrow.png");
+    igBC0 = new RTImage ("square-toggle-theme-off-narrow.png");
+    igBC1 = new RTImage ("square-toggle-black-off-narrow.png");
+    igBC2 = new RTImage ("square-toggle-white-off-narrow.png");
+    igBC3 = new RTImage ("square-toggle-gray-off-narrow.png");
 
     backColor0 = Gtk::manage (new Gtk::ToggleButton ());
     backColor0->get_style_context()->add_class("narrowbutton");