diff --git a/rtdata/images/themed/png/dark/add-small.png b/rtdata/images/themed/png/dark/add-small.png
index 9f0dabd9c..44a3d8639 100644
Binary files a/rtdata/images/themed/png/dark/add-small.png and b/rtdata/images/themed/png/dark/add-small.png differ
diff --git a/rtdata/images/themed/png/dark/add.png b/rtdata/images/themed/png/dark/add.png
index 378076196..6b401bc87 100644
Binary files a/rtdata/images/themed/png/dark/add.png and b/rtdata/images/themed/png/dark/add.png differ
diff --git a/rtdata/images/themed/png/dark/aperture.png b/rtdata/images/themed/png/dark/aperture.png
index 616c38d5e..a80fda199 100644
Binary files a/rtdata/images/themed/png/dark/aperture.png and b/rtdata/images/themed/png/dark/aperture.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-down-small.png b/rtdata/images/themed/png/dark/arrow-down-small.png
index 497ab14ca..3c1b4033a 100644
Binary files a/rtdata/images/themed/png/dark/arrow-down-small.png and b/rtdata/images/themed/png/dark/arrow-down-small.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-left-small.png b/rtdata/images/themed/png/dark/arrow-left-small.png
index 6d28bdadc..b8245b953 100644
Binary files a/rtdata/images/themed/png/dark/arrow-left-small.png and b/rtdata/images/themed/png/dark/arrow-left-small.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-right-small.png b/rtdata/images/themed/png/dark/arrow-right-small.png
index 432e25d04..83177a23a 100644
Binary files a/rtdata/images/themed/png/dark/arrow-right-small.png and b/rtdata/images/themed/png/dark/arrow-right-small.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-up-small.png b/rtdata/images/themed/png/dark/arrow-up-small.png
index b3a19fb69..0483b3e73 100644
Binary files a/rtdata/images/themed/png/dark/arrow-up-small.png and b/rtdata/images/themed/png/dark/arrow-up-small.png differ
diff --git a/rtdata/images/themed/png/dark/arrow-updown.png b/rtdata/images/themed/png/dark/arrow-updown.png
index 234ba7986..cd2c0b14e 100644
Binary files a/rtdata/images/themed/png/dark/arrow-updown.png and b/rtdata/images/themed/png/dark/arrow-updown.png differ
diff --git a/rtdata/images/themed/png/dark/arrow2-left.png b/rtdata/images/themed/png/dark/arrow2-left.png
index 1a770f16b..dd0c0c3d7 100644
Binary files a/rtdata/images/themed/png/dark/arrow2-left.png and b/rtdata/images/themed/png/dark/arrow2-left.png differ
diff --git a/rtdata/images/themed/png/dark/arrow2-right.png b/rtdata/images/themed/png/dark/arrow2-right.png
index 295b63663..2ee87ec71 100644
Binary files a/rtdata/images/themed/png/dark/arrow2-right.png and b/rtdata/images/themed/png/dark/arrow2-right.png differ
diff --git a/rtdata/images/themed/png/dark/atom.png b/rtdata/images/themed/png/dark/atom.png
index 439c27e6c..9de042fbb 100644
Binary files a/rtdata/images/themed/png/dark/atom.png and b/rtdata/images/themed/png/dark/atom.png differ
diff --git a/rtdata/images/themed/png/dark/bayer.png b/rtdata/images/themed/png/dark/bayer.png
index f28af15e1..035318b9a 100644
Binary files a/rtdata/images/themed/png/dark/bayer.png and b/rtdata/images/themed/png/dark/bayer.png differ
diff --git a/rtdata/images/themed/png/dark/beforeafter.png b/rtdata/images/themed/png/dark/beforeafter.png
index 1c1cec2a0..25bd64b5a 100644
Binary files a/rtdata/images/themed/png/dark/beforeafter.png and b/rtdata/images/themed/png/dark/beforeafter.png differ
diff --git a/rtdata/images/themed/png/dark/cancel-small.png b/rtdata/images/themed/png/dark/cancel-small.png
index d92fb615d..8a812e8f3 100644
Binary files a/rtdata/images/themed/png/dark/cancel-small.png and b/rtdata/images/themed/png/dark/cancel-small.png differ
diff --git a/rtdata/images/themed/png/dark/cancel.png b/rtdata/images/themed/png/dark/cancel.png
index 78f1e034a..6eda05c50 100644
Binary files a/rtdata/images/themed/png/dark/cancel.png and b/rtdata/images/themed/png/dark/cancel.png differ
diff --git a/rtdata/images/themed/png/dark/power-off.png b/rtdata/images/themed/png/dark/circle-black-small.png
similarity index 64%
rename from rtdata/images/themed/png/dark/power-off.png
rename to rtdata/images/themed/png/dark/circle-black-small.png
index a4e3049fe..f18a415b6 100644
Binary files a/rtdata/images/themed/png/dark/power-off.png and b/rtdata/images/themed/png/dark/circle-black-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-black.png b/rtdata/images/themed/png/dark/circle-black.png
deleted file mode 100644
index 5184a8118..000000000
Binary files a/rtdata/images/themed/png/dark/circle-black.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-blue-yellow.png b/rtdata/images/themed/png/dark/circle-blue-green-small.png
similarity index 58%
rename from rtdata/images/themed/png/light/circle-blue-yellow.png
rename to rtdata/images/themed/png/dark/circle-blue-green-small.png
index c2b449019..247931823 100644
Binary files a/rtdata/images/themed/png/light/circle-blue-yellow.png and b/rtdata/images/themed/png/dark/circle-blue-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-gray-blue.png b/rtdata/images/themed/png/dark/circle-blue-red-small.png
similarity index 56%
rename from rtdata/images/themed/png/dark/circle-gray-blue.png
rename to rtdata/images/themed/png/dark/circle-blue-red-small.png
index 3e1ea9c21..d88a01330 100644
Binary files a/rtdata/images/themed/png/dark/circle-gray-blue.png and b/rtdata/images/themed/png/dark/circle-blue-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-blue-red.png b/rtdata/images/themed/png/dark/circle-blue-red.png
deleted file mode 100644
index 1c5a0b03a..000000000
Binary files a/rtdata/images/themed/png/dark/circle-blue-red.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/circle-purple.png b/rtdata/images/themed/png/dark/circle-blue-small.png
similarity index 64%
rename from rtdata/images/themed/png/dark/circle-purple.png
rename to rtdata/images/themed/png/dark/circle-blue-small.png
index 6d9ee4ab0..2c8ff48fd 100644
Binary files a/rtdata/images/themed/png/dark/circle-purple.png and b/rtdata/images/themed/png/dark/circle-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-blue-yellow.png b/rtdata/images/themed/png/dark/circle-blue-yellow-small.png
similarity index 58%
rename from rtdata/images/themed/png/dark/circle-blue-yellow.png
rename to rtdata/images/themed/png/dark/circle-blue-yellow-small.png
index c2b449019..0585b2195 100644
Binary files a/rtdata/images/themed/png/dark/circle-blue-yellow.png and b/rtdata/images/themed/png/dark/circle-blue-yellow-small.png differ
diff --git a/rtdata/images/themed/png/dark/power-inconsistent.png b/rtdata/images/themed/png/dark/circle-cyan-red-small.png
similarity index 57%
rename from rtdata/images/themed/png/dark/power-inconsistent.png
rename to rtdata/images/themed/png/dark/circle-cyan-red-small.png
index af505cf67..ed7003161 100644
Binary files a/rtdata/images/themed/png/dark/power-inconsistent.png and b/rtdata/images/themed/png/dark/circle-cyan-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-orange.png b/rtdata/images/themed/png/dark/circle-cyan-small.png
similarity index 63%
rename from rtdata/images/themed/png/light/circle-orange.png
rename to rtdata/images/themed/png/dark/circle-cyan-small.png
index deb5d5460..84f873a2c 100644
Binary files a/rtdata/images/themed/png/light/circle-orange.png and b/rtdata/images/themed/png/dark/circle-cyan-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-cyan.png b/rtdata/images/themed/png/dark/circle-cyan.png
deleted file mode 100644
index 0a3a29bd7..000000000
Binary files a/rtdata/images/themed/png/dark/circle-cyan.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/circle-gray-red.png b/rtdata/images/themed/png/dark/circle-empty-blue-small.png
similarity index 60%
rename from rtdata/images/themed/png/dark/circle-gray-red.png
rename to rtdata/images/themed/png/dark/circle-empty-blue-small.png
index f02e29943..d53b3516e 100644
Binary files a/rtdata/images/themed/png/dark/circle-gray-red.png and b/rtdata/images/themed/png/dark/circle-empty-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-magenta.png b/rtdata/images/themed/png/dark/circle-empty-darkgray-small.png
similarity index 62%
rename from rtdata/images/themed/png/dark/circle-magenta.png
rename to rtdata/images/themed/png/dark/circle-empty-darkgray-small.png
index b09696ff8..4f0f0f4c7 100644
Binary files a/rtdata/images/themed/png/dark/circle-magenta.png and b/rtdata/images/themed/png/dark/circle-empty-darkgray-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-gray-small.png b/rtdata/images/themed/png/dark/circle-empty-gray-small.png
new file mode 100644
index 000000000..b3a57c83b
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-gray-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-gray.png b/rtdata/images/themed/png/dark/circle-empty-gray.png
deleted file mode 100644
index f60b60e35..000000000
Binary files a/rtdata/images/themed/png/dark/circle-empty-gray.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-empty-blue.png b/rtdata/images/themed/png/dark/circle-empty-green-small.png
similarity index 60%
rename from rtdata/images/themed/png/light/circle-empty-blue.png
rename to rtdata/images/themed/png/dark/circle-empty-green-small.png
index c6b7c8e42..3b1444d37 100644
Binary files a/rtdata/images/themed/png/light/circle-empty-blue.png and b/rtdata/images/themed/png/dark/circle-empty-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-purple-small.png b/rtdata/images/themed/png/dark/circle-empty-purple-small.png
new file mode 100644
index 000000000..e61da8e9f
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-purple-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-red-small.png b/rtdata/images/themed/png/dark/circle-empty-red-small.png
new file mode 100644
index 000000000..bf8035931
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-empty-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-blue.png b/rtdata/images/themed/png/dark/circle-empty-yellow-small.png
similarity index 60%
rename from rtdata/images/themed/png/dark/circle-empty-blue.png
rename to rtdata/images/themed/png/dark/circle-empty-yellow-small.png
index c6b7c8e42..9a3ca9bd8 100644
Binary files a/rtdata/images/themed/png/dark/circle-empty-blue.png and b/rtdata/images/themed/png/dark/circle-empty-yellow-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-yellow.png b/rtdata/images/themed/png/dark/circle-empty-yellow.png
deleted file mode 100644
index a84bd12f9..000000000
Binary files a/rtdata/images/themed/png/dark/circle-empty-yellow.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-green-blue.png b/rtdata/images/themed/png/dark/circle-gray-blue-small.png
similarity index 58%
rename from rtdata/images/themed/png/light/circle-green-blue.png
rename to rtdata/images/themed/png/dark/circle-gray-blue-small.png
index a78430152..01d5da881 100644
Binary files a/rtdata/images/themed/png/light/circle-green-blue.png and b/rtdata/images/themed/png/dark/circle-gray-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-gray-green-small.png b/rtdata/images/themed/png/dark/circle-gray-green-small.png
new file mode 100644
index 000000000..2290b708f
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-gray-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-gray-green.png b/rtdata/images/themed/png/dark/circle-gray-green.png
deleted file mode 100644
index 8d071907d..000000000
Binary files a/rtdata/images/themed/png/dark/circle-gray-green.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-gray-red.png b/rtdata/images/themed/png/dark/circle-gray-red-small.png
similarity index 60%
rename from rtdata/images/themed/png/light/circle-gray-red.png
rename to rtdata/images/themed/png/dark/circle-gray-red-small.png
index f02e29943..29afda33b 100644
Binary files a/rtdata/images/themed/png/light/circle-gray-red.png and b/rtdata/images/themed/png/dark/circle-gray-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-blue-green.png b/rtdata/images/themed/png/dark/circle-green-blue-small.png
similarity index 55%
rename from rtdata/images/themed/png/dark/circle-blue-green.png
rename to rtdata/images/themed/png/dark/circle-green-blue-small.png
index a42d23eea..1d6e60252 100644
Binary files a/rtdata/images/themed/png/dark/circle-blue-green.png and b/rtdata/images/themed/png/dark/circle-green-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-green-blue.png b/rtdata/images/themed/png/dark/circle-green-red-small.png
similarity index 58%
rename from rtdata/images/themed/png/dark/circle-green-blue.png
rename to rtdata/images/themed/png/dark/circle-green-red-small.png
index a78430152..96f86b1b9 100644
Binary files a/rtdata/images/themed/png/dark/circle-green-blue.png and b/rtdata/images/themed/png/dark/circle-green-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-green-red.png b/rtdata/images/themed/png/dark/circle-green-red.png
deleted file mode 100644
index 500a698a0..000000000
Binary files a/rtdata/images/themed/png/dark/circle-green-red.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-purple.png b/rtdata/images/themed/png/dark/circle-green-small.png
similarity index 64%
rename from rtdata/images/themed/png/light/circle-purple.png
rename to rtdata/images/themed/png/dark/circle-green-small.png
index 6d9ee4ab0..88270e0cb 100644
Binary files a/rtdata/images/themed/png/light/circle-purple.png and b/rtdata/images/themed/png/dark/circle-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-green.png b/rtdata/images/themed/png/dark/circle-green.png
deleted file mode 100644
index b84308f78..000000000
Binary files a/rtdata/images/themed/png/dark/circle-green.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/circle-magenta-small.png b/rtdata/images/themed/png/dark/circle-magenta-small.png
new file mode 100644
index 000000000..cce26e1f2
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-magenta-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-orange-small.png b/rtdata/images/themed/png/dark/circle-orange-small.png
new file mode 100644
index 000000000..5894f0987
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-orange-small.png differ
diff --git a/rtdata/images/themed/png/dark/expander-open.png b/rtdata/images/themed/png/dark/circle-purple-small.png
similarity index 66%
rename from rtdata/images/themed/png/dark/expander-open.png
rename to rtdata/images/themed/png/dark/circle-purple-small.png
index a86ebedcf..9fe4eb0d6 100644
Binary files a/rtdata/images/themed/png/dark/expander-open.png and b/rtdata/images/themed/png/dark/circle-purple-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red-blue-small.png b/rtdata/images/themed/png/dark/circle-red-blue-small.png
new file mode 100644
index 000000000..e70ef22f6
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-red-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red-blue.png b/rtdata/images/themed/png/dark/circle-red-blue.png
deleted file mode 100644
index dd181221c..000000000
Binary files a/rtdata/images/themed/png/dark/circle-red-blue.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-green.png b/rtdata/images/themed/png/dark/circle-red-cyan-small.png
similarity index 60%
rename from rtdata/images/themed/png/dark/circle-empty-green.png
rename to rtdata/images/themed/png/dark/circle-red-cyan-small.png
index b6c908493..92b03b953 100644
Binary files a/rtdata/images/themed/png/dark/circle-empty-green.png and b/rtdata/images/themed/png/dark/circle-red-cyan-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red-cyan.png b/rtdata/images/themed/png/dark/circle-red-cyan.png
deleted file mode 100644
index c1b81e1f5..000000000
Binary files a/rtdata/images/themed/png/dark/circle-red-cyan.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/circle-red-green-small.png b/rtdata/images/themed/png/dark/circle-red-green-small.png
new file mode 100644
index 000000000..4572e019f
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-red-green-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red-small.png b/rtdata/images/themed/png/dark/circle-red-small.png
new file mode 100644
index 000000000..a8c9cecec
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-red-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red.png b/rtdata/images/themed/png/dark/circle-red.png
deleted file mode 100644
index 691a2a276..000000000
Binary files a/rtdata/images/themed/png/dark/circle-red.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/circle-white-small.png b/rtdata/images/themed/png/dark/circle-white-small.png
new file mode 100644
index 000000000..acf4f8b76
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-white-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-red.png b/rtdata/images/themed/png/dark/circle-yellow-blue-small.png
similarity index 59%
rename from rtdata/images/themed/png/light/circle-empty-red.png
rename to rtdata/images/themed/png/dark/circle-yellow-blue-small.png
index 6a7506ff2..1f7aec9f2 100644
Binary files a/rtdata/images/themed/png/light/circle-empty-red.png and b/rtdata/images/themed/png/dark/circle-yellow-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-orange.png b/rtdata/images/themed/png/dark/circle-yellow-small.png
similarity index 63%
rename from rtdata/images/themed/png/dark/circle-orange.png
rename to rtdata/images/themed/png/dark/circle-yellow-small.png
index deb5d5460..1c5678ac2 100644
Binary files a/rtdata/images/themed/png/dark/circle-orange.png and b/rtdata/images/themed/png/dark/circle-yellow-small.png differ
diff --git a/rtdata/images/themed/png/dark/color-circles.png b/rtdata/images/themed/png/dark/color-circles.png
index 463705f84..f4b974b13 100644
Binary files a/rtdata/images/themed/png/dark/color-circles.png and b/rtdata/images/themed/png/dark/color-circles.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-add.png b/rtdata/images/themed/png/dark/color-picker-add.png
index 2d7dfc159..a752ee2f4 100644
Binary files a/rtdata/images/themed/png/dark/color-picker-add.png and b/rtdata/images/themed/png/dark/color-picker-add.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-hide.png b/rtdata/images/themed/png/dark/color-picker-hide.png
index 7ae473a73..992ee2354 100644
Binary files a/rtdata/images/themed/png/dark/color-picker-hide.png and b/rtdata/images/themed/png/dark/color-picker-hide.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-show.png b/rtdata/images/themed/png/dark/color-picker-show.png
index b8f9ac0bb..acd3699eb 100644
Binary files a/rtdata/images/themed/png/dark/color-picker-show.png and b/rtdata/images/themed/png/dark/color-picker-show.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker.png b/rtdata/images/themed/png/dark/color-picker.png
index bf7d6cfb5..1a39d857a 100644
Binary files a/rtdata/images/themed/png/dark/color-picker.png and b/rtdata/images/themed/png/dark/color-picker.png differ
diff --git a/rtdata/images/themed/png/dark/contrastmask-off.png b/rtdata/images/themed/png/dark/contrastmask-off.png
index 8d7f5f417..f551f5413 100644
Binary files a/rtdata/images/themed/png/dark/contrastmask-off.png and b/rtdata/images/themed/png/dark/contrastmask-off.png differ
diff --git a/rtdata/images/themed/png/dark/contrastmask-on.png b/rtdata/images/themed/png/dark/contrastmask-on.png
index dce3ce99e..28ea71f52 100644
Binary files a/rtdata/images/themed/png/dark/contrastmask-on.png and b/rtdata/images/themed/png/dark/contrastmask-on.png differ
diff --git a/rtdata/images/themed/png/dark/copy.png b/rtdata/images/themed/png/dark/copy.png
index 962e22c53..3b51949ed 100644
Binary files a/rtdata/images/themed/png/dark/copy.png and b/rtdata/images/themed/png/dark/copy.png differ
diff --git a/rtdata/images/themed/png/dark/crop-auto-small.png b/rtdata/images/themed/png/dark/crop-auto-small.png
new file mode 100644
index 000000000..d7942888d
Binary files /dev/null and b/rtdata/images/themed/png/dark/crop-auto-small.png differ
diff --git a/rtdata/images/themed/png/dark/crop-auto.png b/rtdata/images/themed/png/dark/crop-auto.png
index e6aa3e22e..52cbd9e77 100644
Binary files a/rtdata/images/themed/png/dark/crop-auto.png and b/rtdata/images/themed/png/dark/crop-auto.png differ
diff --git a/rtdata/images/themed/png/dark/crop-small.png b/rtdata/images/themed/png/dark/crop-small.png
new file mode 100644
index 000000000..aa278c16c
Binary files /dev/null and b/rtdata/images/themed/png/dark/crop-small.png differ
diff --git a/rtdata/images/themed/png/dark/crop.png b/rtdata/images/themed/png/dark/crop.png
index 34f1b7148..d8a290eec 100644
Binary files a/rtdata/images/themed/png/dark/crop.png and b/rtdata/images/themed/png/dark/crop.png differ
diff --git a/rtdata/images/themed/png/dark/crossed-arrows-in.png b/rtdata/images/themed/png/dark/crossed-arrows-in.png
index f927235b3..531803679 100644
Binary files a/rtdata/images/themed/png/dark/crossed-arrows-in.png and b/rtdata/images/themed/png/dark/crossed-arrows-in.png differ
diff --git a/rtdata/images/themed/png/dark/crossed-arrows-out.png b/rtdata/images/themed/png/dark/crossed-arrows-out.png
index c025fbcd5..c05eb3fe8 100644
Binary files a/rtdata/images/themed/png/dark/crossed-arrows-out.png and b/rtdata/images/themed/png/dark/crossed-arrows-out.png differ
diff --git a/rtdata/images/themed/png/dark/crosshair-adjust.png b/rtdata/images/themed/png/dark/crosshair-adjust.png
index f8d5e3625..72704177c 100644
Binary files a/rtdata/images/themed/png/dark/crosshair-adjust.png and b/rtdata/images/themed/png/dark/crosshair-adjust.png differ
diff --git a/rtdata/images/themed/png/dark/circle-white.png b/rtdata/images/themed/png/dark/curve-controlpoints-small.png
similarity index 62%
rename from rtdata/images/themed/png/dark/circle-white.png
rename to rtdata/images/themed/png/dark/curve-controlpoints-small.png
index aff1eb392..e4107e5e4 100644
Binary files a/rtdata/images/themed/png/dark/circle-white.png and b/rtdata/images/themed/png/dark/curve-controlpoints-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-controlpoints.png b/rtdata/images/themed/png/dark/curve-controlpoints.png
index e2d459cb6..e85d1a214 100644
Binary files a/rtdata/images/themed/png/dark/curve-controlpoints.png and b/rtdata/images/themed/png/dark/curve-controlpoints.png differ
diff --git a/rtdata/images/themed/png/dark/curve-flat-small.png b/rtdata/images/themed/png/dark/curve-flat-small.png
new file mode 100644
index 000000000..61893e320
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-flat-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-flat.png b/rtdata/images/themed/png/dark/curve-flat.png
index e70325842..7621dd8a0 100644
Binary files a/rtdata/images/themed/png/dark/curve-flat.png and b/rtdata/images/themed/png/dark/curve-flat.png differ
diff --git a/rtdata/images/themed/png/dark/curve-linear-small.png b/rtdata/images/themed/png/dark/curve-linear-small.png
new file mode 100644
index 000000000..723d29e93
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-linear-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-linear.png b/rtdata/images/themed/png/dark/curve-linear.png
index 94f137045..60a8b3d73 100644
Binary files a/rtdata/images/themed/png/dark/curve-linear.png and b/rtdata/images/themed/png/dark/curve-linear.png differ
diff --git a/rtdata/images/themed/png/dark/curve-nurbs-small.png b/rtdata/images/themed/png/dark/curve-nurbs-small.png
new file mode 100644
index 000000000..0ba221d92
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-nurbs-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-nurbs.png b/rtdata/images/themed/png/dark/curve-nurbs.png
index 51ede50a2..8d9425a0b 100644
Binary files a/rtdata/images/themed/png/dark/curve-nurbs.png and b/rtdata/images/themed/png/dark/curve-nurbs.png differ
diff --git a/rtdata/images/themed/png/dark/curve-parametric-small.png b/rtdata/images/themed/png/dark/curve-parametric-small.png
new file mode 100644
index 000000000..237b76125
Binary files /dev/null and b/rtdata/images/themed/png/dark/curve-parametric-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-parametric.png b/rtdata/images/themed/png/dark/curve-parametric.png
index 84a1dfaf0..97f3ac96b 100644
Binary files a/rtdata/images/themed/png/dark/curve-parametric.png and b/rtdata/images/themed/png/dark/curve-parametric.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-red.png b/rtdata/images/themed/png/dark/curve-spline-small.png
similarity index 59%
rename from rtdata/images/themed/png/dark/circle-empty-red.png
rename to rtdata/images/themed/png/dark/curve-spline-small.png
index 6a7506ff2..763beda56 100644
Binary files a/rtdata/images/themed/png/dark/circle-empty-red.png and b/rtdata/images/themed/png/dark/curve-spline-small.png differ
diff --git a/rtdata/images/themed/png/dark/curve-spline.png b/rtdata/images/themed/png/dark/curve-spline.png
index 5fee9fefd..c86105d46 100644
Binary files a/rtdata/images/themed/png/dark/curve-spline.png and b/rtdata/images/themed/png/dark/curve-spline.png differ
diff --git a/rtdata/images/themed/png/dark/detail.png b/rtdata/images/themed/png/dark/detail.png
index 6a3f5999f..73ee6a9f0 100644
Binary files a/rtdata/images/themed/png/dark/detail.png and b/rtdata/images/themed/png/dark/detail.png differ
diff --git a/rtdata/images/themed/png/dark/device-floppy.png b/rtdata/images/themed/png/dark/device-floppy.png
index c04225115..1aed2f16e 100644
Binary files a/rtdata/images/themed/png/dark/device-floppy.png and b/rtdata/images/themed/png/dark/device-floppy.png differ
diff --git a/rtdata/images/themed/png/dark/device-hdd.png b/rtdata/images/themed/png/dark/device-hdd.png
index 49af9e6bf..92ddc0e01 100644
Binary files a/rtdata/images/themed/png/dark/device-hdd.png and b/rtdata/images/themed/png/dark/device-hdd.png differ
diff --git a/rtdata/images/themed/png/dark/device-network.png b/rtdata/images/themed/png/dark/device-network.png
index ae0bb878d..4aa2516ef 100644
Binary files a/rtdata/images/themed/png/dark/device-network.png and b/rtdata/images/themed/png/dark/device-network.png differ
diff --git a/rtdata/images/themed/png/dark/device-optical.png b/rtdata/images/themed/png/dark/device-optical.png
index 7334c71ba..e5cd69a02 100644
Binary files a/rtdata/images/themed/png/dark/device-optical.png and b/rtdata/images/themed/png/dark/device-optical.png differ
diff --git a/rtdata/images/themed/png/dark/device-usb.png b/rtdata/images/themed/png/dark/device-usb.png
index 805a6a002..a19b591e6 100644
Binary files a/rtdata/images/themed/png/dark/device-usb.png and b/rtdata/images/themed/png/dark/device-usb.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-auto-small.png b/rtdata/images/themed/png/dark/distortion-auto-small.png
new file mode 100644
index 000000000..e002a4ae7
Binary files /dev/null and b/rtdata/images/themed/png/dark/distortion-auto-small.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-auto.png b/rtdata/images/themed/png/dark/distortion-auto.png
index 5cb841cb1..28c89da36 100644
Binary files a/rtdata/images/themed/png/dark/distortion-auto.png and b/rtdata/images/themed/png/dark/distortion-auto.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-barrel-small.png b/rtdata/images/themed/png/dark/distortion-barrel-small.png
new file mode 100644
index 000000000..531fd93d9
Binary files /dev/null and b/rtdata/images/themed/png/dark/distortion-barrel-small.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-barrel.png b/rtdata/images/themed/png/dark/distortion-barrel.png
index 3ebac6efe..44f312dc9 100644
Binary files a/rtdata/images/themed/png/dark/distortion-barrel.png and b/rtdata/images/themed/png/dark/distortion-barrel.png differ
diff --git a/rtdata/images/themed/png/light/circle-gray-blue.png b/rtdata/images/themed/png/dark/distortion-pincushion-small.png
similarity index 56%
rename from rtdata/images/themed/png/light/circle-gray-blue.png
rename to rtdata/images/themed/png/dark/distortion-pincushion-small.png
index 3e1ea9c21..c33205d78 100644
Binary files a/rtdata/images/themed/png/light/circle-gray-blue.png and b/rtdata/images/themed/png/dark/distortion-pincushion-small.png differ
diff --git a/rtdata/images/themed/png/dark/distortion-pincushion.png b/rtdata/images/themed/png/dark/distortion-pincushion.png
index 45d497ea8..219dc6d37 100644
Binary files a/rtdata/images/themed/png/dark/distortion-pincushion.png and b/rtdata/images/themed/png/dark/distortion-pincushion.png differ
diff --git a/rtdata/images/themed/png/dark/edit-point.png b/rtdata/images/themed/png/dark/edit-point.png
index eb9c3045b..1c3317f86 100644
Binary files a/rtdata/images/themed/png/dark/edit-point.png and b/rtdata/images/themed/png/dark/edit-point.png differ
diff --git a/rtdata/images/themed/png/dark/equilizer-narrow.png b/rtdata/images/themed/png/dark/equilizer-narrow.png
index b2471c5ca..6ee072ae5 100644
Binary files a/rtdata/images/themed/png/dark/equilizer-narrow.png and b/rtdata/images/themed/png/dark/equilizer-narrow.png differ
diff --git a/rtdata/images/themed/png/dark/equilizer-wide.png b/rtdata/images/themed/png/dark/equilizer-wide.png
index 61cab4f49..37c07c605 100644
Binary files a/rtdata/images/themed/png/dark/equilizer-wide.png and b/rtdata/images/themed/png/dark/equilizer-wide.png differ
diff --git a/rtdata/images/themed/png/dark/expander-closed.png b/rtdata/images/themed/png/dark/expander-closed-small.png
similarity index 70%
rename from rtdata/images/themed/png/dark/expander-closed.png
rename to rtdata/images/themed/png/dark/expander-closed-small.png
index 87a819fb5..b59480cd5 100644
Binary files a/rtdata/images/themed/png/dark/expander-closed.png and b/rtdata/images/themed/png/dark/expander-closed-small.png differ
diff --git a/rtdata/images/themed/png/dark/expander-open-small.png b/rtdata/images/themed/png/dark/expander-open-small.png
new file mode 100644
index 000000000..15b74149a
Binary files /dev/null and b/rtdata/images/themed/png/dark/expander-open-small.png differ
diff --git a/rtdata/images/themed/png/dark/exposure.png b/rtdata/images/themed/png/dark/exposure.png
index 604e2a8ee..f7cc6e155 100644
Binary files a/rtdata/images/themed/png/dark/exposure.png and b/rtdata/images/themed/png/dark/exposure.png differ
diff --git a/rtdata/images/themed/png/dark/filetype-hdr.png b/rtdata/images/themed/png/dark/filetype-hdr.png
index 637b916ac..a333858d5 100644
Binary files a/rtdata/images/themed/png/dark/filetype-hdr.png and b/rtdata/images/themed/png/dark/filetype-hdr.png differ
diff --git a/rtdata/images/themed/png/dark/filetype-ps.png b/rtdata/images/themed/png/dark/filetype-ps.png
index 94ddfb7c3..414530cdd 100644
Binary files a/rtdata/images/themed/png/dark/filetype-ps.png and b/rtdata/images/themed/png/dark/filetype-ps.png differ
diff --git a/rtdata/images/themed/png/dark/filter-clear.png b/rtdata/images/themed/png/dark/filter-clear.png
index 635c18c82..acb729f11 100644
Binary files a/rtdata/images/themed/png/dark/filter-clear.png and b/rtdata/images/themed/png/dark/filter-clear.png differ
diff --git a/rtdata/images/themed/png/dark/filter-original.png b/rtdata/images/themed/png/dark/filter-original.png
index b87064b86..9f538fab4 100644
Binary files a/rtdata/images/themed/png/dark/filter-original.png and b/rtdata/images/themed/png/dark/filter-original.png differ
diff --git a/rtdata/images/themed/png/dark/filter-original2.png b/rtdata/images/themed/png/dark/filter-original2.png
index 84c8b1b7a..7617380b2 100644
Binary files a/rtdata/images/themed/png/dark/filter-original2.png and b/rtdata/images/themed/png/dark/filter-original2.png differ
diff --git a/rtdata/images/themed/png/dark/filter.png b/rtdata/images/themed/png/dark/filter.png
index da9fda783..af0060c9a 100644
Binary files a/rtdata/images/themed/png/dark/filter.png and b/rtdata/images/themed/png/dark/filter.png differ
diff --git a/rtdata/images/themed/png/dark/flip-horizontal.png b/rtdata/images/themed/png/dark/flip-horizontal.png
index 9f400dc63..fe53cefe7 100644
Binary files a/rtdata/images/themed/png/dark/flip-horizontal.png and b/rtdata/images/themed/png/dark/flip-horizontal.png differ
diff --git a/rtdata/images/themed/png/dark/flip-vertical.png b/rtdata/images/themed/png/dark/flip-vertical.png
index 7b8516816..85e7ccd02 100644
Binary files a/rtdata/images/themed/png/dark/flip-vertical.png and b/rtdata/images/themed/png/dark/flip-vertical.png differ
diff --git a/rtdata/images/themed/png/dark/focusscreen-off.png b/rtdata/images/themed/png/dark/focusscreen-off.png
index 08f5121f1..5ee597b3b 100644
Binary files a/rtdata/images/themed/png/dark/focusscreen-off.png and b/rtdata/images/themed/png/dark/focusscreen-off.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-home-small.png b/rtdata/images/themed/png/dark/folder-closed-home-small.png
index 65d1db139..06aeea67a 100644
Binary files a/rtdata/images/themed/png/dark/folder-closed-home-small.png and b/rtdata/images/themed/png/dark/folder-closed-home-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-home.png b/rtdata/images/themed/png/dark/folder-closed-home.png
index 561007408..88f801d24 100644
Binary files a/rtdata/images/themed/png/dark/folder-closed-home.png and b/rtdata/images/themed/png/dark/folder-closed-home.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-recent-small.png b/rtdata/images/themed/png/dark/folder-closed-recent-small.png
index 40bf12fd7..fdf1696b3 100644
Binary files a/rtdata/images/themed/png/dark/folder-closed-recent-small.png and b/rtdata/images/themed/png/dark/folder-closed-recent-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-recent.png b/rtdata/images/themed/png/dark/folder-closed-recent.png
index 3f489663c..fe23eea9f 100644
Binary files a/rtdata/images/themed/png/dark/folder-closed-recent.png and b/rtdata/images/themed/png/dark/folder-closed-recent.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed-small.png b/rtdata/images/themed/png/dark/folder-closed-small.png
index 35b61cf01..de543f67f 100644
Binary files a/rtdata/images/themed/png/dark/folder-closed-small.png and b/rtdata/images/themed/png/dark/folder-closed-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-closed.png b/rtdata/images/themed/png/dark/folder-closed.png
index aa5c444e3..2ec2d9717 100644
Binary files a/rtdata/images/themed/png/dark/folder-closed.png and b/rtdata/images/themed/png/dark/folder-closed.png differ
diff --git a/rtdata/images/themed/png/dark/folder-open-recent-small.png b/rtdata/images/themed/png/dark/folder-open-recent-small.png
index 309ae903b..3fac2f496 100644
Binary files a/rtdata/images/themed/png/dark/folder-open-recent-small.png and b/rtdata/images/themed/png/dark/folder-open-recent-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-open-recent.png b/rtdata/images/themed/png/dark/folder-open-recent.png
index 94a526e68..acf421774 100644
Binary files a/rtdata/images/themed/png/dark/folder-open-recent.png and b/rtdata/images/themed/png/dark/folder-open-recent.png differ
diff --git a/rtdata/images/themed/png/dark/folder-open-small.png b/rtdata/images/themed/png/dark/folder-open-small.png
index 8cc704a46..56eca1923 100644
Binary files a/rtdata/images/themed/png/dark/folder-open-small.png and b/rtdata/images/themed/png/dark/folder-open-small.png differ
diff --git a/rtdata/images/themed/png/dark/folder-open.png b/rtdata/images/themed/png/dark/folder-open.png
index c511053a3..df99ec1a2 100644
Binary files a/rtdata/images/themed/png/dark/folder-open.png and b/rtdata/images/themed/png/dark/folder-open.png differ
diff --git a/rtdata/images/themed/png/dark/fullscreen-enter.png b/rtdata/images/themed/png/dark/fullscreen-enter.png
index d83721904..2986358eb 100644
Binary files a/rtdata/images/themed/png/dark/fullscreen-enter.png and b/rtdata/images/themed/png/dark/fullscreen-enter.png differ
diff --git a/rtdata/images/themed/png/dark/fullscreen-leave.png b/rtdata/images/themed/png/dark/fullscreen-leave.png
index 880d380b9..5844f0e85 100644
Binary files a/rtdata/images/themed/png/dark/fullscreen-leave.png and b/rtdata/images/themed/png/dark/fullscreen-leave.png differ
diff --git a/rtdata/images/themed/png/dark/gamut-hist.png b/rtdata/images/themed/png/dark/gamut-hist.png
index ecab9d03b..346ae6225 100644
Binary files a/rtdata/images/themed/png/dark/gamut-hist.png and b/rtdata/images/themed/png/dark/gamut-hist.png differ
diff --git a/rtdata/images/themed/png/dark/gamut-softproof.png b/rtdata/images/themed/png/dark/gamut-softproof.png
index e0431d175..b130cc275 100644
Binary files a/rtdata/images/themed/png/dark/gamut-softproof.png and b/rtdata/images/themed/png/dark/gamut-softproof.png differ
diff --git a/rtdata/images/themed/png/dark/gamut-warning.png b/rtdata/images/themed/png/dark/gamut-warning.png
index 0a1685635..cf09ff17d 100644
Binary files a/rtdata/images/themed/png/dark/gamut-warning.png and b/rtdata/images/themed/png/dark/gamut-warning.png differ
diff --git a/rtdata/images/themed/png/dark/gamut_srgb_prophoto_xy.png b/rtdata/images/themed/png/dark/gamut_srgb_prophoto_xy.png
index 83a966bfa..8e131b1dd 100644
Binary files a/rtdata/images/themed/png/dark/gamut_srgb_prophoto_xy.png and b/rtdata/images/themed/png/dark/gamut_srgb_prophoto_xy.png differ
diff --git a/rtdata/images/themed/png/dark/gears-pause.png b/rtdata/images/themed/png/dark/gears-pause.png
index 34e4768d8..e9cb6a535 100644
Binary files a/rtdata/images/themed/png/dark/gears-pause.png and b/rtdata/images/themed/png/dark/gears-pause.png differ
diff --git a/rtdata/images/themed/png/dark/gears-play.png b/rtdata/images/themed/png/dark/gears-play.png
index d5cb604fd..917130261 100644
Binary files a/rtdata/images/themed/png/dark/gears-play.png and b/rtdata/images/themed/png/dark/gears-play.png differ
diff --git a/rtdata/images/themed/png/dark/gears-small.png b/rtdata/images/themed/png/dark/gears-small.png
index 33b76c159..70186dd18 100644
Binary files a/rtdata/images/themed/png/dark/gears-small.png and b/rtdata/images/themed/png/dark/gears-small.png differ
diff --git a/rtdata/images/themed/png/dark/gears.png b/rtdata/images/themed/png/dark/gears.png
index 7e59b229d..e21456d9f 100644
Binary files a/rtdata/images/themed/png/dark/gears.png and b/rtdata/images/themed/png/dark/gears.png differ
diff --git a/rtdata/images/themed/png/dark/goto-end-small.png b/rtdata/images/themed/png/dark/goto-end-small.png
index 2ff0ccad2..13f626635 100644
Binary files a/rtdata/images/themed/png/dark/goto-end-small.png and b/rtdata/images/themed/png/dark/goto-end-small.png differ
diff --git a/rtdata/images/themed/png/dark/goto-start-small.png b/rtdata/images/themed/png/dark/goto-start-small.png
index 27d588269..70cc10bf4 100644
Binary files a/rtdata/images/themed/png/dark/goto-start-small.png and b/rtdata/images/themed/png/dark/goto-start-small.png differ
diff --git a/rtdata/images/themed/png/dark/hand-closed.png b/rtdata/images/themed/png/dark/hand-closed.png
index 4683c6755..10c01fe3e 100644
Binary files a/rtdata/images/themed/png/dark/hand-closed.png and b/rtdata/images/themed/png/dark/hand-closed.png differ
diff --git a/rtdata/images/themed/png/dark/hand-open.png b/rtdata/images/themed/png/dark/hand-open.png
index 1477afaa8..6e8138ffb 100644
Binary files a/rtdata/images/themed/png/dark/hand-open.png and b/rtdata/images/themed/png/dark/hand-open.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-bar-off-small.png b/rtdata/images/themed/png/dark/histogram-bar-off-small.png
index c804b1b21..5c9c21e72 100644
Binary files a/rtdata/images/themed/png/dark/histogram-bar-off-small.png and b/rtdata/images/themed/png/dark/histogram-bar-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-bar-on-small.png b/rtdata/images/themed/png/dark/histogram-bar-on-small.png
index bd9726bae..f8a5bddf6 100644
Binary files a/rtdata/images/themed/png/dark/histogram-bar-on-small.png and b/rtdata/images/themed/png/dark/histogram-bar-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-mode-linear-small.png b/rtdata/images/themed/png/dark/histogram-mode-linear-small.png
index ff49cfde2..507be4c3e 100644
Binary files a/rtdata/images/themed/png/dark/histogram-mode-linear-small.png and b/rtdata/images/themed/png/dark/histogram-mode-linear-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-mode-logx-small.png b/rtdata/images/themed/png/dark/histogram-mode-logx-small.png
index 05f6e47f0..2a0b7cc6a 100644
Binary files a/rtdata/images/themed/png/dark/histogram-mode-logx-small.png and b/rtdata/images/themed/png/dark/histogram-mode-logx-small.png differ
diff --git a/rtdata/images/themed/png/dark/histogram-mode-logxy-small.png b/rtdata/images/themed/png/dark/histogram-mode-logxy-small.png
index 58a5a49d0..23bf705ac 100644
Binary files a/rtdata/images/themed/png/dark/histogram-mode-logxy-small.png and b/rtdata/images/themed/png/dark/histogram-mode-logxy-small.png differ
diff --git a/rtdata/images/themed/png/dark/info.png b/rtdata/images/themed/png/dark/info.png
index 3a962164e..4d7ad53bb 100644
Binary files a/rtdata/images/themed/png/dark/info.png and b/rtdata/images/themed/png/dark/info.png differ
diff --git a/rtdata/images/themed/png/dark/intent-absolute.png b/rtdata/images/themed/png/dark/intent-absolute.png
index 374731914..14cc9f44b 100644
Binary files a/rtdata/images/themed/png/dark/intent-absolute.png and b/rtdata/images/themed/png/dark/intent-absolute.png differ
diff --git a/rtdata/images/themed/png/dark/intent-perceptual.png b/rtdata/images/themed/png/dark/intent-perceptual.png
index 7dbaf784a..44507d85f 100644
Binary files a/rtdata/images/themed/png/dark/intent-perceptual.png and b/rtdata/images/themed/png/dark/intent-perceptual.png differ
diff --git a/rtdata/images/themed/png/dark/intent-relative.png b/rtdata/images/themed/png/dark/intent-relative.png
index 54f82beaa..895c335c1 100644
Binary files a/rtdata/images/themed/png/dark/intent-relative.png and b/rtdata/images/themed/png/dark/intent-relative.png differ
diff --git a/rtdata/images/themed/png/dark/intent-saturation.png b/rtdata/images/themed/png/dark/intent-saturation.png
index 0ef5d093e..fb33221e4 100644
Binary files a/rtdata/images/themed/png/dark/intent-saturation.png and b/rtdata/images/themed/png/dark/intent-saturation.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-1to1-small.png b/rtdata/images/themed/png/dark/magnifier-1to1-small.png
index fff0dfc76..b68d5d975 100644
Binary files a/rtdata/images/themed/png/dark/magnifier-1to1-small.png and b/rtdata/images/themed/png/dark/magnifier-1to1-small.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-1to1.png b/rtdata/images/themed/png/dark/magnifier-1to1.png
index e1ea3a47a..76c440795 100644
Binary files a/rtdata/images/themed/png/dark/magnifier-1to1.png and b/rtdata/images/themed/png/dark/magnifier-1to1.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-crop.png b/rtdata/images/themed/png/dark/magnifier-crop.png
index cfd7b8b33..fe6ff0589 100644
Binary files a/rtdata/images/themed/png/dark/magnifier-crop.png and b/rtdata/images/themed/png/dark/magnifier-crop.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-fit.png b/rtdata/images/themed/png/dark/magnifier-fit.png
index f97dbc2ed..d3c238338 100644
Binary files a/rtdata/images/themed/png/dark/magnifier-fit.png and b/rtdata/images/themed/png/dark/magnifier-fit.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-minus-small.png b/rtdata/images/themed/png/dark/magnifier-minus-small.png
index 21658cfb3..dd1b65589 100644
Binary files a/rtdata/images/themed/png/dark/magnifier-minus-small.png and b/rtdata/images/themed/png/dark/magnifier-minus-small.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-minus.png b/rtdata/images/themed/png/dark/magnifier-minus.png
index b86960eea..1f60a292a 100644
Binary files a/rtdata/images/themed/png/dark/magnifier-minus.png and b/rtdata/images/themed/png/dark/magnifier-minus.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-plus-small.png b/rtdata/images/themed/png/dark/magnifier-plus-small.png
index f12b1d3e9..532f9c426 100644
Binary files a/rtdata/images/themed/png/dark/magnifier-plus-small.png and b/rtdata/images/themed/png/dark/magnifier-plus-small.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier-plus.png b/rtdata/images/themed/png/dark/magnifier-plus.png
index c70f6ae60..b8d6a2a7a 100644
Binary files a/rtdata/images/themed/png/dark/magnifier-plus.png and b/rtdata/images/themed/png/dark/magnifier-plus.png differ
diff --git a/rtdata/images/themed/png/dark/magnifier.png b/rtdata/images/themed/png/dark/magnifier.png
index e27264f6d..6ae59fd55 100644
Binary files a/rtdata/images/themed/png/dark/magnifier.png and b/rtdata/images/themed/png/dark/magnifier.png differ
diff --git a/rtdata/images/themed/png/dark/metadata.png b/rtdata/images/themed/png/dark/metadata.png
index bff1951ac..48fccde79 100644
Binary files a/rtdata/images/themed/png/dark/metadata.png and b/rtdata/images/themed/png/dark/metadata.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-x.png b/rtdata/images/themed/png/dark/node-move-x.png
index 030d373fb..ed06b8700 100644
Binary files a/rtdata/images/themed/png/dark/node-move-x.png and b/rtdata/images/themed/png/dark/node-move-x.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-xy.png b/rtdata/images/themed/png/dark/node-move-xy.png
index 378370b40..7fcaf111a 100644
Binary files a/rtdata/images/themed/png/dark/node-move-xy.png and b/rtdata/images/themed/png/dark/node-move-xy.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-y.png b/rtdata/images/themed/png/dark/node-move-y.png
index 1724cb7d1..137c79039 100644
Binary files a/rtdata/images/themed/png/dark/node-move-y.png and b/rtdata/images/themed/png/dark/node-move-y.png differ
diff --git a/rtdata/images/themed/png/dark/one-to-one.png b/rtdata/images/themed/png/dark/one-to-one-small.png
similarity index 73%
rename from rtdata/images/themed/png/dark/one-to-one.png
rename to rtdata/images/themed/png/dark/one-to-one-small.png
index aa8989f01..50cda2db5 100644
Binary files a/rtdata/images/themed/png/dark/one-to-one.png and b/rtdata/images/themed/png/dark/one-to-one-small.png differ
diff --git a/rtdata/images/themed/png/dark/ornament1.png b/rtdata/images/themed/png/dark/ornament1.png
index 5661efc08..2acdd19e8 100644
Binary files a/rtdata/images/themed/png/dark/ornament1.png and b/rtdata/images/themed/png/dark/ornament1.png differ
diff --git a/rtdata/images/themed/png/dark/circle-cyan-red.png b/rtdata/images/themed/png/dark/padlock-locked-small.png
similarity index 57%
rename from rtdata/images/themed/png/dark/circle-cyan-red.png
rename to rtdata/images/themed/png/dark/padlock-locked-small.png
index 029b2f66c..8f7c12169 100644
Binary files a/rtdata/images/themed/png/dark/circle-cyan-red.png and b/rtdata/images/themed/png/dark/padlock-locked-small.png differ
diff --git a/rtdata/images/themed/png/dark/padlock-unlocked-small.png b/rtdata/images/themed/png/dark/padlock-unlocked-small.png
new file mode 100644
index 000000000..ad27326c7
Binary files /dev/null and b/rtdata/images/themed/png/dark/padlock-unlocked-small.png differ
diff --git a/rtdata/images/themed/png/dark/palette-brush.png b/rtdata/images/themed/png/dark/palette-brush.png
index 56b561e2e..592521db0 100644
Binary files a/rtdata/images/themed/png/dark/palette-brush.png and b/rtdata/images/themed/png/dark/palette-brush.png differ
diff --git a/rtdata/images/themed/png/dark/panel-to-bottom.png b/rtdata/images/themed/png/dark/panel-to-bottom.png
index e389431fc..a8ed862f1 100644
Binary files a/rtdata/images/themed/png/dark/panel-to-bottom.png and b/rtdata/images/themed/png/dark/panel-to-bottom.png differ
diff --git a/rtdata/images/themed/png/dark/panel-to-left.png b/rtdata/images/themed/png/dark/panel-to-left.png
index cd5f8f1ea..51eb8b845 100644
Binary files a/rtdata/images/themed/png/dark/panel-to-left.png and b/rtdata/images/themed/png/dark/panel-to-left.png differ
diff --git a/rtdata/images/themed/png/dark/panel-to-right.png b/rtdata/images/themed/png/dark/panel-to-right.png
index 4e7733abc..372607970 100644
Binary files a/rtdata/images/themed/png/dark/panel-to-right.png and b/rtdata/images/themed/png/dark/panel-to-right.png differ
diff --git a/rtdata/images/themed/png/dark/panel-to-top.png b/rtdata/images/themed/png/dark/panel-to-top.png
index 3b8a91f27..fc92ca1f6 100644
Binary files a/rtdata/images/themed/png/dark/panel-to-top.png and b/rtdata/images/themed/png/dark/panel-to-top.png differ
diff --git a/rtdata/images/themed/png/dark/paste.png b/rtdata/images/themed/png/dark/paste.png
index 57b04a91f..fba618a86 100644
Binary files a/rtdata/images/themed/png/dark/paste.png and b/rtdata/images/themed/png/dark/paste.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-left-small.png b/rtdata/images/themed/png/dark/perspective-horizontal-left-small.png
new file mode 100644
index 000000000..039485fe3
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-horizontal-left-small.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-left.png b/rtdata/images/themed/png/dark/perspective-horizontal-left.png
index 4e6b19239..b2b169840 100644
Binary files a/rtdata/images/themed/png/dark/perspective-horizontal-left.png and b/rtdata/images/themed/png/dark/perspective-horizontal-left.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-right-small.png b/rtdata/images/themed/png/dark/perspective-horizontal-right-small.png
new file mode 100644
index 000000000..a917cf458
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-horizontal-right-small.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-horizontal-right.png b/rtdata/images/themed/png/dark/perspective-horizontal-right.png
index 9e7f1288f..6ab911949 100644
Binary files a/rtdata/images/themed/png/dark/perspective-horizontal-right.png and b/rtdata/images/themed/png/dark/perspective-horizontal-right.png differ
diff --git a/rtdata/images/themed/png/dark/padlock-unlocked.png b/rtdata/images/themed/png/dark/perspective-vertical-bottom-small.png
similarity index 56%
rename from rtdata/images/themed/png/dark/padlock-unlocked.png
rename to rtdata/images/themed/png/dark/perspective-vertical-bottom-small.png
index 2f81e6099..f45a38c3e 100644
Binary files a/rtdata/images/themed/png/dark/padlock-unlocked.png and b/rtdata/images/themed/png/dark/perspective-vertical-bottom-small.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-vertical-bottom.png b/rtdata/images/themed/png/dark/perspective-vertical-bottom.png
index 5980dcf08..0e508882b 100644
Binary files a/rtdata/images/themed/png/dark/perspective-vertical-bottom.png and b/rtdata/images/themed/png/dark/perspective-vertical-bottom.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-vertical-top-small.png b/rtdata/images/themed/png/dark/perspective-vertical-top-small.png
new file mode 100644
index 000000000..ab96d5596
Binary files /dev/null and b/rtdata/images/themed/png/dark/perspective-vertical-top-small.png differ
diff --git a/rtdata/images/themed/png/dark/perspective-vertical-top.png b/rtdata/images/themed/png/dark/perspective-vertical-top.png
index 8b9791988..6084254a5 100644
Binary files a/rtdata/images/themed/png/dark/perspective-vertical-top.png and b/rtdata/images/themed/png/dark/perspective-vertical-top.png differ
diff --git a/rtdata/images/themed/png/dark/power-inconsistent-small.png b/rtdata/images/themed/png/dark/power-inconsistent-small.png
new file mode 100644
index 000000000..75f9c7a58
Binary files /dev/null and b/rtdata/images/themed/png/dark/power-inconsistent-small.png differ
diff --git a/rtdata/images/themed/png/dark/power-off-small.png b/rtdata/images/themed/png/dark/power-off-small.png
new file mode 100644
index 000000000..f9ece5472
Binary files /dev/null and b/rtdata/images/themed/png/dark/power-off-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-darkgray.png b/rtdata/images/themed/png/dark/power-on-small.png
similarity index 58%
rename from rtdata/images/themed/png/dark/circle-empty-darkgray.png
rename to rtdata/images/themed/png/dark/power-on-small.png
index 8d477fe83..c54e0d50e 100644
Binary files a/rtdata/images/themed/png/dark/circle-empty-darkgray.png and b/rtdata/images/themed/png/dark/power-on-small.png differ
diff --git a/rtdata/images/themed/png/dark/power-on.png b/rtdata/images/themed/png/dark/power-on.png
deleted file mode 100644
index 5da8bdaf4..000000000
Binary files a/rtdata/images/themed/png/dark/power-on.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/preferences.png b/rtdata/images/themed/png/dark/preferences.png
index 2e5151b4c..b88c501e5 100644
Binary files a/rtdata/images/themed/png/dark/preferences.png and b/rtdata/images/themed/png/dark/preferences.png differ
diff --git a/rtdata/images/themed/png/dark/profile-filled.png b/rtdata/images/themed/png/dark/profile-filled.png
index ac14fbb59..e806c99f5 100644
Binary files a/rtdata/images/themed/png/dark/profile-filled.png and b/rtdata/images/themed/png/dark/profile-filled.png differ
diff --git a/rtdata/images/themed/png/dark/profile-partial.png b/rtdata/images/themed/png/dark/profile-partial.png
index df3cba153..335a0238a 100644
Binary files a/rtdata/images/themed/png/dark/profile-partial.png and b/rtdata/images/themed/png/dark/profile-partial.png differ
diff --git a/rtdata/images/themed/png/dark/redo-all.png b/rtdata/images/themed/png/dark/redo-all.png
index 8bfb7b9f5..e293010d0 100644
Binary files a/rtdata/images/themed/png/dark/redo-all.png and b/rtdata/images/themed/png/dark/redo-all.png differ
diff --git a/rtdata/images/themed/png/dark/redo-small.png b/rtdata/images/themed/png/dark/redo-small.png
index 401f15548..84a5988ef 100644
Binary files a/rtdata/images/themed/png/dark/redo-small.png and b/rtdata/images/themed/png/dark/redo-small.png differ
diff --git a/rtdata/images/themed/png/dark/redo.png b/rtdata/images/themed/png/dark/redo.png
index 878a5fbd6..c75b63620 100644
Binary files a/rtdata/images/themed/png/dark/redo.png and b/rtdata/images/themed/png/dark/redo.png differ
diff --git a/rtdata/images/themed/png/dark/refresh-small.png b/rtdata/images/themed/png/dark/refresh-small.png
index 370aa9060..b8f2e67d5 100644
Binary files a/rtdata/images/themed/png/dark/refresh-small.png and b/rtdata/images/themed/png/dark/refresh-small.png differ
diff --git a/rtdata/images/themed/png/dark/refresh.png b/rtdata/images/themed/png/dark/refresh.png
index 480dbaecd..6981fbefb 100644
Binary files a/rtdata/images/themed/png/dark/refresh.png and b/rtdata/images/themed/png/dark/refresh.png differ
diff --git a/rtdata/images/themed/png/dark/remove-small.png b/rtdata/images/themed/png/dark/remove-small.png
index 7b3ac18a0..996823902 100644
Binary files a/rtdata/images/themed/png/dark/remove-small.png and b/rtdata/images/themed/png/dark/remove-small.png differ
diff --git a/rtdata/images/themed/png/dark/remove.png b/rtdata/images/themed/png/dark/remove.png
index 69346c9b7..8d9715ac5 100644
Binary files a/rtdata/images/themed/png/dark/remove.png and b/rtdata/images/themed/png/dark/remove.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-left-90.png b/rtdata/images/themed/png/dark/rotate-left-90.png
index 4ba515d77..fa238e339 100644
Binary files a/rtdata/images/themed/png/dark/rotate-left-90.png and b/rtdata/images/themed/png/dark/rotate-left-90.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-left-small.png b/rtdata/images/themed/png/dark/rotate-left-small.png
new file mode 100644
index 000000000..659dc6344
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-left-small.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-left.png b/rtdata/images/themed/png/dark/rotate-left.png
index 0a020ec5c..739b39c0b 100644
Binary files a/rtdata/images/themed/png/dark/rotate-left.png and b/rtdata/images/themed/png/dark/rotate-left.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-right-90.png b/rtdata/images/themed/png/dark/rotate-right-90.png
index 0aa7f3059..126232d2f 100644
Binary files a/rtdata/images/themed/png/dark/rotate-right-90.png and b/rtdata/images/themed/png/dark/rotate-right-90.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-right-small.png b/rtdata/images/themed/png/dark/rotate-right-small.png
new file mode 100644
index 000000000..c59152c81
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-right-small.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-right.png b/rtdata/images/themed/png/dark/rotate-right.png
index d74f0903e..8f99d9b05 100644
Binary files a/rtdata/images/themed/png/dark/rotate-right.png and b/rtdata/images/themed/png/dark/rotate-right.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-straighten-small.png b/rtdata/images/themed/png/dark/rotate-straighten-small.png
new file mode 100644
index 000000000..d57dcb7c7
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-straighten-small.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-straighten.png b/rtdata/images/themed/png/dark/rotate-straighten.png
index 4358df196..457282758 100644
Binary files a/rtdata/images/themed/png/dark/rotate-straighten.png and b/rtdata/images/themed/png/dark/rotate-straighten.png differ
diff --git a/rtdata/images/themed/png/dark/save-small.png b/rtdata/images/themed/png/dark/save-small.png
index 85655a36c..be9944403 100644
Binary files a/rtdata/images/themed/png/dark/save-small.png and b/rtdata/images/themed/png/dark/save-small.png differ
diff --git a/rtdata/images/themed/png/dark/save.png b/rtdata/images/themed/png/dark/save.png
index c04225115..1aed2f16e 100644
Binary files a/rtdata/images/themed/png/dark/save.png and b/rtdata/images/themed/png/dark/save.png differ
diff --git a/rtdata/images/themed/png/dark/saved-no-small.png b/rtdata/images/themed/png/dark/saved-no-small.png
index 9a64357ac..8388e3bfa 100644
Binary files a/rtdata/images/themed/png/dark/saved-no-small.png and b/rtdata/images/themed/png/dark/saved-no-small.png differ
diff --git a/rtdata/images/themed/png/dark/saved-yes-small.png b/rtdata/images/themed/png/dark/saved-yes-small.png
index b8b56e526..2cba69361 100644
Binary files a/rtdata/images/themed/png/dark/saved-yes-small.png and b/rtdata/images/themed/png/dark/saved-yes-small.png differ
diff --git a/rtdata/images/themed/png/dark/star-hollow-small.png b/rtdata/images/themed/png/dark/star-hollow-small.png
index 54572882d..b5cf648ca 100644
Binary files a/rtdata/images/themed/png/dark/star-hollow-small.png and b/rtdata/images/themed/png/dark/star-hollow-small.png differ
diff --git a/rtdata/images/themed/png/dark/star-small.png b/rtdata/images/themed/png/dark/star-small.png
index 1b657f6a8..f9e4a7361 100644
Binary files a/rtdata/images/themed/png/dark/star-small.png and b/rtdata/images/themed/png/dark/star-small.png differ
diff --git a/rtdata/images/themed/png/dark/tick-small.png b/rtdata/images/themed/png/dark/tick-small.png
index e9e8f2409..8ee5e5516 100644
Binary files a/rtdata/images/themed/png/dark/tick-small.png and b/rtdata/images/themed/png/dark/tick-small.png differ
diff --git a/rtdata/images/themed/png/dark/tick.png b/rtdata/images/themed/png/dark/tick.png
index 8facba4cf..5318ae4d5 100644
Binary files a/rtdata/images/themed/png/dark/tick.png and b/rtdata/images/themed/png/dark/tick.png differ
diff --git a/rtdata/images/themed/png/dark/transform.png b/rtdata/images/themed/png/dark/transform.png
index 0b6972607..30cd76dd6 100644
Binary files a/rtdata/images/themed/png/dark/transform.png and b/rtdata/images/themed/png/dark/transform.png differ
diff --git a/rtdata/images/themed/png/dark/trash-hide-deleted.png b/rtdata/images/themed/png/dark/trash-hide-deleted.png
index 22472ee5a..94c1b6722 100644
Binary files a/rtdata/images/themed/png/dark/trash-hide-deleted.png and b/rtdata/images/themed/png/dark/trash-hide-deleted.png differ
diff --git a/rtdata/images/themed/png/dark/trash-remove-small.png b/rtdata/images/themed/png/dark/trash-remove-small.png
index b7071c7d9..75fd6493c 100644
Binary files a/rtdata/images/themed/png/dark/trash-remove-small.png and b/rtdata/images/themed/png/dark/trash-remove-small.png differ
diff --git a/rtdata/images/themed/png/dark/trash-remove.png b/rtdata/images/themed/png/dark/trash-remove.png
index b2560b64f..f9dc4bde7 100644
Binary files a/rtdata/images/themed/png/dark/trash-remove.png and b/rtdata/images/themed/png/dark/trash-remove.png differ
diff --git a/rtdata/images/themed/png/dark/trash-show.png b/rtdata/images/themed/png/dark/trash-show.png
index 7ea34009e..983979634 100644
Binary files a/rtdata/images/themed/png/dark/trash-show.png and b/rtdata/images/themed/png/dark/trash-show.png differ
diff --git a/rtdata/images/themed/png/dark/trash-small.png b/rtdata/images/themed/png/dark/trash-small.png
index 27b714dc0..2a19f041c 100644
Binary files a/rtdata/images/themed/png/dark/trash-small.png and b/rtdata/images/themed/png/dark/trash-small.png differ
diff --git a/rtdata/images/themed/png/dark/trash.png b/rtdata/images/themed/png/dark/trash.png
index 14abb54c3..a1b92354e 100644
Binary files a/rtdata/images/themed/png/dark/trash.png and b/rtdata/images/themed/png/dark/trash.png differ
diff --git a/rtdata/images/themed/png/dark/undo-all.png b/rtdata/images/themed/png/dark/undo-all.png
index 69621de86..7f577140b 100644
Binary files a/rtdata/images/themed/png/dark/undo-all.png and b/rtdata/images/themed/png/dark/undo-all.png differ
diff --git a/rtdata/images/themed/png/dark/undo-small.png b/rtdata/images/themed/png/dark/undo-small.png
index 0568a97c1..5649efd39 100644
Binary files a/rtdata/images/themed/png/dark/undo-small.png and b/rtdata/images/themed/png/dark/undo-small.png differ
diff --git a/rtdata/images/themed/png/dark/undo.png b/rtdata/images/themed/png/dark/undo.png
index a7edcf5c4..3e0a28d1e 100644
Binary files a/rtdata/images/themed/png/dark/undo.png and b/rtdata/images/themed/png/dark/undo.png differ
diff --git a/rtdata/images/themed/png/dark/warning-highlights.png b/rtdata/images/themed/png/dark/warning-highlights.png
index 64ada925f..61ec734ca 100644
Binary files a/rtdata/images/themed/png/dark/warning-highlights.png and b/rtdata/images/themed/png/dark/warning-highlights.png differ
diff --git a/rtdata/images/themed/png/dark/warning-shadows.png b/rtdata/images/themed/png/dark/warning-shadows.png
index 894db1769..c5e83dad6 100644
Binary files a/rtdata/images/themed/png/dark/warning-shadows.png and b/rtdata/images/themed/png/dark/warning-shadows.png differ
diff --git a/rtdata/images/themed/png/dark/wavelets.png b/rtdata/images/themed/png/dark/wavelets.png
index ef7434a58..664fa8196 100644
Binary files a/rtdata/images/themed/png/dark/wavelets.png and b/rtdata/images/themed/png/dark/wavelets.png differ
diff --git a/rtdata/images/themed/png/dark/wb-auto.png b/rtdata/images/themed/png/dark/wb-auto.png
index 8ab6ca260..e2f033360 100644
Binary files a/rtdata/images/themed/png/dark/wb-auto.png and b/rtdata/images/themed/png/dark/wb-auto.png differ
diff --git a/rtdata/images/themed/png/dark/wb-camera.png b/rtdata/images/themed/png/dark/wb-camera.png
index 73b76fbe3..8749579d0 100644
Binary files a/rtdata/images/themed/png/dark/wb-camera.png and b/rtdata/images/themed/png/dark/wb-camera.png differ
diff --git a/rtdata/images/themed/png/dark/wb-cloudy.png b/rtdata/images/themed/png/dark/wb-cloudy.png
index d5fa16de1..1c394b709 100644
Binary files a/rtdata/images/themed/png/dark/wb-cloudy.png and b/rtdata/images/themed/png/dark/wb-cloudy.png differ
diff --git a/rtdata/images/themed/png/dark/wb-custom.png b/rtdata/images/themed/png/dark/wb-custom.png
index 34a148a47..db9abc03c 100644
Binary files a/rtdata/images/themed/png/dark/wb-custom.png and b/rtdata/images/themed/png/dark/wb-custom.png differ
diff --git a/rtdata/images/themed/png/dark/wb-flash.png b/rtdata/images/themed/png/dark/wb-flash.png
index fd5f8f955..d460a0569 100644
Binary files a/rtdata/images/themed/png/dark/wb-flash.png and b/rtdata/images/themed/png/dark/wb-flash.png differ
diff --git a/rtdata/images/themed/png/dark/wb-fluorescent.png b/rtdata/images/themed/png/dark/wb-fluorescent.png
index df7d9e8cb..c994ee9dd 100644
Binary files a/rtdata/images/themed/png/dark/wb-fluorescent.png and b/rtdata/images/themed/png/dark/wb-fluorescent.png differ
diff --git a/rtdata/images/themed/png/dark/wb-lamp.png b/rtdata/images/themed/png/dark/wb-lamp.png
index 8eab0248c..b0d3df3e5 100644
Binary files a/rtdata/images/themed/png/dark/wb-lamp.png and b/rtdata/images/themed/png/dark/wb-lamp.png differ
diff --git a/rtdata/images/themed/png/dark/wb-led.png b/rtdata/images/themed/png/dark/wb-led.png
index f2fa47d94..dfdb25191 100644
Binary files a/rtdata/images/themed/png/dark/wb-led.png and b/rtdata/images/themed/png/dark/wb-led.png differ
diff --git a/rtdata/images/themed/png/dark/wb-shade.png b/rtdata/images/themed/png/dark/wb-shade.png
index 5b82702c6..2be98acf6 100644
Binary files a/rtdata/images/themed/png/dark/wb-shade.png and b/rtdata/images/themed/png/dark/wb-shade.png differ
diff --git a/rtdata/images/themed/png/dark/wb-sun.png b/rtdata/images/themed/png/dark/wb-sun.png
index a5c8c66ef..e65ee2a80 100644
Binary files a/rtdata/images/themed/png/dark/wb-sun.png and b/rtdata/images/themed/png/dark/wb-sun.png differ
diff --git a/rtdata/images/themed/png/dark/wb-tungsten.png b/rtdata/images/themed/png/dark/wb-tungsten.png
index d2c3401a4..2c71f66ef 100644
Binary files a/rtdata/images/themed/png/dark/wb-tungsten.png and b/rtdata/images/themed/png/dark/wb-tungsten.png differ
diff --git a/rtdata/images/themed/png/dark/wb-water.png b/rtdata/images/themed/png/dark/wb-water.png
index 8178ca0fd..7bc55c153 100644
Binary files a/rtdata/images/themed/png/dark/wb-water.png and b/rtdata/images/themed/png/dark/wb-water.png differ
diff --git a/rtdata/images/themed/png/dark/window-add.png b/rtdata/images/themed/png/dark/window-add.png
index b0c33b365..b5780953b 100644
Binary files a/rtdata/images/themed/png/dark/window-add.png and b/rtdata/images/themed/png/dark/window-add.png differ
diff --git a/rtdata/images/themed/png/light/circle-black-small.png b/rtdata/images/themed/png/light/circle-black-small.png
new file mode 100644
index 000000000..f18a415b6
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-black-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-black.png b/rtdata/images/themed/png/light/circle-black.png
deleted file mode 100644
index 5184a8118..000000000
Binary files a/rtdata/images/themed/png/light/circle-black.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-blue-green-small.png b/rtdata/images/themed/png/light/circle-blue-green-small.png
new file mode 100644
index 000000000..247931823
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-blue-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-blue-red-small.png b/rtdata/images/themed/png/light/circle-blue-red-small.png
new file mode 100644
index 000000000..d88a01330
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-blue-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-blue-red.png b/rtdata/images/themed/png/light/circle-blue-red.png
deleted file mode 100644
index 1c5a0b03a..000000000
Binary files a/rtdata/images/themed/png/light/circle-blue-red.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-blue-small.png b/rtdata/images/themed/png/light/circle-blue-small.png
new file mode 100644
index 000000000..2c8ff48fd
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-blue-yellow-small.png b/rtdata/images/themed/png/light/circle-blue-yellow-small.png
new file mode 100644
index 000000000..0585b2195
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-blue-yellow-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-blue.png b/rtdata/images/themed/png/light/circle-blue.png
deleted file mode 100644
index 1f08de0a3..000000000
Binary files a/rtdata/images/themed/png/light/circle-blue.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-cyan-red-small.png b/rtdata/images/themed/png/light/circle-cyan-red-small.png
new file mode 100644
index 000000000..ed7003161
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-cyan-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-cyan-red.png b/rtdata/images/themed/png/light/circle-cyan-red.png
deleted file mode 100644
index 029b2f66c..000000000
Binary files a/rtdata/images/themed/png/light/circle-cyan-red.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-cyan-small.png b/rtdata/images/themed/png/light/circle-cyan-small.png
new file mode 100644
index 000000000..84f873a2c
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-cyan-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-cyan.png b/rtdata/images/themed/png/light/circle-cyan.png
deleted file mode 100644
index 0a3a29bd7..000000000
Binary files a/rtdata/images/themed/png/light/circle-cyan.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-empty-blue-small.png b/rtdata/images/themed/png/light/circle-empty-blue-small.png
new file mode 100644
index 000000000..d53b3516e
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-blue-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-blue.png b/rtdata/images/themed/png/light/circle-empty-darkgray-small.png
similarity index 62%
rename from rtdata/images/themed/png/dark/circle-blue.png
rename to rtdata/images/themed/png/light/circle-empty-darkgray-small.png
index 1f08de0a3..4f0f0f4c7 100644
Binary files a/rtdata/images/themed/png/dark/circle-blue.png and b/rtdata/images/themed/png/light/circle-empty-darkgray-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-darkgray.png b/rtdata/images/themed/png/light/circle-empty-darkgray.png
deleted file mode 100644
index 8d477fe83..000000000
Binary files a/rtdata/images/themed/png/light/circle-empty-darkgray.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-empty-gray-small.png b/rtdata/images/themed/png/light/circle-empty-gray-small.png
new file mode 100644
index 000000000..b3a57c83b
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-gray-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-gray.png b/rtdata/images/themed/png/light/circle-empty-gray.png
deleted file mode 100644
index f60b60e35..000000000
Binary files a/rtdata/images/themed/png/light/circle-empty-gray.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/circle-empty-purple.png b/rtdata/images/themed/png/light/circle-empty-green-small.png
similarity index 60%
rename from rtdata/images/themed/png/dark/circle-empty-purple.png
rename to rtdata/images/themed/png/light/circle-empty-green-small.png
index c2d36a98e..3b1444d37 100644
Binary files a/rtdata/images/themed/png/dark/circle-empty-purple.png and b/rtdata/images/themed/png/light/circle-empty-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-green.png b/rtdata/images/themed/png/light/circle-empty-green.png
deleted file mode 100644
index b6c908493..000000000
Binary files a/rtdata/images/themed/png/light/circle-empty-green.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-empty-purple-small.png b/rtdata/images/themed/png/light/circle-empty-purple-small.png
new file mode 100644
index 000000000..e61da8e9f
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-purple-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-purple.png b/rtdata/images/themed/png/light/circle-empty-purple.png
deleted file mode 100644
index c2d36a98e..000000000
Binary files a/rtdata/images/themed/png/light/circle-empty-purple.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-empty-red-small.png b/rtdata/images/themed/png/light/circle-empty-red-small.png
new file mode 100644
index 000000000..bf8035931
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-yellow-small.png b/rtdata/images/themed/png/light/circle-empty-yellow-small.png
new file mode 100644
index 000000000..9a3ca9bd8
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-empty-yellow-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-empty-yellow.png b/rtdata/images/themed/png/light/circle-empty-yellow.png
deleted file mode 100644
index a84bd12f9..000000000
Binary files a/rtdata/images/themed/png/light/circle-empty-yellow.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-gray-blue-small.png b/rtdata/images/themed/png/light/circle-gray-blue-small.png
new file mode 100644
index 000000000..01d5da881
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-gray-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-gray-green-small.png b/rtdata/images/themed/png/light/circle-gray-green-small.png
new file mode 100644
index 000000000..2290b708f
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-gray-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-gray-green.png b/rtdata/images/themed/png/light/circle-gray-green.png
deleted file mode 100644
index 8d071907d..000000000
Binary files a/rtdata/images/themed/png/light/circle-gray-green.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-gray-red-small.png b/rtdata/images/themed/png/light/circle-gray-red-small.png
new file mode 100644
index 000000000..29afda33b
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-gray-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-blue-green.png b/rtdata/images/themed/png/light/circle-green-blue-small.png
similarity index 55%
rename from rtdata/images/themed/png/light/circle-blue-green.png
rename to rtdata/images/themed/png/light/circle-green-blue-small.png
index a42d23eea..1d6e60252 100644
Binary files a/rtdata/images/themed/png/light/circle-blue-green.png and b/rtdata/images/themed/png/light/circle-green-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-green-red-small.png b/rtdata/images/themed/png/light/circle-green-red-small.png
new file mode 100644
index 000000000..96f86b1b9
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-green-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-green-red.png b/rtdata/images/themed/png/light/circle-green-red.png
deleted file mode 100644
index 500a698a0..000000000
Binary files a/rtdata/images/themed/png/light/circle-green-red.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-green-small.png b/rtdata/images/themed/png/light/circle-green-small.png
new file mode 100644
index 000000000..88270e0cb
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-green.png b/rtdata/images/themed/png/light/circle-green.png
deleted file mode 100644
index b84308f78..000000000
Binary files a/rtdata/images/themed/png/light/circle-green.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-magenta-small.png b/rtdata/images/themed/png/light/circle-magenta-small.png
new file mode 100644
index 000000000..cce26e1f2
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-magenta-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-magenta.png b/rtdata/images/themed/png/light/circle-magenta.png
deleted file mode 100644
index b09696ff8..000000000
Binary files a/rtdata/images/themed/png/light/circle-magenta.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-orange-small.png b/rtdata/images/themed/png/light/circle-orange-small.png
new file mode 100644
index 000000000..5894f0987
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-orange-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-yellow.png b/rtdata/images/themed/png/light/circle-purple-small.png
similarity index 65%
rename from rtdata/images/themed/png/dark/circle-yellow.png
rename to rtdata/images/themed/png/light/circle-purple-small.png
index 3a17f380f..9fe4eb0d6 100644
Binary files a/rtdata/images/themed/png/dark/circle-yellow.png and b/rtdata/images/themed/png/light/circle-purple-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-red-blue-small.png b/rtdata/images/themed/png/light/circle-red-blue-small.png
new file mode 100644
index 000000000..e70ef22f6
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-red-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-red-blue.png b/rtdata/images/themed/png/light/circle-red-blue.png
deleted file mode 100644
index dd181221c..000000000
Binary files a/rtdata/images/themed/png/light/circle-red-blue.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-red-cyan-small.png b/rtdata/images/themed/png/light/circle-red-cyan-small.png
new file mode 100644
index 000000000..92b03b953
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-red-cyan-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-red-cyan.png b/rtdata/images/themed/png/light/circle-red-cyan.png
deleted file mode 100644
index c1b81e1f5..000000000
Binary files a/rtdata/images/themed/png/light/circle-red-cyan.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-red-green-small.png b/rtdata/images/themed/png/light/circle-red-green-small.png
new file mode 100644
index 000000000..4572e019f
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-red-green-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-red-green.png b/rtdata/images/themed/png/light/circle-red-green.png
deleted file mode 100644
index 7059dc60d..000000000
Binary files a/rtdata/images/themed/png/light/circle-red-green.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-red-small.png b/rtdata/images/themed/png/light/circle-red-small.png
new file mode 100644
index 000000000..a8c9cecec
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-red-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-red.png b/rtdata/images/themed/png/light/circle-red.png
deleted file mode 100644
index 691a2a276..000000000
Binary files a/rtdata/images/themed/png/light/circle-red.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-white-small.png b/rtdata/images/themed/png/light/circle-white-small.png
new file mode 100644
index 000000000..acf4f8b76
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-white-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-white.png b/rtdata/images/themed/png/light/circle-white.png
deleted file mode 100644
index aff1eb392..000000000
Binary files a/rtdata/images/themed/png/light/circle-white.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-yellow-blue-small.png b/rtdata/images/themed/png/light/circle-yellow-blue-small.png
new file mode 100644
index 000000000..1f7aec9f2
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-yellow-blue-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-yellow-blue.png b/rtdata/images/themed/png/light/circle-yellow-blue.png
deleted file mode 100644
index 1248ae6a9..000000000
Binary files a/rtdata/images/themed/png/light/circle-yellow-blue.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/circle-yellow-small.png b/rtdata/images/themed/png/light/circle-yellow-small.png
new file mode 100644
index 000000000..1c5678ac2
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-yellow-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-yellow.png b/rtdata/images/themed/png/light/circle-yellow.png
deleted file mode 100644
index 3a17f380f..000000000
Binary files a/rtdata/images/themed/png/light/circle-yellow.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/color-picker-add.png b/rtdata/images/themed/png/light/color-picker-add.png
index 86a238f7b..b1f5b7424 100644
Binary files a/rtdata/images/themed/png/light/color-picker-add.png and b/rtdata/images/themed/png/light/color-picker-add.png differ
diff --git a/rtdata/images/themed/png/light/color-picker-show.png b/rtdata/images/themed/png/light/color-picker-show.png
index 5901b1fc7..aa4eb4f06 100644
Binary files a/rtdata/images/themed/png/light/color-picker-show.png and b/rtdata/images/themed/png/light/color-picker-show.png differ
diff --git a/rtdata/images/themed/png/light/crop-auto-small.png b/rtdata/images/themed/png/light/crop-auto-small.png
new file mode 100644
index 000000000..bc3de2dc2
Binary files /dev/null and b/rtdata/images/themed/png/light/crop-auto-small.png differ
diff --git a/rtdata/images/themed/png/light/crop-auto.png b/rtdata/images/themed/png/light/crop-auto.png
index e38e04520..5499df93f 100644
Binary files a/rtdata/images/themed/png/light/crop-auto.png and b/rtdata/images/themed/png/light/crop-auto.png differ
diff --git a/rtdata/images/themed/png/light/crop-small.png b/rtdata/images/themed/png/light/crop-small.png
new file mode 100644
index 000000000..9f345a6ef
Binary files /dev/null and b/rtdata/images/themed/png/light/crop-small.png differ
diff --git a/rtdata/images/themed/png/light/crossed-arrows-in.png b/rtdata/images/themed/png/light/crossed-arrows-in.png
index c2df9223a..f10a4a058 100644
Binary files a/rtdata/images/themed/png/light/crossed-arrows-in.png and b/rtdata/images/themed/png/light/crossed-arrows-in.png differ
diff --git a/rtdata/images/themed/png/light/crossed-arrows-out.png b/rtdata/images/themed/png/light/crossed-arrows-out.png
index cde9a1930..410e65f3d 100644
Binary files a/rtdata/images/themed/png/light/crossed-arrows-out.png and b/rtdata/images/themed/png/light/crossed-arrows-out.png differ
diff --git a/rtdata/images/themed/png/light/crosshair-adjust.png b/rtdata/images/themed/png/light/crosshair-adjust.png
index 194a74d4b..d0a11b753 100644
Binary files a/rtdata/images/themed/png/light/crosshair-adjust.png and b/rtdata/images/themed/png/light/crosshair-adjust.png differ
diff --git a/rtdata/images/themed/png/light/curve-controlpoints-small.png b/rtdata/images/themed/png/light/curve-controlpoints-small.png
new file mode 100644
index 000000000..2be1333ff
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-controlpoints-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-controlpoints.png b/rtdata/images/themed/png/light/curve-controlpoints.png
index cd86903d6..cdd7cdd3a 100644
Binary files a/rtdata/images/themed/png/light/curve-controlpoints.png and b/rtdata/images/themed/png/light/curve-controlpoints.png differ
diff --git a/rtdata/images/themed/png/light/curve-flat-small.png b/rtdata/images/themed/png/light/curve-flat-small.png
new file mode 100644
index 000000000..17959e6ac
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-flat-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-flat.png b/rtdata/images/themed/png/light/curve-flat.png
index 6deff39e7..976281d49 100644
Binary files a/rtdata/images/themed/png/light/curve-flat.png and b/rtdata/images/themed/png/light/curve-flat.png differ
diff --git a/rtdata/images/themed/png/light/curve-linear-small.png b/rtdata/images/themed/png/light/curve-linear-small.png
new file mode 100644
index 000000000..53b07f616
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-linear-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-linear.png b/rtdata/images/themed/png/light/curve-linear.png
index bb88ccedc..a3d9105dd 100644
Binary files a/rtdata/images/themed/png/light/curve-linear.png and b/rtdata/images/themed/png/light/curve-linear.png differ
diff --git a/rtdata/images/themed/png/light/curve-nurbs-small.png b/rtdata/images/themed/png/light/curve-nurbs-small.png
new file mode 100644
index 000000000..f970852b5
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-nurbs-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-nurbs.png b/rtdata/images/themed/png/light/curve-nurbs.png
index b87f2be7f..ad9b3eb87 100644
Binary files a/rtdata/images/themed/png/light/curve-nurbs.png and b/rtdata/images/themed/png/light/curve-nurbs.png differ
diff --git a/rtdata/images/themed/png/light/curve-parametric-small.png b/rtdata/images/themed/png/light/curve-parametric-small.png
new file mode 100644
index 000000000..2acba010c
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-parametric-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-parametric.png b/rtdata/images/themed/png/light/curve-parametric.png
index 20526d768..a29a7529b 100644
Binary files a/rtdata/images/themed/png/light/curve-parametric.png and b/rtdata/images/themed/png/light/curve-parametric.png differ
diff --git a/rtdata/images/themed/png/light/curve-spline-small.png b/rtdata/images/themed/png/light/curve-spline-small.png
new file mode 100644
index 000000000..6ea7b93c9
Binary files /dev/null and b/rtdata/images/themed/png/light/curve-spline-small.png differ
diff --git a/rtdata/images/themed/png/light/curve-spline.png b/rtdata/images/themed/png/light/curve-spline.png
index 35e56e30e..c7318df5a 100644
Binary files a/rtdata/images/themed/png/light/curve-spline.png and b/rtdata/images/themed/png/light/curve-spline.png differ
diff --git a/rtdata/images/themed/png/light/distortion-auto-small.png b/rtdata/images/themed/png/light/distortion-auto-small.png
new file mode 100644
index 000000000..385c37307
Binary files /dev/null and b/rtdata/images/themed/png/light/distortion-auto-small.png differ
diff --git a/rtdata/images/themed/png/light/distortion-auto.png b/rtdata/images/themed/png/light/distortion-auto.png
index aabf9a4ad..242791d1b 100644
Binary files a/rtdata/images/themed/png/light/distortion-auto.png and b/rtdata/images/themed/png/light/distortion-auto.png differ
diff --git a/rtdata/images/themed/png/light/distortion-barrel-small.png b/rtdata/images/themed/png/light/distortion-barrel-small.png
new file mode 100644
index 000000000..5ec7c232b
Binary files /dev/null and b/rtdata/images/themed/png/light/distortion-barrel-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-yellow-blue.png b/rtdata/images/themed/png/light/distortion-pincushion-small.png
similarity index 54%
rename from rtdata/images/themed/png/dark/circle-yellow-blue.png
rename to rtdata/images/themed/png/light/distortion-pincushion-small.png
index 1248ae6a9..12bbe630d 100644
Binary files a/rtdata/images/themed/png/dark/circle-yellow-blue.png and b/rtdata/images/themed/png/light/distortion-pincushion-small.png differ
diff --git a/rtdata/images/themed/png/light/expander-closed.png b/rtdata/images/themed/png/light/expander-closed-small.png
similarity index 100%
rename from rtdata/images/themed/png/light/expander-closed.png
rename to rtdata/images/themed/png/light/expander-closed-small.png
diff --git a/rtdata/images/themed/png/light/expander-open.png b/rtdata/images/themed/png/light/expander-open-small.png
similarity index 100%
rename from rtdata/images/themed/png/light/expander-open.png
rename to rtdata/images/themed/png/light/expander-open-small.png
diff --git a/rtdata/images/themed/png/light/flip-horizontal.png b/rtdata/images/themed/png/light/flip-horizontal.png
index 2e7c5c2aa..9d5993527 100644
Binary files a/rtdata/images/themed/png/light/flip-horizontal.png and b/rtdata/images/themed/png/light/flip-horizontal.png differ
diff --git a/rtdata/images/themed/png/light/flip-vertical.png b/rtdata/images/themed/png/light/flip-vertical.png
index 605bab33e..6249c98b4 100644
Binary files a/rtdata/images/themed/png/light/flip-vertical.png and b/rtdata/images/themed/png/light/flip-vertical.png differ
diff --git a/rtdata/images/themed/png/light/gears-pause.png b/rtdata/images/themed/png/light/gears-pause.png
index 4a0dd5a09..ef10159f4 100644
Binary files a/rtdata/images/themed/png/light/gears-pause.png and b/rtdata/images/themed/png/light/gears-pause.png differ
diff --git a/rtdata/images/themed/png/light/gears-play.png b/rtdata/images/themed/png/light/gears-play.png
index e25f58050..c7d534f55 100644
Binary files a/rtdata/images/themed/png/light/gears-play.png and b/rtdata/images/themed/png/light/gears-play.png differ
diff --git a/rtdata/images/themed/png/light/hand-closed.png b/rtdata/images/themed/png/light/hand-closed.png
index 741db6d49..4639aa36e 100644
Binary files a/rtdata/images/themed/png/light/hand-closed.png and b/rtdata/images/themed/png/light/hand-closed.png differ
diff --git a/rtdata/images/themed/png/light/hand-open.png b/rtdata/images/themed/png/light/hand-open.png
index bb01eac88..b3a0a6168 100644
Binary files a/rtdata/images/themed/png/light/hand-open.png and b/rtdata/images/themed/png/light/hand-open.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-1to1-small.png b/rtdata/images/themed/png/light/magnifier-1to1-small.png
index 4f60385d2..cfd75532a 100644
Binary files a/rtdata/images/themed/png/light/magnifier-1to1-small.png and b/rtdata/images/themed/png/light/magnifier-1to1-small.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-1to1.png b/rtdata/images/themed/png/light/magnifier-1to1.png
index dc46a7c04..0602789d7 100644
Binary files a/rtdata/images/themed/png/light/magnifier-1to1.png and b/rtdata/images/themed/png/light/magnifier-1to1.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-crop.png b/rtdata/images/themed/png/light/magnifier-crop.png
index 717ebffef..338f6db83 100644
Binary files a/rtdata/images/themed/png/light/magnifier-crop.png and b/rtdata/images/themed/png/light/magnifier-crop.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-fit.png b/rtdata/images/themed/png/light/magnifier-fit.png
index 9ae475ecf..fdc0bef5f 100644
Binary files a/rtdata/images/themed/png/light/magnifier-fit.png and b/rtdata/images/themed/png/light/magnifier-fit.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-minus-small.png b/rtdata/images/themed/png/light/magnifier-minus-small.png
index b538f12bc..76b55f975 100644
Binary files a/rtdata/images/themed/png/light/magnifier-minus-small.png and b/rtdata/images/themed/png/light/magnifier-minus-small.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-minus.png b/rtdata/images/themed/png/light/magnifier-minus.png
index 988749f81..22db961c3 100644
Binary files a/rtdata/images/themed/png/light/magnifier-minus.png and b/rtdata/images/themed/png/light/magnifier-minus.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-plus-small.png b/rtdata/images/themed/png/light/magnifier-plus-small.png
index 50c46a798..54d989e63 100644
Binary files a/rtdata/images/themed/png/light/magnifier-plus-small.png and b/rtdata/images/themed/png/light/magnifier-plus-small.png differ
diff --git a/rtdata/images/themed/png/light/magnifier-plus.png b/rtdata/images/themed/png/light/magnifier-plus.png
index 001077f77..e45ce8d81 100644
Binary files a/rtdata/images/themed/png/light/magnifier-plus.png and b/rtdata/images/themed/png/light/magnifier-plus.png differ
diff --git a/rtdata/images/themed/png/light/magnifier.png b/rtdata/images/themed/png/light/magnifier.png
index 011a6c327..a7fbdbeda 100644
Binary files a/rtdata/images/themed/png/light/magnifier.png and b/rtdata/images/themed/png/light/magnifier.png differ
diff --git a/rtdata/images/themed/png/light/one-to-one.png b/rtdata/images/themed/png/light/one-to-one-small.png
similarity index 100%
rename from rtdata/images/themed/png/light/one-to-one.png
rename to rtdata/images/themed/png/light/one-to-one-small.png
diff --git a/rtdata/images/themed/png/light/padlock-locked.png b/rtdata/images/themed/png/light/padlock-locked-small.png
similarity index 100%
rename from rtdata/images/themed/png/light/padlock-locked.png
rename to rtdata/images/themed/png/light/padlock-locked-small.png
diff --git a/rtdata/images/themed/png/light/padlock-unlocked.png b/rtdata/images/themed/png/light/padlock-unlocked-small.png
similarity index 100%
rename from rtdata/images/themed/png/light/padlock-unlocked.png
rename to rtdata/images/themed/png/light/padlock-unlocked-small.png
diff --git a/rtdata/images/themed/png/dark/padlock-locked.png b/rtdata/images/themed/png/light/perspective-horizontal-left-small.png
similarity index 55%
rename from rtdata/images/themed/png/dark/padlock-locked.png
rename to rtdata/images/themed/png/light/perspective-horizontal-left-small.png
index b8418bf43..f2832c607 100644
Binary files a/rtdata/images/themed/png/dark/padlock-locked.png and b/rtdata/images/themed/png/light/perspective-horizontal-left-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-red-green.png b/rtdata/images/themed/png/light/perspective-horizontal-right-small.png
similarity index 55%
rename from rtdata/images/themed/png/dark/circle-red-green.png
rename to rtdata/images/themed/png/light/perspective-horizontal-right-small.png
index 7059dc60d..e555f0c1e 100644
Binary files a/rtdata/images/themed/png/dark/circle-red-green.png and b/rtdata/images/themed/png/light/perspective-horizontal-right-small.png differ
diff --git a/rtdata/images/themed/png/light/perspective-vertical-bottom-small.png b/rtdata/images/themed/png/light/perspective-vertical-bottom-small.png
new file mode 100644
index 000000000..12f776add
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-vertical-bottom-small.png differ
diff --git a/rtdata/images/themed/png/light/perspective-vertical-top-small.png b/rtdata/images/themed/png/light/perspective-vertical-top-small.png
new file mode 100644
index 000000000..8202b0e75
Binary files /dev/null and b/rtdata/images/themed/png/light/perspective-vertical-top-small.png differ
diff --git a/rtdata/images/themed/png/light/power-inconsistent.png b/rtdata/images/themed/png/light/power-inconsistent-small.png
similarity index 100%
rename from rtdata/images/themed/png/light/power-inconsistent.png
rename to rtdata/images/themed/png/light/power-inconsistent-small.png
diff --git a/rtdata/images/themed/png/light/power-off.png b/rtdata/images/themed/png/light/power-off-small.png
similarity index 100%
rename from rtdata/images/themed/png/light/power-off.png
rename to rtdata/images/themed/png/light/power-off-small.png
diff --git a/rtdata/images/themed/png/light/power-on.png b/rtdata/images/themed/png/light/power-on-small.png
similarity index 100%
rename from rtdata/images/themed/png/light/power-on.png
rename to rtdata/images/themed/png/light/power-on-small.png
diff --git a/rtdata/images/themed/png/light/rotate-left-small.png b/rtdata/images/themed/png/light/rotate-left-small.png
new file mode 100644
index 000000000..f3c94f65a
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-left-small.png differ
diff --git a/rtdata/images/themed/png/light/rotate-left.png b/rtdata/images/themed/png/light/rotate-left.png
index dec787b13..5e2b0a201 100644
Binary files a/rtdata/images/themed/png/light/rotate-left.png and b/rtdata/images/themed/png/light/rotate-left.png differ
diff --git a/rtdata/images/themed/png/light/rotate-right-small.png b/rtdata/images/themed/png/light/rotate-right-small.png
new file mode 100644
index 000000000..4fa8f8d19
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-right-small.png differ
diff --git a/rtdata/images/themed/png/light/rotate-right.png b/rtdata/images/themed/png/light/rotate-right.png
index f81828f58..c819cbe73 100644
Binary files a/rtdata/images/themed/png/light/rotate-right.png and b/rtdata/images/themed/png/light/rotate-right.png differ
diff --git a/rtdata/images/themed/png/light/rotate-straighten-small.png b/rtdata/images/themed/png/light/rotate-straighten-small.png
new file mode 100644
index 000000000..67190d31a
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-straighten-small.png differ
diff --git a/rtdata/images/themed/svg/circle-black.svg b/rtdata/images/themed/svg/circle-black-small.svg
similarity index 95%
rename from rtdata/images/themed/svg/circle-black.svg
rename to rtdata/images/themed/svg/circle-black-small.svg
index aa335e0fe..2b314c556 100644
--- a/rtdata/images/themed/svg/circle-black.svg
+++ b/rtdata/images/themed/svg/circle-black-small.svg
@@ -18,7 +18,7 @@
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="adj-black.svg">
+   sodipodi:docname="circle-black.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#E0E1E2"
@@ -26,7 +26,7 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
+     inkscape:zoom="51.375"
      inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
@@ -40,7 +40,7 @@
      inkscape:grid-bbox="true"
      inkscape:pagecheckerboard="false"
      inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="false"
+     inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
      inkscape:object-nodes="false"
      inkscape:snap-grids="true"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,6 +105,6 @@
        id="path3234"
        cx="8"
        cy="16"
-       r="7" />
+       r="6" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-blue-green.svg b/rtdata/images/themed/svg/circle-blue-green-small.svg
similarity index 96%
rename from rtdata/images/themed/svg/circle-blue-green.svg
rename to rtdata/images/themed/svg/circle-blue-green-small.svg
index 1708478ca..5068447b3 100644
--- a/rtdata/images/themed/svg/circle-blue-green.svg
+++ b/rtdata/images/themed/svg/circle-blue-green-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.362963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,7 +105,7 @@
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-blue-red.svg b/rtdata/images/themed/svg/circle-blue-red-small.svg
similarity index 94%
rename from rtdata/images/themed/svg/circle-blue-red.svg
rename to rtdata/images/themed/svg/circle-blue-red-small.svg
index 956feaa29..6445577c1 100644
--- a/rtdata/images/themed/svg/circle-blue-red.svg
+++ b/rtdata/images/themed/svg/circle-blue-red-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.362963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#0000ff;fill-opacity:0.97076023;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#0000ff;fill-opacity:0.97076021;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-blue.svg b/rtdata/images/themed/svg/circle-blue-small.svg
similarity index 95%
rename from rtdata/images/themed/svg/circle-blue.svg
rename to rtdata/images/themed/svg/circle-blue-small.svg
index af2f747c6..b92577051 100644
--- a/rtdata/images/themed/svg/circle-blue.svg
+++ b/rtdata/images/themed/svg/circle-blue-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8.2469136"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,10 +101,10 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#0000ff;fill-opacity:0.98830408;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#0000ff;fill-opacity:0.98830411;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="7.9999995"
        cy="16"
-       r="7" />
+       r="6.0000005" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-blue-yellow.svg b/rtdata/images/themed/svg/circle-blue-yellow-small.svg
similarity index 94%
rename from rtdata/images/themed/svg/circle-blue-yellow.svg
rename to rtdata/images/themed/svg/circle-blue-yellow-small.svg
index 8cf03a92d..5f2e7f04d 100644
--- a/rtdata/images/themed/svg/circle-blue-yellow.svg
+++ b/rtdata/images/themed/svg/circle-blue-yellow-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8.2469136"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#0000ff;fill-opacity:0.97076023;stroke:#ffe400;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#0000ff;fill-opacity:0.97076021;stroke:#ffe400;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5"
+       ry="4.9999995" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-cyan-red.svg b/rtdata/images/themed/svg/circle-cyan-red-small.svg
similarity index 95%
rename from rtdata/images/themed/svg/circle-cyan-red.svg
rename to rtdata/images/themed/svg/circle-cyan-red-small.svg
index 29df8b5c6..6b34c50ec 100644
--- a/rtdata/images/themed/svg/circle-cyan-red.svg
+++ b/rtdata/images/themed/svg/circle-cyan-red-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8.2469136"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#00fcff;fill-opacity:1;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830408;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#00fcff;fill-opacity:1;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-cyan.svg b/rtdata/images/themed/svg/circle-cyan-small.svg
similarity index 97%
rename from rtdata/images/themed/svg/circle-cyan.svg
rename to rtdata/images/themed/svg/circle-cyan-small.svg
index 7d7cee75c..b376821cb 100644
--- a/rtdata/images/themed/svg/circle-cyan.svg
+++ b/rtdata/images/themed/svg/circle-cyan-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.362963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,6 +105,6 @@
        id="path1611"
        cx="7.9999995"
        cy="16"
-       r="7" />
+       r="6.0000005" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-empty-blue.svg b/rtdata/images/themed/svg/circle-empty-blue-small.svg
similarity index 96%
rename from rtdata/images/themed/svg/circle-empty-blue.svg
rename to rtdata/images/themed/svg/circle-empty-blue-small.svg
index 47aa0263a..e9004ae63 100644
--- a/rtdata/images/themed/svg/circle-empty-blue.svg
+++ b/rtdata/images/themed/svg/circle-empty-blue-small.svg
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:none;fill-opacity:0.93877554;stroke:#0000ff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#0000ff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98823529;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-empty-darkgray.svg b/rtdata/images/themed/svg/circle-empty-darkgray-small.svg
similarity index 94%
rename from rtdata/images/themed/svg/circle-empty-darkgray.svg
rename to rtdata/images/themed/svg/circle-empty-darkgray-small.svg
index 0f21427a6..21b4db7ab 100644
--- a/rtdata/images/themed/svg/circle-empty-darkgray.svg
+++ b/rtdata/images/themed/svg/circle-empty-darkgray-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.0962963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:none;fill-opacity:0.93877554;stroke:#606060;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#606060;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-empty-gray.svg b/rtdata/images/themed/svg/circle-empty-gray-small.svg
similarity index 93%
rename from rtdata/images/themed/svg/circle-empty-gray.svg
rename to rtdata/images/themed/svg/circle-empty-gray-small.svg
index 803b0de20..9bca30ae1 100644
--- a/rtdata/images/themed/svg/circle-empty-gray.svg
+++ b/rtdata/images/themed/svg/circle-empty-gray-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.0962963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:none;fill-opacity:0.93877554;stroke:#c0c0c0;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98979592;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#c0c0c0;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98979594;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-empty-green.svg b/rtdata/images/themed/svg/circle-empty-green-small.svg
similarity index 94%
rename from rtdata/images/themed/svg/circle-empty-green.svg
rename to rtdata/images/themed/svg/circle-empty-green-small.svg
index 537ce73f9..b99c6d43e 100644
--- a/rtdata/images/themed/svg/circle-empty-green.svg
+++ b/rtdata/images/themed/svg/circle-empty-green-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="2.2123457"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:none;fill-opacity:0.93877554;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97254902;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97254902;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5"
+       ry="4.9999995" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-empty-purple.svg b/rtdata/images/themed/svg/circle-empty-purple-small.svg
similarity index 95%
rename from rtdata/images/themed/svg/circle-empty-purple.svg
rename to rtdata/images/themed/svg/circle-empty-purple-small.svg
index 0f98bf392..751525ff2 100644
--- a/rtdata/images/themed/svg/circle-empty-purple.svg
+++ b/rtdata/images/themed/svg/circle-empty-purple-small.svg
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="51.375"
-     inkscape:cx="5.1581509"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:none;fill-opacity:0.93877554;stroke:#800080;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#800080;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5"
+       ry="4.9999995" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-empty-red.svg b/rtdata/images/themed/svg/circle-empty-red-small.svg
similarity index 94%
rename from rtdata/images/themed/svg/circle-empty-red.svg
rename to rtdata/images/themed/svg/circle-empty-red-small.svg
index 86684f737..fcb7123cf 100644
--- a/rtdata/images/themed/svg/circle-empty-red.svg
+++ b/rtdata/images/themed/svg/circle-empty-red-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="2.2123457"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:none;fill-opacity:0.93877554;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#ff0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-empty-yellow.svg b/rtdata/images/themed/svg/circle-empty-yellow-small.svg
similarity index 95%
rename from rtdata/images/themed/svg/circle-empty-yellow.svg
rename to rtdata/images/themed/svg/circle-empty-yellow-small.svg
index 8de7aa991..65d9fd4cf 100644
--- a/rtdata/images/themed/svg/circle-empty-yellow.svg
+++ b/rtdata/images/themed/svg/circle-empty-yellow-small.svg
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="51.375"
-     inkscape:cx="8"
+     inkscape:cx="5.1581509"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:none;fill-opacity:0.93877554;stroke:#ffff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98431373;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:none;fill-opacity:0.93877552;stroke:#ffff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98431373;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-gray-blue.svg b/rtdata/images/themed/svg/circle-gray-blue-small.svg
similarity index 94%
rename from rtdata/images/themed/svg/circle-gray-blue.svg
rename to rtdata/images/themed/svg/circle-gray-blue-small.svg
index df7b30f47..0804edcd7 100644
--- a/rtdata/images/themed/svg/circle-gray-blue.svg
+++ b/rtdata/images/themed/svg/circle-gray-blue-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.0962963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877554;stroke:#0000fc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877552;stroke:#0000fc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-gray-green.svg b/rtdata/images/themed/svg/circle-gray-green-small.svg
similarity index 94%
rename from rtdata/images/themed/svg/circle-gray-green.svg
rename to rtdata/images/themed/svg/circle-gray-green-small.svg
index c34327b60..609f6d0e7 100644
--- a/rtdata/images/themed/svg/circle-gray-green.svg
+++ b/rtdata/images/themed/svg/circle-gray-green-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.0962963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877554;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877552;stroke:#00ff00;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5"
+       ry="4.9999995" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-gray-red.svg b/rtdata/images/themed/svg/circle-gray-red-small.svg
similarity index 94%
rename from rtdata/images/themed/svg/circle-gray-red.svg
rename to rtdata/images/themed/svg/circle-gray-red-small.svg
index 2ef522fbd..6e203cdbb 100644
--- a/rtdata/images/themed/svg/circle-gray-red.svg
+++ b/rtdata/images/themed/svg/circle-gray-red-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.0962963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877554;stroke:#fc0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#c0c0c0;fill-opacity:0.93877552;stroke:#fc0000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5"
+       ry="4.9999995" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-green-blue.svg b/rtdata/images/themed/svg/circle-green-blue-small.svg
similarity index 96%
rename from rtdata/images/themed/svg/circle-green-blue.svg
rename to rtdata/images/themed/svg/circle-green-blue-small.svg
index cb3cd2ddc..650f9fc44 100644
--- a/rtdata/images/themed/svg/circle-green-blue.svg
+++ b/rtdata/images/themed/svg/circle-green-blue-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.362963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,7 +105,7 @@
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-green-red.svg b/rtdata/images/themed/svg/circle-green-red-small.svg
similarity index 97%
rename from rtdata/images/themed/svg/circle-green-red.svg
rename to rtdata/images/themed/svg/circle-green-red-small.svg
index b1c59b9bd..21e153062 100644
--- a/rtdata/images/themed/svg/circle-green-red.svg
+++ b/rtdata/images/themed/svg/circle-green-red-small.svg
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="50.625"
-     inkscape:cx="8.0197531"
+     inkscape:cx="5.1358025"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,7 +105,7 @@
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5"
+       ry="4.9999995" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-green.svg b/rtdata/images/themed/svg/circle-green-small.svg
similarity index 95%
rename from rtdata/images/themed/svg/circle-green.svg
rename to rtdata/images/themed/svg/circle-green-small.svg
index 88e8de37d..dc1b0217a 100644
--- a/rtdata/images/themed/svg/circle-green.svg
+++ b/rtdata/images/themed/svg/circle-green-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8.2469136"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,10 +101,10 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#00ff00;fill-opacity:0.97076023;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#00ff00;fill-opacity:0.97076021;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="7.9999995"
        cy="16"
-       r="7" />
+       r="6.0000005" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-magenta.svg b/rtdata/images/themed/svg/circle-magenta-small.svg
similarity index 97%
rename from rtdata/images/themed/svg/circle-magenta.svg
rename to rtdata/images/themed/svg/circle-magenta-small.svg
index e1cd67cc9..9f2e485f9 100644
--- a/rtdata/images/themed/svg/circle-magenta.svg
+++ b/rtdata/images/themed/svg/circle-magenta-small.svg
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="50.625"
-     inkscape:cx="8.2469136"
+     inkscape:cx="5.362963"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,6 +105,6 @@
        id="path1611"
        cx="7.9999995"
        cy="16"
-       r="7" />
+       r="6.0000005" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-orange.svg b/rtdata/images/themed/svg/circle-orange-small.svg
similarity index 97%
rename from rtdata/images/themed/svg/circle-orange.svg
rename to rtdata/images/themed/svg/circle-orange-small.svg
index dd6ede5d6..addf840d1 100644
--- a/rtdata/images/themed/svg/circle-orange.svg
+++ b/rtdata/images/themed/svg/circle-orange-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.362963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,6 +105,6 @@
        id="path1611"
        cx="7.9999995"
        cy="16"
-       r="7" />
+       r="6" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-purple.svg b/rtdata/images/themed/svg/circle-purple-small.svg
similarity index 97%
rename from rtdata/images/themed/svg/circle-purple.svg
rename to rtdata/images/themed/svg/circle-purple-small.svg
index 788154ce8..2c4a3f225 100644
--- a/rtdata/images/themed/svg/circle-purple.svg
+++ b/rtdata/images/themed/svg/circle-purple-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8.2469136"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,6 +105,6 @@
        id="path1611"
        cx="7.9999995"
        cy="16"
-       r="7" />
+       r="6.0000005" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-red-blue.svg b/rtdata/images/themed/svg/circle-red-blue-small.svg
similarity index 96%
rename from rtdata/images/themed/svg/circle-red-blue.svg
rename to rtdata/images/themed/svg/circle-red-blue-small.svg
index 6ac2d9932..274cb68fa 100644
--- a/rtdata/images/themed/svg/circle-red-blue.svg
+++ b/rtdata/images/themed/svg/circle-red-blue-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.362963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,7 +105,7 @@
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-red-cyan.svg b/rtdata/images/themed/svg/circle-red-cyan-small.svg
similarity index 97%
rename from rtdata/images/themed/svg/circle-red-cyan.svg
rename to rtdata/images/themed/svg/circle-red-cyan-small.svg
index dc9f1c754..e2feb97e1 100644
--- a/rtdata/images/themed/svg/circle-red-cyan.svg
+++ b/rtdata/images/themed/svg/circle-red-cyan-small.svg
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="50.625"
-     inkscape:cx="8.2469136"
+     inkscape:cx="5.362963"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,7 +105,7 @@
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5"
+       ry="4.9999995" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-red-green.svg b/rtdata/images/themed/svg/circle-red-green-small.svg
similarity index 96%
rename from rtdata/images/themed/svg/circle-red-green.svg
rename to rtdata/images/themed/svg/circle-red-green-small.svg
index 2e29e0595..96cc892dd 100644
--- a/rtdata/images/themed/svg/circle-red-green.svg
+++ b/rtdata/images/themed/svg/circle-red-green-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.362963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -105,7 +105,7 @@
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-red.svg b/rtdata/images/themed/svg/circle-red-small.svg
similarity index 95%
rename from rtdata/images/themed/svg/circle-red.svg
rename to rtdata/images/themed/svg/circle-red-small.svg
index 24ee2b29b..a56b0d328 100644
--- a/rtdata/images/themed/svg/circle-red.svg
+++ b/rtdata/images/themed/svg/circle-red-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8.2469136"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,10 +101,10 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#ff0000;fill-opacity:0.99415207;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#ff0000;fill-opacity:0.99415205;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="7.9999995"
        cy="16"
-       r="7" />
+       r="6.0000005" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-white.svg b/rtdata/images/themed/svg/circle-white-small.svg
similarity index 87%
rename from rtdata/images/themed/svg/circle-white.svg
rename to rtdata/images/themed/svg/circle-white-small.svg
index 0d00f3f32..5a485d954 100644
--- a/rtdata/images/themed/svg/circle-white.svg
+++ b/rtdata/images/themed/svg/circle-white-small.svg
@@ -18,7 +18,7 @@
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="adj-white.svg">
+   sodipodi:docname="circle-white.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#E0E1E2"
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="50.625"
-     inkscape:cx="8"
+     inkscape:cx="5.1160494"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -40,11 +40,12 @@
      inkscape:grid-bbox="true"
      inkscape:pagecheckerboard="false"
      inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="false"
+     inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
      inkscape:object-nodes="false"
      inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-bbox-edge-midpoints="false">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -63,7 +64,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,10 +102,10 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#ffffff;fill-opacity:0.89999998;stroke:none;stroke-width:0.25;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#ffffff;fill-opacity:0.9;stroke:none;stroke-width:0.24999999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
        id="path3234"
        cx="8"
        cy="16"
-       r="7" />
+       r="6" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-yellow-blue.svg b/rtdata/images/themed/svg/circle-yellow-blue-small.svg
similarity index 93%
rename from rtdata/images/themed/svg/circle-yellow-blue.svg
rename to rtdata/images/themed/svg/circle-yellow-blue-small.svg
index 297c4ccfd..f6e134941 100644
--- a/rtdata/images/themed/svg/circle-yellow-blue.svg
+++ b/rtdata/images/themed/svg/circle-yellow-blue-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8.0197531"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,11 +101,11 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <ellipse
-       style="opacity:0.7;fill:#ffff00;fill-opacity:0.98830408;stroke:#0000ff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.94736844;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#ffff00;fill-opacity:0.98830411;stroke:#0000ff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.94736843;paint-order:markers fill stroke"
        id="path1611"
        cx="8"
        cy="16"
-       rx="6"
-       ry="5.9999995" />
+       rx="5.0000005"
+       ry="5" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/circle-yellow.svg b/rtdata/images/themed/svg/circle-yellow-small.svg
similarity index 95%
rename from rtdata/images/themed/svg/circle-yellow.svg
rename to rtdata/images/themed/svg/circle-yellow-small.svg
index f22e7a580..7d86fdb19 100644
--- a/rtdata/images/themed/svg/circle-yellow.svg
+++ b/rtdata/images/themed/svg/circle-yellow-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="8.2469136"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,10 +101,10 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <circle
-       style="opacity:0.7;fill:#ffff00;fill-opacity:0.98245615;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
+       style="opacity:0.7;fill:#ffff00;fill-opacity:0.98245616;stroke:none;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98830411;paint-order:markers fill stroke"
        id="path1611"
        cx="7.9999995"
        cy="16"
-       r="7" />
+       r="6.0000005" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/color-picker-add.svg b/rtdata/images/themed/svg/color-picker-add.svg
index a7af68231..1535ca260 100644
--- a/rtdata/images/themed/svg/color-picker-add.svg
+++ b/rtdata/images/themed/svg/color-picker-add.svg
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="8"
-     inkscape:cx="-16.850971"
+     inkscape:cx="-35.100971"
      inkscape:cy="6.1695344"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -65,7 +65,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -124,7 +124,7 @@
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.32669207"
        inkscape:connector-curvature="0" />
     <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 17 13 L 17 17 L 13 17 L 13 19 L 17 19 L 17 23 L 19 23 L 19 19 L 23 19 L 23 17 L 19 17 L 19 13 L 17 13 z "
        id="rect2927" />
   </g>
diff --git a/rtdata/images/themed/svg/color-picker-show.svg b/rtdata/images/themed/svg/color-picker-show.svg
index bcccf2073..351c51011 100644
--- a/rtdata/images/themed/svg/color-picker-show.svg
+++ b/rtdata/images/themed/svg/color-picker-show.svg
@@ -26,7 +26,7 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
+     inkscape:zoom="34.25"
      inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
@@ -124,7 +124,7 @@
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.32669207"
        inkscape:connector-curvature="0" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2925"
        width="9"
        height="2"
@@ -132,14 +132,14 @@
        y="21"
        ry="0" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2927"
        width="9"
        height="2"
        x="14"
        y="18" />
     <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="rect2929"
        width="9"
        height="2"
diff --git a/rtdata/images/themed/svg/crop-auto-small.svg b/rtdata/images/themed/svg/crop-auto-small.svg
new file mode 100644
index 000000000..6d8ac3ea7
--- /dev/null
+++ b/rtdata/images/themed/svg/crop-auto-small.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="crop-auto-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       d="m 1,11 v 2 h 10 v 10 h 2 V 11 Z"
+       id="rect1324"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       d="M 7.9472656,19 C 7.9775765,19.42477 7.6864119,19.784296 7.3316451,19.980141 6.8220082,20.320094 6.3123713,20.660047 5.8027344,21 8.8684896,21 11.934245,21 15,21 c 0,-0.666667 0,-1.333333 0,-2 -2.350911,0 -4.701823,0 -7.0527344,0 z"
+       id="path879"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       d="M 5,16.503906 C 4.3333333,16.052083 3.6666667,15.60026 3,15.148438 3,17.098958 3,19.049479 3,21 c 0.9342448,0 1.8684896,0 2.8027344,0 0.5930099,-0.398845 1.1923238,-0.788671 1.78125,-1.193359 C 7.7956078,19.642038 8.0419175,19.203839 7.9012819,19 6.9341879,19 5.967094,19 5,19 5,18.167969 5,17.335937 5,16.503906 Z"
+       id="path877"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       d="M 3 1 L 3 7.1484375 L 5 8.5039062 L 5 1 L 3 1 z "
+       id="rect1322"
+       transform="translate(0,8)" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="Symbol-4-6-8"
+       d="M 1,17.238584 V 15 L 6.950059,19.034097 1,23 v -2.198912 z"
+       style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/crop-auto.svg b/rtdata/images/themed/svg/crop-auto.svg
index 9174a00fa..bc662e9ea 100644
--- a/rtdata/images/themed/svg/crop-auto.svg
+++ b/rtdata/images/themed/svg/crop-auto.svg
@@ -100,25 +100,37 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
+       id="path819"
+       d="M -26,1 V 20 H -7 V 16 H -22 V 1 Z"
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
-       d="M 4 1 L 4 10.615234 L 8 13.328125 L 8 1 L 4 1 z M 11.626953 16 A 2.0002 2.0002 0 0 1 11.035156 18.714844 L 9.1074219 20 L 23 20 L 23 16 L 11.626953 16 z "
-       id="rect1322" />
-    <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
-       d="m 1,4 v 4 h 15 v 15 h 4 V 4 Z"
-       id="rect1324"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       inkscape:connector-curvature="0" />
+    <g
+       id="g832">
+      <path
+         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+         d="m 11.712891,16 c 0.604599,0.961124 0.209593,2.336093 -0.779834,2.87075 C 10.368132,19.247167 9.8032064,19.623583 9.2382812,20 13.825521,20 18.41276,20 23,20 c 0,-1.333333 0,-2.666667 0,-4 -3.76237,0 -7.524739,0 -11.287109,0 z"
+         id="path849"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+         d="M 8,13.240234 C 6.6666667,12.335937 5.3333333,11.431641 4,10.527344 4,13.684896 4,16.842448 4,20 5.7460937,20 7.4921875,20 9.2382812,20 9.9048153,19.548741 10.585369,19.117421 11.242188,18.652344 12.019524,18.039287 12.235167,16.842992 11.712891,16 10.475261,16 9.2376303,16 8,16 8,15.080078 8,14.160156 8,13.240234 Z"
+         id="path847"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+         d="M 4 1 L 4 10.527344 L 8 13.240234 L 8 1 L 4 1 z "
+         id="path826" />
+      <path
+         inkscape:connector-curvature="0"
+         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+         d="M 20,23 V 4 H 1 v 4 h 15 v 15 z"
+         id="path828" />
+    </g>
     <path
        sodipodi:nodetypes="cccccc"
        inkscape:connector-curvature="0"
        id="Symbol-4-6-8"
        d="M 1,14.357876 V 11 L 9.925089,17.051146 1,23 v -3.298368 z"
-       style="display:inline;opacity:0.7;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
-    <path
-       id="path819"
-       d="M -26,1 V 20 H -7 V 16 H -22 V 1 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
-       inkscape:connector-curvature="0" />
+       style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/crop-small.svg b/rtdata/images/themed/svg/crop-small.svg
new file mode 100644
index 000000000..94c0b43df
--- /dev/null
+++ b/rtdata/images/themed/svg/crop-small.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="crop-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       d="M 3,9 V 21 H 15 V 19 H 5 V 9 Z"
+       id="rect1322"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       d="m 1,11 v 2 h 10 v 10 h 2 V 11 Z"
+       id="rect1324"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/crossed-arrows-in.svg b/rtdata/images/themed/svg/crossed-arrows-in.svg
index 081448228..8a4c71dc8 100644
--- a/rtdata/images/themed/svg/crossed-arrows-in.svg
+++ b/rtdata/images/themed/svg/crossed-arrows-in.svg
@@ -26,7 +26,7 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
+     inkscape:zoom="34.25"
      inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
@@ -75,7 +75,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -112,19 +112,19 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
        d="M 17.211202,6.8416774 23,6.0147076 18.038177,1.0528839 Z"
        id="path2876" />
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
        d="M 1.052887,6.0147071 6.8416789,6.8416795 6.0147103,1.0528839 Z"
        id="path2866" />
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
        d="M 18.038177,22.999997 23,18.038174 17.211202,17.211203 Z"
        id="path2864" />
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
        d="M 6.0147103,22.999997 6.8416801,17.211199 1.052887,18.038174 Z"
        id="path2893" />
     <path
diff --git a/rtdata/images/themed/svg/crossed-arrows-out.svg b/rtdata/images/themed/svg/crossed-arrows-out.svg
index 867b5180c..5eb5ba4b1 100644
--- a/rtdata/images/themed/svg/crossed-arrows-out.svg
+++ b/rtdata/images/themed/svg/crossed-arrows-out.svg
@@ -26,9 +26,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="23.864854"
-     inkscape:cx="11.228587"
-     inkscape:cy="15.516233"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -75,7 +75,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -112,23 +112,23 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
-       d="m 22,2 -5.788798,0.8269698 4.961823,4.9618237 z"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       d="M 20.999798,3.0002065 15.211,3.8271763 20.172823,8.789 Z"
        id="path2876"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
-       d="M 7.7887919,2.8269724 2,2 2.8269686,7.7887956 Z"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       d="M 8.7887919,3.8271768 3,3.0002044 3.8269686,8.789 Z"
        id="path2866"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
-       d="M 21.173025,16.211206 16.211202,21.173029 22,22 Z"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       d="M 20.172823,15.211206 15.211,20.173029 20.999798,21 Z"
        id="path2864"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
-       d="M 2.8269698,16.211202 2,22 7.7887931,21.173025 Z"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       d="M 3.8269698,15.211202 3,21 8.7887931,20.173025 Z"
        id="path2893"
        inkscape:connector-curvature="0" />
     <path
diff --git a/rtdata/images/themed/svg/crosshair-adjust.svg b/rtdata/images/themed/svg/crosshair-adjust.svg
index cb044e8ae..16ff954ac 100644
--- a/rtdata/images/themed/svg/crosshair-adjust.svg
+++ b/rtdata/images/themed/svg/crosshair-adjust.svg
@@ -18,7 +18,7 @@
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="crosshair1-adjust.svg">
+   sodipodi:docname="crosshair-adjust.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#E0E1E2"
@@ -26,7 +26,7 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.833333"
+     inkscape:zoom="34.25"
      inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -99,22 +99,8 @@
      id="layer1"
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
-    <g
-       id="g3653"
-       transform="translate(-23.5,-0.5)">
-      <path
-         id="rect1440"
-         d="M 35.5,2 C 34.669,2 34,2.669 34,3.5 v 7.007812 C 34.418164,10.19301 34.933952,10 35.5,10 c 0.566048,0 1.081836,0.19301 1.5,0.507812 V 3.5 C 37,2.669 36.331,2 35.5,2 Z m -9,9 c -0.831,0 -1.5,0.669 -1.5,1.5 0,0.831 0.669,1.5 1.5,1.5 h 7.007812 C 33.19301,13.581836 33,13.066048 33,12.5 33,11.933952 33.19301,11.418164 33.507812,11 Z m 10.992188,0 C 37.80699,11.418164 38,11.933952 38,12.5 38,13.066048 37.80699,13.581836 37.492188,14 H 44.5 C 45.331,14 46,13.331 46,12.5 46,11.669 45.331,11 44.5,11 Z M 34,14.492188 V 21.5 c 0,0.831 0.669,1.5 1.5,1.5 0.831,0 1.5,-0.669 1.5,-1.5 V 14.492188 C 36.581836,14.80699 36.066048,15 35.5,15 34.933952,15 34.418164,14.80699 34,14.492188 Z"
-         style="opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path1481"
-         d="m 35.5,1.5 c -1.099351,0 -2,0.900649 -2,2 v 7 h -7 c -1.099351,0 -2,0.900649 -2,2 0,1.099351 0.900649,2 2,2 h 7 v 7 c 0,1.099351 0.900649,2 2,2 1.099351,0 2,-0.900649 2,-2 v -7 h 7 c 1.099351,0 2,-0.900649 2,-2 0,-1.099351 -0.900649,-2 -2,-2 h -7 v -7 c 0,-1.099351 -0.900649,-2 -2,-2 z m 0,1 c 0.562649,0 1,0.437351 1,1 v 6.708984 c 0.577268,0.251335 1.039681,0.713748 1.291016,1.291016 H 44.5 c 0.562649,0 1,0.437351 1,1 0,0.562649 -0.437351,1 -1,1 H 37.791016 C 37.539681,14.077268 37.077268,14.539681 36.5,14.791016 V 21.5 c 0,0.562649 -0.437351,1 -1,1 -0.562649,0 -1,-0.437351 -1,-1 V 14.791016 C 33.922732,14.539681 33.460319,14.077268 33.208984,13.5 H 26.5 c -0.562649,0 -1,-0.437351 -1,-1 0,-0.562649 0.437351,-1 1,-1 h 6.708984 C 33.460319,10.922732 33.922732,10.460319 34.5,10.208984 V 3.5 c 0,-0.562649 0.437351,-1 1,-1 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-    </g>
     <path
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262"
        d="M 8.0170773,6 4.5085416,1.3219482 1,5.9999999 Z"
        id="path2866"
        inkscape:connector-curvature="0" />
@@ -122,6 +108,11 @@
        inkscape:connector-curvature="0"
        id="path5657"
        d="M 0.9829227,18 4.4914584,22.678052 8,18 Z"
-       style="display:inline;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0348262" />
+    <path
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:0.4;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       d="M 12,1.5 C 11.169,1.5 10.5,2.169 10.5,3 V 8.845703 C 10.955564,8.629409 11.460388,8.5 12,8.5 c 0.539612,0 1.044436,0.129409 1.5,0.345703 V 3 C 13.5,2.169 12.831,1.5 12,1.5 Z m -9,9 c -0.831,0 -1.5,0.669 -1.5,1.5 0,0.831 0.669,1.5 1.5,1.5 H 8.845703 C 8.629409,13.044436 8.5,12.539612 8.5,12 c 0,-0.539612 0.129409,-1.044436 0.345703,-1.5 z m 12.154297,0 C 15.370591,10.955564 15.5,11.460388 15.5,12 c 0,0.539612 -0.129409,1.044436 -0.345703,1.5 H 21 c 0.831,0 1.5,-0.669 1.5,-1.5 0,-0.831 -0.669,-1.5 -1.5,-1.5 z M 10.5,15.154297 V 21 c 0,0.831 0.669,1.5 1.5,1.5 0.831,0 1.5,-0.669 1.5,-1.5 V 15.154297 C 13.044436,15.370591 12.539612,15.5 12,15.5 c -0.539612,0 -1.044436,-0.129409 -1.5,-0.345703 z"
+       id="path1448-3"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/curve-controlpoints-small.svg b/rtdata/images/themed/svg/curve-controlpoints-small.svg
new file mode 100644
index 000000000..fc85b8774
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-controlpoints-small.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="curve-controlpoints-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 11 3 C 9.9976127 3 9.1696615 3.7497134 9.0292969 4.7148438 C 8.5630586 5.0807339 8.1929514 5.532524 7.9179688 5.9453125 C 7.3330813 6.8233135 7.0507812 7.6835936 7.0507812 7.6835938 C 7.0507812 7.6835938 6.8323192 8.3233135 6.4179688 8.9453125 C 6.3216042 9.0899695 6.2200054 9.2226333 6.1152344 9.34375 C 5.7958935 9.1275184 5.4124369 9 5 9 C 4.5891195 9 4.207296 9.1270558 3.8886719 9.3417969 C 3.7842484 9.2209738 3.6820029 9.0895206 3.5859375 8.9453125 C 3.1715869 8.3233135 2.953125 7.6835938 2.953125 7.6835938 A 1.0001 1.0001 0 1 0 1.0566406 8.3164062 C 1.0566406 8.3164062 1.3369876 9.176686 1.921875 10.054688 C 2.1960022 10.466191 2.5651323 10.915949 3.0292969 11.28125 C 3.1680082 12.248225 3.9962917 13 5 13 C 6.0023873 13 6.8303385 12.250287 6.9707031 11.285156 C 7.4369414 10.919266 7.8070486 10.467476 8.0820312 10.054688 C 8.6669189 9.176686 8.9492186 8.3164063 8.9492188 8.3164062 C 8.9492188 8.3164062 9.1676808 7.6766865 9.5820312 7.0546875 C 9.6783959 6.9100305 9.7799946 6.7773667 9.8847656 6.65625 C 10.204106 6.8724816 10.587563 7 11 7 C 11.410881 7 11.792704 6.8729442 12.111328 6.6582031 C 12.215751 6.7790262 12.317998 6.9104794 12.414062 7.0546875 C 12.828413 7.6766865 13.046875 8.3164063 13.046875 8.3164062 A 1.0001 1.0001 0 1 0 14.943359 7.6835938 C 14.943359 7.6835938 14.663012 6.8233135 14.078125 5.9453125 C 13.803998 5.5338082 13.434868 5.0840511 12.970703 4.71875 C 12.831992 3.7517748 12.003709 3 11 3 z "
+       transform="translate(0,8)"
+       id="path1472" />
+    <circle
+       r="1.6"
+       cy="19"
+       cx="-15"
+       id="circle828"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <circle
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="circle830"
+       cx="-9"
+       cy="13"
+       r="1.6" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path832"
+       d="m -17.995428,16 c 0,0 0.999238,3 2.997714,3 C -12.999238,19 -12,16 -12,16 c 0,0 0.999238,-3 2.997714,-3 1.998476,0 2.997714,3 2.997714,3"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/curve-controlpoints.svg b/rtdata/images/themed/svg/curve-controlpoints.svg
index 7d46283f5..2d432264c 100644
--- a/rtdata/images/themed/svg/curve-controlpoints.svg
+++ b/rtdata/images/themed/svg/curve-controlpoints.svg
@@ -26,9 +26,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4.21875"
-     inkscape:cx="-50.715232"
-     inkscape:cy="-5.9935348"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -45,13 +45,14 @@
      inkscape:object-nodes="true"
      inkscape:snap-grids="true"
      inkscape:snap-bbox-midpoints="true"
-     inkscape:object-paths="false"
-     inkscape:snap-intersection-paths="false"
-     inkscape:snap-midpoints="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-midpoints="true"
      inkscape:snap-object-midpoints="false"
      inkscape:snap-center="false"
      inkscape:snap-text-baseline="false"
-     inkscape:snap-smooth-nodes="false">
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-global="true">
     <inkscape:grid
        dotted="false"
        empspacing="11"
@@ -70,7 +71,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -107,34 +108,85 @@
      inkscape:groupmode="layer"
      id="layer1">
     <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m -9.957031,7.4179688 c -0.51829,0.5176139 -0.99857,1.1345934 -1.478516,1.8085937 -0.997011,1.4001275 -1.952209,3.0390595 -2.869141,4.3261715 -0.296263,0.415872 -0.588114,0.767418 -0.873046,1.085938 0.562116,0.436199 0.974595,1.057776 1.11914,1.777344 0.481249,-0.497847 0.933245,-1.07206 1.382813,-1.703125 0.997124,-1.399682 1.95405,-3.038343 2.871093,-4.326172 C -9.502772,9.9627322 -9.205729,9.6056346 -8.916016,9.2832031 -9.469355,8.8171412 -9.85025,8.1630592 -9.957031,7.4179688 Z M -4.050781,7.5 c -0.124269,0.7238673 -0.513156,1.354204 -1.060547,1.8046875 0.705476,0.8243165 1.481866,1.9867555 2.263672,3.2050785 a 1.0001,1.0001 0 1 0 1.68164,-1.080078 C -2.085298,9.9971273 -3.008848,8.5567404 -4.050781,7.5 Z m -18.134766,3.4375 a 1.0001,1.0001 0 0 0 -0.759766,1.572266 c 0.951249,1.482374 1.90403,2.981887 2.990235,4.046875 0.111312,-0.732029 0.489432,-1.373462 1.033203,-1.833985 -0.726123,-0.827885 -1.530936,-2.029367 -2.341797,-3.292968 A 1.0001,1.0001 0 0 0 -22.185547,10.9375 Z"
        id="path15207"
-       title="sin(x)"
-       d="m 1.8955583,11.969899 c 0.9570273,1.49138 1.9140545,2.966711 2.8710817,3.897096 0.9570274,0.930383 1.9140546,1.293713 2.8710819,0.962502 0.9570272,-0.33121 1.9140545,-1.353476 2.8710811,-2.696873 0.957028,-1.343397 1.914055,-2.981472 2.871083,-4.3254501 0.957027,-1.3439776 1.914054,-2.3643579 2.871082,-2.6968738 0.957027,-0.3325159 1.914054,0.033165 2.871082,0.9625031 0.957026,0.9293371 1.914053,2.4057158 2.871081,3.8970958"
-       style="opacity:0.7;fill:none;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        inkscape:connector-curvature="0" />
     <circle
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        id="path4884"
-       cx="17"
+       cx="-7"
        cy="7"
        r="2" />
     <circle
        r="2"
        cy="17"
-       cx="7"
+       cx="-17"
        id="circle15251"
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 23,7 H 11"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m -23,6.5 v 1 H -9.949219 C -9.977282,7.3365314 -10,7.1709256 -10,7 -10,6.8290744 -9.97728,6.6634686 -9.94922,6.5 Z m 18.949219,0 C -4.022718,6.6634686 -4,6.8290744 -4,7 -4,7.1709256 -4.02272,7.3365314 -4.05078,7.5 H -1 v -1 z"
        id="path15253"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="cccscccscccc" />
     <path
-       inkscape:connector-curvature="0"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m -23,16.5 v 1 h 3.050781 C -19.977282,17.336531 -20,17.170926 -20,17 c 0,-0.170926 0.02272,-0.336531 0.05078,-0.5 z m 8.949219,0 C -14.022718,16.663469 -14,16.829074 -14,17 c 0,0.170926 -0.02272,0.336531 -0.05078,0.5 H -1 v -1 z"
        id="path15255"
-       d="M 13,17 H 1"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       sodipodi:nodetypes="cc" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccscccscccc" />
+    <path
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       d="m 10,17.5 a 3,3 0 0 1 -3,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3 3,3 0 0 1 3,3 z"
+       id="path902" />
+    <path
+       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       d="M 1 17 L 1 18 L 4.0410156 18 A 3 3 0 0 1 4.0078125 17.710938 C 3.6503369 17.500786 3.3243046 17.26425 3.0410156 17 L 1 17 z M 10.958984 17 C 10.67446 17.265403 10.347647 17.504066 9.9882812 17.714844 A 3 3 0 0 1 9.953125 18 L 23 18 L 23 17 L 10.958984 17 z "
+       id="rect940" />
+    <path
+       sodipodi:nodetypes="cscsc"
+       inkscape:connector-curvature="0"
+       id="path942"
+       d="m 42,12 c 0,0 0,5.5 5,5.5 5,0 5,-5.5 5,-5.5 0,0 0,-5.5 5,-5.5 5,0 5,5.5 5,5.5"
+       style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <circle
+       r="3"
+       cy="6.5"
+       cx="57"
+       id="circle944"
+       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <circle
+       r="3"
+       cy="17.5"
+       cx="47"
+       id="circle946"
+       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <rect
+       y="6"
+       x="41"
+       height="1"
+       width="22"
+       id="rect948"
+       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <rect
+       y="17"
+       x="41"
+       height="1"
+       width="22"
+       id="rect950"
+       style="opacity:0.3;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <path
+       style="opacity:0.5;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       d="M 1 6 L 1 7 L 13.041016 7 C 13.32554 6.7345973 13.652353 6.4959338 14.011719 6.2851562 A 3 3 0 0 1 14.046875 6 L 1 6 z M 19.958984 6 A 3 3 0 0 1 19.992188 6.2890625 C 20.349663 6.4992137 20.675695 6.7357496 20.958984 7 L 23 7 L 23 6 L 19.958984 6 z "
+       id="rect938" />
+    <path
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       d="m 20,6.5 a 3,3 0 0 1 -3,3 3,3 0 0 1 -3,-3 3,3 0 0 1 3,-3 3,3 0 0 1 3,3 z"
+       id="path900" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 14.011719 6.2851562 C 12.897364 6.9387554 12.138313 7.9043051 11.714844 8.8359375 C 10.985921 10.439568 11 12 11 12 C 11 12 10.98592 13.189568 10.464844 14.335938 C 10.222123 14.869923 9.9102466 15.37147 9.4375 15.759766 A 3 3 0 0 1 10 17.5 A 3 3 0 0 1 9.9882812 17.714844 C 11.102636 17.061245 11.861687 16.095696 12.285156 15.164062 C 13.014079 13.560434 13 12 13 12 C 13 12 13.014079 10.810432 13.535156 9.6640625 C 13.777877 9.1300763 14.089753 8.6285297 14.5625 8.2402344 A 3 3 0 0 1 14 6.5 A 3 3 0 0 1 14.011719 6.2851562 z M 19.992188 6.2890625 A 3 3 0 0 1 20 6.5 A 3 3 0 0 1 19.439453 8.2421875 C 19.910971 8.6302493 20.222492 9.1308899 20.464844 9.6640625 C 20.985921 10.810432 21 12 21 12 A 1.0001 1.0001 0 1 0 23 12 C 23 12 23.01408 10.439568 22.285156 8.8359375 C 21.86228 7.9056094 21.103957 6.9426447 19.992188 6.2890625 z M 1.984375 10.986328 A 1.0001 1.0001 0 0 0 1 12 C 1 12 0.9859205 13.560432 1.7148438 15.164062 C 2.1377201 16.094391 2.8960429 17.057355 4.0078125 17.710938 A 3 3 0 0 1 4 17.5 A 3 3 0 0 1 4.5605469 15.757812 C 4.0890292 15.369751 3.7775075 14.86911 3.5351562 14.335938 C 3.0140795 13.189566 3 12 3 12 A 1.0001 1.0001 0 0 0 1.984375 10.986328 z "
+       id="path1020" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/curve-flat-small.svg b/rtdata/images/themed/svg/curve-flat-small.svg
new file mode 100644
index 000000000..59585c64a
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-flat-small.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="curve-flat-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       d="M 2,16 H 14"
+       id="path1480"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/curve-flat.svg b/rtdata/images/themed/svg/curve-flat.svg
index 922e52c95..89888b4d1 100644
--- a/rtdata/images/themed/svg/curve-flat.svg
+++ b/rtdata/images/themed/svg/curve-flat.svg
@@ -26,9 +26,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.833334"
-     inkscape:cx="9.3583741"
-     inkscape:cy="12.034481"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -99,12 +99,10 @@
      id="layer1"
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
-    <rect
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       id="rect4159"
-       width="22"
-       height="2"
-       x="1"
-       y="11" />
+    <path
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       d="M 2,12 H 22"
+       id="path814"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/curve-linear-small.svg b/rtdata/images/themed/svg/curve-linear-small.svg
new file mode 100644
index 000000000..c2a3f7915
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-linear-small.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="curve-linear-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       d="M 2,22 14,10"
+       id="path1501"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/curve-linear.svg b/rtdata/images/themed/svg/curve-linear.svg
index b99463b43..b016121aa 100644
--- a/rtdata/images/themed/svg/curve-linear.svg
+++ b/rtdata/images/themed/svg/curve-linear.svg
@@ -26,9 +26,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.833334"
-     inkscape:cx="9.3583741"
-     inkscape:cy="12.034481"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -100,7 +100,7 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.7"
+       style="fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.7"
        d="M 22,2 2,22"
        id="path7133"
        inkscape:connector-curvature="0" />
diff --git a/rtdata/images/themed/svg/curve-nurbs-small.svg b/rtdata/images/themed/svg/curve-nurbs-small.svg
new file mode 100644
index 000000000..1ff3a1a76
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-nurbs-small.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="curve-nurbs-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4882"
+       d="M 14,10 C 7.9823832,12.506489 4.3404687,16.798 2,22"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="path2188"
+       cx="3"
+       cy="11"
+       r="1" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 12.351562 1.6484375 L 4.8730469 2.328125 C 4.9504536 2.5396006 5 2.7639372 5 3 C 5 3.1106048 4.984639 3.2181625 4.9667969 3.3242188 L 10.167969 2.8515625 C 10.858728 2.420884 11.584657 2.0194702 12.351562 1.6484375 z M 2.328125 4.8730469 L 1.6367188 12.480469 C 2.0065544 11.740561 2.4054403 11.019073 2.8378906 10.318359 L 3.3242188 4.9667969 C 3.2181625 4.984639 3.1106048 5 3 5 C 2.7639372 5 2.5396006 4.9504536 2.328125 4.8730469 z "
+       transform="translate(0,8)"
+       id="path2190" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/curve-nurbs.svg b/rtdata/images/themed/svg/curve-nurbs.svg
index 536a64319..1d7ef10ce 100644
--- a/rtdata/images/themed/svg/curve-nurbs.svg
+++ b/rtdata/images/themed/svg/curve-nurbs.svg
@@ -26,7 +26,7 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
+     inkscape:zoom="34.25"
      inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
@@ -103,7 +103,7 @@
        id="g4919"
        transform="translate(-26.00658,-0.02511662)">
       <path
-         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 48,2.0000003 C 37.949603,6.1862437 31.908963,13.311815 28,22"
          id="path4882"
          inkscape:connector-curvature="0"
diff --git a/rtdata/images/themed/svg/curve-parametric-small.svg b/rtdata/images/themed/svg/curve-parametric-small.svg
new file mode 100644
index 000000000..2334def2d
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-parametric-small.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="curve-parametric-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0"
+       id="path4882"
+       d="M 14,10 C 7.9823832,12.506489 4.3404687,16.798 2,22"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="rect1479"
+       width="6"
+       height="1"
+       x="9"
+       y="22" />
+    <rect
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="rect1481"
+       width="6"
+       height="1"
+       x="9"
+       y="20" />
+    <rect
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="rect1483"
+       width="6"
+       height="1"
+       x="9"
+       y="18" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/curve-parametric.svg b/rtdata/images/themed/svg/curve-parametric.svg
index edef7d306..88a1f0389 100644
--- a/rtdata/images/themed/svg/curve-parametric.svg
+++ b/rtdata/images/themed/svg/curve-parametric.svg
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="33.833333"
-     inkscape:cx="12"
+     inkscape:cx="7.684729"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -122,7 +122,7 @@
        x="14"
        y="15" />
     <path
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 22.029557,1.9704433 C 11.97916,6.1566867 5.9385193,13.282258 2.0295567,21.970443"
        id="path4163"
        inkscape:connector-curvature="0"
diff --git a/rtdata/images/themed/svg/curve-spline-small.svg b/rtdata/images/themed/svg/curve-spline-small.svg
new file mode 100644
index 000000000..990df0c0d
--- /dev/null
+++ b/rtdata/images/themed/svg/curve-spline-small.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="curve-spline-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 13.974609 0.99609375 A 1.0001 1.0001 0 0 0 13.615234 1.0761719 C 12.576383 1.5088798 11.609913 1.9991523 10.699219 2.5332031 C 10.215351 2.1986036 9.6304881 2 9 2 C 7.3478835 2 6 3.347884 6 5 C 6 5.3593385 6.0746158 5.699716 6.1914062 6.0195312 C 4.0081553 8.2133688 2.3491701 10.786484 1.0878906 13.589844 A 1.0001 1.0001 0 1 0 2.9121094 14.410156 C 4.0694649 11.837781 5.5342131 9.5274529 7.4570312 7.5585938 C 7.9095143 7.8327927 8.4342621 8 9 8 C 10.652116 8 12 6.652116 12 5 C 12 4.7081931 11.945536 4.4311365 11.867188 4.1640625 C 12.654836 3.7143137 13.488642 3.2970861 14.384766 2.9238281 A 1.0001 1.0001 0 0 0 13.974609 0.99609375 z "
+       transform="translate(0,8)"
+       id="path4882" />
+    <path
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -6,10 c -6.017617,2.506489 -9.659531,6.798 -12,12"
+       id="path818"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <circle
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.80000007;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="circle820"
+       cx="-11"
+       cy="13"
+       r="2.6000001" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/curve-spline.svg b/rtdata/images/themed/svg/curve-spline.svg
index 6585a460e..f0a28a1a9 100644
--- a/rtdata/images/themed/svg/curve-spline.svg
+++ b/rtdata/images/themed/svg/curve-spline.svg
@@ -26,7 +26,7 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
+     inkscape:zoom="34.25"
      inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
@@ -41,12 +41,15 @@
      inkscape:pagecheckerboard="false"
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
-     inkscape:snap-others="false"
-     inkscape:object-nodes="false"
+     inkscape:snap-others="true"
+     inkscape:object-nodes="true"
      inkscape:snap-grids="false"
-     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-bbox-midpoints="true"
      inkscape:snap-intersection-paths="false"
-     inkscape:object-paths="false">
+     inkscape:object-paths="true"
+     inkscape:snap-smooth-nodes="false"
+     inkscape:snap-midpoints="false"
+     inkscape:snap-object-midpoints="true">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -65,7 +68,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -102,16 +105,20 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       sodipodi:nodetypes="cc"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 21.966797 0.97070312 A 1.0001 1.0001 0 0 0 21.609375 1.0527344 C 19.066954 2.1117166 16.773453 3.3600206 14.697266 4.7714844 C 14.215622 4.4413072 13.635985 4.2460938 13.013672 4.2460938 C 11.368662 4.2460938 10.013672 5.6010841 10.013672 7.2460938 C 10.013672 7.6379109 10.095022 8.0109492 10.234375 8.3554688 C 6.2631295 12.104952 3.3150123 16.601359 1.0820312 21.564453 A 1.0001 1.0001 0 1 0 2.90625 22.384766 C 5.0484798 17.623378 7.8143858 13.376143 11.546875 9.8417969 C 11.983434 10.091107 12.479475 10.246094 13.013672 10.246094 C 14.658681 10.246094 16.013672 8.8911034 16.013672 7.2460938 C 16.013672 6.9443551 15.953746 6.6584631 15.869141 6.3828125 C 17.820874 5.0663897 19.977813 3.8977397 22.376953 2.8984375 A 1.0001 1.0001 0 0 0 21.966797 0.97070312 z "
+       id="path4882" />
+    <path
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m -2.00658,1.9748837 c -10.050397,4.1862434 -16.091037,11.3118143 -20,19.9999993"
+       id="path815"
        inkscape:connector-curvature="0"
-       id="path4882"
-       d="M 21.99342,1.9748837 C 11.943023,6.1611271 5.902383,13.286698 1.99342,21.974883"
-       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       sodipodi:nodetypes="cc" />
     <circle
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       id="path4884"
-       cx="6.5581126"
-       cy="14.027818"
-       r="2" />
+       r="2"
+       cy="7.2466049"
+       cx="-10.986821"
+       id="circle817"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/distortion-auto-small.svg b/rtdata/images/themed/svg/distortion-auto-small.svg
new file mode 100644
index 000000000..6a8ac0a03
--- /dev/null
+++ b/rtdata/images/themed/svg/distortion-auto-small.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="distortion-auto-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       id="path1207"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 1.4648438 2 A 0.50005 0.50005 0 0 0 1.0605469 2.7382812 C 1.7855476 4.0821021 2.2401998 5.4168812 2.4199219 6.7539062 L 3.3691406 7.3984375 C 3.3517325 7.0972624 3.3261672 6.7966526 3.2832031 6.4960938 C 4.1451658 6.6228297 4.8005195 6.6504813 5.5136719 6.7226562 C 5.5511757 7.3450003 5.5452904 8.1550837 5.4980469 8.8417969 L 7.2636719 10.037109 C 7.5172118 10.007091 7.7705212 9.9800391 7.9804688 9.9804688 C 8.4406081 9.9814098 9.0961971 10.105542 9.578125 10.138672 C 9.642009 10.643734 9.65881 11.084646 9.7675781 11.707031 C 9.0985287 11.626933 8.4311692 11.596927 7.765625 11.607422 A 1.0001 1.0001 0 0 1 7.5039062 11.865234 L 6.4179688 12.589844 C 9.0079035 12.283983 11.619457 12.717729 14.291016 13.953125 A 0.50005 0.50005 0 0 0 14.9375 13.257812 C 12.914817 9.6135385 13.09896 6.189511 14.941406 2.734375 A 0.50005 0.50005 0 0 0 14.291016 2.046875 C 10.072838 3.993726 5.9271618 3.993726 1.7089844 2.046875 A 0.50005 0.50005 0 0 0 1.515625 2 A 0.50005 0.50005 0 0 0 1.4648438 2 z M 3.3691406 7.3984375 C 3.3834522 7.646041 3.3810541 7.894472 3.3789062 8.1425781 C 3.3818473 7.8944257 3.3834573 7.6461277 3.3691406 7.3984375 z M 2.4199219 6.7539062 C 2.4646549 7.0866933 2.4863602 7.4185862 2.4960938 7.7519531 C 2.4860947 7.4191265 2.464587 7.0861885 2.4199219 6.7539062 z M 2.3710938 3.3261719 C 3.3283846 3.6958169 4.2865235 3.9992695 5.2480469 4.1796875 C 5.3616719 4.8264315 5.3478309 5.2075886 5.4082031 5.7128906 C 4.6769083 5.6333376 4.0613378 5.6169696 3.1425781 5.4785156 C 2.9710126 4.7554796 2.6846397 4.0403569 2.3710938 3.3261719 z M 13.628906 3.3261719 C 13.308715 4.0596719 13.029462 4.7960518 12.855469 5.5429688 C 11.919921 5.6834678 11.299685 5.6797579 10.558594 5.7480469 C 10.625614 5.2362169 10.626644 4.8389855 10.742188 4.1796875 C 11.706931 3.9993015 12.668418 3.6970509 13.628906 3.3261719 z M 6.2597656 4.2949219 C 7.4156215 4.4319599 8.5706967 4.432786 9.7265625 4.296875 C 9.6245487 4.900954 9.6091682 5.3446878 9.5507812 5.8398438 C 8.6013765 5.8916137 7.3599926 5.8904394 6.4140625 5.8183594 C 6.3622955 5.3259274 6.3599345 4.8954359 6.2597656 4.2949219 z M 12.708984 6.5566406 C 12.575175 7.5129706 12.574561 8.4749175 12.701172 9.4453125 C 11.828248 9.3171325 11.178721 9.2965136 10.462891 9.2285156 C 10.397301 8.4964236 10.384403 7.4699734 10.439453 6.7558594 C 11.164709 6.6952994 11.826549 6.6840586 12.708984 6.5566406 z M 6.515625 6.8261719 C 7.3988855 6.8868719 8.549521 6.8873031 9.4375 6.8457031 C 9.39426 7.5130501 9.4048063 8.4501564 9.4570312 9.1308594 C 8.5557139 9.0762794 7.3846785 9.0768762 6.4863281 9.1289062 C 6.5504751 8.4507423 6.548227 7.5095219 6.515625 6.8261719 z M 2.4980469 8.171875 C 2.4928762 8.5099422 2.4773437 8.8482539 2.4355469 9.1875 C 2.4768085 8.8486538 2.493227 8.5095617 2.4980469 8.171875 z M 2.3867188 9.4824219 C 2.3384644 9.7946911 2.2770092 10.108172 2.1972656 10.421875 C 2.2766344 10.108025 2.3388782 9.7948369 2.3867188 9.4824219 z M 10.587891 10.238281 C 11.312022 10.313221 11.911724 10.32271 12.826172 10.460938 C 12.993904 11.196559 13.297189 11.934468 13.626953 12.673828 C 12.678558 12.307455 11.732132 11.999535 10.787109 11.820312 C 10.665129 11.145843 10.660447 10.758776 10.587891 10.238281 z M 2.1328125 10.677734 C 2.0253573 11.059724 1.8930949 11.443357 1.7382812 11.828125 C 1.892857 11.443144 2.0257947 11.059915 2.1328125 10.677734 z M 7.7636719 11.607422 C 7.2214496 11.616044 6.6804397 11.64996 6.140625 11.71875 C 6.6804421 11.649959 7.2214472 11.616032 7.7636719 11.607422 z M 1.6464844 12.046875 C 1.4752404 12.449645 1.2864123 12.853194 1.0625 13.259766 C 1.2864631 12.853102 1.4755216 12.44969 1.6464844 12.046875 z M 6.1464844 12.632812 C 5.7626054 12.685803 5.3792017 12.754663 4.9960938 12.839844 C 5.3794134 12.754407 5.7624075 12.685881 6.1464844 12.632812 z M 4.5410156 12.953125 C 4.2056652 13.038834 3.8701852 13.135966 3.5351562 13.246094 C 3.8700723 13.13581 4.2057783 13.039011 4.5410156 12.953125 z M 3.1132812 13.386719 C 2.6451188 13.554906 2.1770797 13.73976 1.7089844 13.955078 C 2.1771153 13.739744 2.6450595 13.555153 3.1132812 13.386719 z "
+       transform="translate(0,8)"
+       id="path108" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       d="m -17.188754,17.975283 c 4.307652,-0.659705 6.017459,-0.654403 10.377016,0.0192 m -10.402955,-4.050537 c 4.307652,0.659705 6.060977,0.7413 10.420534,0.0677 m -2.922632,-2.196722 c -0.64221,3.591664 -0.643552,4.629432 0.04721,8.376771 m -4.620178,-8.377834 c 0.666666,3.666667 0.5279,4.730262 -0.138767,8.396929 M -18.5,10.5 c 4.333333,2 8.666667,2 13,0 -1.90259,3.567911 -2.095481,7.224565 0,11 -4.413626,-2.041021 -8.742142,-1.958561 -13,0 2.048632,-3.719835 1.950877,-7.383964 0,-11 z"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       id="path838"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.3;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 2.4199219 6.7539062 C 2.7080154 8.8971508 2.2808894 11.04746 1.0625 13.259766 A 0.50005 0.50005 0 0 0 1.7089844 13.955078 C 3.276596 13.233997 4.8432265 12.775814 6.4179688 12.589844 L 7.5039062 11.865234 A 1.0001 1.0001 0 0 0 7.765625 11.607422 C 7.222748 11.615982 6.6810887 11.649877 6.140625 11.71875 C 6.2505764 11.097816 6.2806286 10.643647 6.3515625 10.136719 C 6.6257689 10.118408 6.9465343 10.074658 7.2636719 10.037109 L 5.4980469 8.8417969 C 5.4895563 8.9652133 5.4905156 9.1110987 5.4785156 9.2226562 C 4.7794414 9.2877362 4.1454062 9.3048964 3.2988281 9.4277344 C 3.3876834 8.7494679 3.4081315 8.073014 3.3691406 7.3984375 L 2.4199219 6.7539062 z M 5.3398438 10.234375 C 5.2602187 10.759119 5.2418128 11.161186 5.1191406 11.839844 C 4.1976905 12.021265 3.2839357 12.318901 2.3730469 12.669922 C 2.7027209 11.926919 2.9989976 11.185131 3.1679688 10.441406 C 4.0512207 10.309213 4.6348775 10.306375 5.3398438 10.234375 z "
+       transform="translate(0,8)"
+       id="path844" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="Symbol-4-6-8"
+       d="M 1,17.238584 V 15 L 6.950059,19.034097 1,23 v -2.198912 z"
+       style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/distortion-auto.svg b/rtdata/images/themed/svg/distortion-auto.svg
index 23524f46f..8cfadb130 100644
--- a/rtdata/images/themed/svg/distortion-auto.svg
+++ b/rtdata/images/themed/svg/distortion-auto.svg
@@ -26,12 +26,12 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.109375"
-     inkscape:cx="-49.166564"
-     inkscape:cy="55.585713"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      inkscape:window-width="1920"
      inkscape:window-height="1019"
      inkscape:window-x="0"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -99,20 +99,20 @@
      id="layer1"
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
-    <g
-       id="g2962"
-       transform="matrix(0.03657136,0,0,0.03657136,10.902008,7.6984958)">
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.72779661;marker:none;enable-background:accumulate"
-         d="M 2.0253906 4.5 L 2.0039062 4.5078125 C 1.7275595 4.5520386 1.4823265 4.5174045 1.3300781 4.7480469 C 1.1778297 4.9786896 1.1491384 5.4819005 1.2207031 5.7734375 C 1.3007051 6.1439583 1.5647812 6.4387026 1.6582031 6.8066406 C 2.0242615 7.7226843 2.3447878 8.675259 2.5664062 9.6445312 L 4.7226562 11.105469 C 4.7127443 10.979347 4.7137004 10.85224 4.6992188 10.726562 L 7.3613281 10.726562 L 7.3613281 12.894531 L 10.332031 14.908203 L 14.513672 14.908203 L 14.513672 16.015625 C 13.536066 15.925488 12.553836 15.896574 11.572266 15.914062 A 2.0002 2.0002 0 0 1 11.771484 17.818359 C 12.867847 17.802111 13.964346 17.850032 15.058594 17.992188 C 17.493934 18.265205 19.88987 18.823006 22.244141 19.5 C 22.376737 19.290527 22.361158 19.365427 22.664062 19.216797 C 22.966968 19.068167 22.909251 18.108437 22.664062 17.791016 C 22.141935 16.680117 21.735535 15.509584 21.435547 14.318359 C 21.07312 12.798076 21.022228 11.179768 21.412109 9.6621094 C 21.711152 8.3126207 22.22599 7.0219534 22.808594 5.7734375 C 22.885152 5.4767454 22.817923 4.8440138 22.638672 4.71875 C 22.042147 4.392499 21.386851 4.7077438 20.826172 4.7871094 C 17.0036 5.7916416 13.01082 6.4173007 9.0566406 5.9355469 C 6.6753102 5.6758386 4.3334795 5.1345723 2.0253906 4.5 z M 20.257812 6.8925781 L 20.246094 6.9277344 L 20.244141 6.9316406 C 20.018271 7.5550006 19.810448 8.1847416 19.65625 8.8300781 L 16.408203 8.8300781 L 16.408203 7.640625 C 17.703306 7.456482 18.98653 7.1945307 20.257812 6.8925781 z M 3.7421875 6.9101562 L 3.9101562 6.9511719 C 5.0503877 7.2230718 6.2018615 7.4481996 7.3613281 7.6230469 L 7.3613281 8.8300781 L 4.3398438 8.8300781 C 4.1824206 8.1778523 3.9718529 7.54003 3.7421875 6.9101562 z M 9.2597656 7.8710938 C 9.2894799 7.8741413 9.3198951 7.8778116 9.3496094 7.8808594 C 11.065307 8.0478887 12.797699 8.0493486 14.513672 7.8847656 L 14.513672 8.8300781 L 9.2558594 8.8300781 C 9.2559564 8.5138199 9.2569934 8.1939504 9.2597656 7.8710938 z M 9.265625 10.726562 L 14.513672 10.726562 L 14.513672 13.021484 C 13.910384 13.05192 10.362163 13.00617 9.2832031 13.085938 C 9.2800908 12.280242 9.2722826 11.500472 9.265625 10.726562 z M 16.408203 10.726562 L 19.298828 10.726562 C 19.205194 11.483349 19.207047 12.251535 19.283203 13.009766 L 16.408203 13.009766 L 16.408203 10.726562 z M 16.408203 14.908203 L 19.626953 14.908203 C 19.796041 15.621138 20.019842 16.318407 20.271484 17.005859 C 18.995795 16.69987 17.708065 16.439366 16.408203 16.257812 L 16.408203 14.908203 z "
-         transform="matrix(27.343801,0,0,27.343801,-298.10234,-210.50614)"
-         id="path4473" />
-    </g>
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.3;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.72779667;marker:none;enable-background:accumulate"
+       d="M 2.7324219 10.466797 C 2.8664433 11.324961 2.9046109 12.195226 2.7832031 13.068359 C 2.5578634 14.86295 1.8840469 16.566826 1.1601562 18.212891 C 1.1088982 18.503715 1.0932627 19.01928 1.3671875 19.214844 C 1.9987238 19.571255 2.7393686 19.160882 3.2890625 19.087891 C 5.8393725 18.435152 8.4631567 17.946848 11.099609 17.839844 A 1.414355 1.414355 0 0 0 10.792969 15.9375 C 10.282483 15.961257 9.7719917 15.994499 9.2636719 16.046875 C 9.2712719 15.657299 9.2759109 15.279015 9.2792969 14.908203 L 9.2832031 14.908203 L 6.4746094 13.003906 C 5.8871228 13.008733 5.3000311 13.020719 4.7128906 12.996094 C 4.7523674 12.61409 4.7704998 12.229735 4.7675781 11.845703 L 2.7324219 10.466797 z M 4.3671875 14.908203 L 7.3613281 14.908203 L 7.3613281 16.300781 C 6.1367495 16.49137 4.9201355 16.73163 3.7167969 17.023438 C 3.973593 16.331103 4.1940008 15.626652 4.3671875 14.908203 z "
+       id="path4473" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path986"
+       d="M 2.0253906,4.5 2.0039056,4.5078 C 1.7275596,4.55203 1.4823264,4.5174 1.330078,4.748037 1.1778296,4.97868 1.1491382,5.48189 1.2207033,5.773427 c 0.080002,0.370521 0.344078,0.665265 0.4374999,1.033203 0.4693901,1.174627 0.8781079,2.404424 1.0742186,3.660157 l 2.0351563,1.378906 c -0.00284,-0.373637 -0.025588,-0.747956 -0.068359,-1.119141 H 7.361328 v 2.28125 c -0.295641,-0.0028 -0.591022,-0.0063 -0.886719,-0.0039 l 2.808594,1.904297 h 5.230469 v 1.107422 c -1.236271,-0.113987 -2.48056,-0.135837 -3.720703,-0.07813 a 1.414355,1.414355 0 0 1 0.30664,1.902344 c 1.319527,-0.05355 2.641206,-0.01885 3.958985,0.152344 2.43534,0.273017 4.831276,0.830818 7.185547,1.507812 0.132596,-0.209473 0.117017,-0.134573 0.419921,-0.283203 0.302906,-0.14863 0.245189,-1.10836 0,-1.425781 C 22.141935,16.680108 21.735535,15.509575 21.435547,14.31835 21.07312,12.798067 21.022228,11.179759 21.412107,9.6621 21.71115,8.312612 22.225988,7.021944 22.808592,5.773428 22.885152,5.476736 22.817892,4.844005 22.63867,4.718741 22.042145,4.39249 21.386849,4.707731 20.82617,4.787101 17.0036,5.791632 13.01082,6.417292 9.056641,5.935538 6.67531,5.675839 4.3334793,5.134572 2.0253906,4.5 Z m 18.2324214,2.392578 -0.01172,0.03516 -0.002,0.0039 c -0.22587,0.62336 -0.433693,1.253101 -0.587891,1.898437 H 16.408203 V 7.640619 C 17.703306,7.456476 18.98653,7.194525 20.257812,6.892572 Z M 3.7421874,6.910158 3.9101563,6.951178 C 5.0503877,7.223078 6.201861,7.448206 7.361328,7.623053 V 8.830084 H 4.3398438 C 4.1824206,8.177852 3.9718529,7.54003 3.7421874,6.910156 Z M 9.259766,7.871096 c 0.02971,0.0031 0.06013,0.0067 0.08984,0.0098 1.715698,0.167029 3.44809,0.168489 5.164063,0.0039 V 8.8301 H 9.255856 c 9.7e-5,-0.316258 0.0011,-0.636128 0.0039,-0.958984 z m 0.0059,2.855468 h 5.248047 v 2.294922 c -0.603288,0.03044 -4.151509,-0.01531 -5.230469,0.06445 -0.0031,-0.805696 -0.01092,-1.585466 -0.01758,-2.359376 z m 7.142578,0 h 2.890625 c -0.09363,0.756787 -0.09178,1.524973 -0.01563,2.283204 h -2.875 z m 0,4.181641 h 3.21875 c 0.169088,0.712935 0.392889,1.410204 0.644531,2.097656 -1.275689,-0.305989 -2.563419,-0.566493 -3.863281,-0.748047 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.72779661;marker:none;enable-background:accumulate" />
     <path
        sodipodi:nodetypes="cccccc"
        inkscape:connector-curvature="0"
        id="Symbol-4-6-8"
        d="M 1,14.357876 V 11 L 9.925089,17.051146 1,23 v -3.298368 z"
-       style="display:inline;opacity:0.7;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
+       style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/distortion-barrel-small.svg b/rtdata/images/themed/svg/distortion-barrel-small.svg
new file mode 100644
index 000000000..b769bd0aa
--- /dev/null
+++ b/rtdata/images/themed/svg/distortion-barrel-small.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="distortion-barrel-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       id="path1207"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path936"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 1.5,17.5 c 4.3333333,0.666667 8.666667,0.666667 13,0 m -13,-3 c 4.3333333,-0.666667 8.666667,-0.666667 13,0 m -4,-4 c 0.650292,3.616036 0.682877,7.280165 0,11 m -5,-11 c -0.6584443,3.641034 -0.6748477,7.307062 0,11 M 2,11.5 c 4.2825076,-1.305586 7.61369,-1.360845 12,0 0.666667,3 0.666667,6 0,9 -4.413583,1.374278 -7.7421039,1.291863 -12,0 -0.676645,-3.026341 -0.6566267,-6.025562 0,-9 z"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/distortion-pincushion-small.svg b/rtdata/images/themed/svg/distortion-pincushion-small.svg
new file mode 100644
index 000000000..8c26277d2
--- /dev/null
+++ b/rtdata/images/themed/svg/distortion-pincushion-small.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="distortion-pincushion-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="false"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-text-baseline="true"
+     inkscape:snap-center="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       id="path1207"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path108"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="M 2.8112464,17.975283 C 7.1188978,17.315578 8.8287055,17.32088 13.188262,17.99448 M 2.7853074,13.943943 c 4.3076514,0.659705 6.0609769,0.7413 10.4205336,0.0677 m -2.922632,-2.196722 c -0.6422099,3.591664 -0.6435523,4.629432 0.04721,8.376771 M 5.7102407,11.813858 c 0.6666667,3.666667 0.5279002,4.730262 -0.1387665,8.396929 M 1.5,10.5 c 4.3333333,2 8.666667,2 13,0 -1.90259,3.567911 -2.095481,7.224565 0,11 -4.413626,-2.041021 -8.7421418,-1.958561 -13,0 2.0486318,-3.719835 1.9508767,-7.383964 0,-11 z"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/expander-closed.svg b/rtdata/images/themed/svg/expander-closed-small.svg
similarity index 100%
rename from rtdata/images/themed/svg/expander-closed.svg
rename to rtdata/images/themed/svg/expander-closed-small.svg
diff --git a/rtdata/images/themed/svg/expander-open.svg b/rtdata/images/themed/svg/expander-open-small.svg
similarity index 100%
rename from rtdata/images/themed/svg/expander-open.svg
rename to rtdata/images/themed/svg/expander-open-small.svg
diff --git a/rtdata/images/themed/svg/flip-horizontal.svg b/rtdata/images/themed/svg/flip-horizontal.svg
index e07ffcde2..67465657f 100644
--- a/rtdata/images/themed/svg/flip-horizontal.svg
+++ b/rtdata/images/themed/svg/flip-horizontal.svg
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="34.25"
-     inkscape:cx="12"
+     inkscape:cx="7.7372263"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -135,7 +135,7 @@
        id="path2866"
        inkscape:connector-curvature="0" />
     <path
-       style="opacity:0.9;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="M 19 10 A 7 7 0 0 1 19 10 L 19 10 L 19 10 A 7 7 0 0 1 12 17 A 7 7 0 0 1 5 10 "
        id="path859" />
     <path
diff --git a/rtdata/images/themed/svg/flip-vertical.svg b/rtdata/images/themed/svg/flip-vertical.svg
index f50886670..39771286a 100644
--- a/rtdata/images/themed/svg/flip-vertical.svg
+++ b/rtdata/images/themed/svg/flip-vertical.svg
@@ -27,7 +27,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="34.25"
-     inkscape:cx="12"
+     inkscape:cx="7.7372263"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -136,7 +136,7 @@
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
-       style="opacity:0.9;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
        d="m 10,5 v 0 0 a 7,7 0 0 1 7,7 7,7 0 0 1 -7,7"
        id="path859" />
     <path
diff --git a/rtdata/images/themed/svg/gears-pause.svg b/rtdata/images/themed/svg/gears-pause.svg
index a8fad5743..b472a82f4 100644
--- a/rtdata/images/themed/svg/gears-pause.svg
+++ b/rtdata/images/themed/svg/gears-pause.svg
@@ -37,7 +37,7 @@
      inkscape:current-layer="SVGRoot"
      inkscape:document-units="px"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="7.684729"
      inkscape:zoom="33.833333"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
@@ -64,7 +64,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -130,7 +130,7 @@
        inkscape:connector-curvature="0" />
   </g>
   <rect
-     style="opacity:0.7;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83333331;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     style="opacity:1;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83333331;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
      id="rect862"
      width="3.0000002"
      height="9"
@@ -138,7 +138,7 @@
      y="13"
      ry="0" />
   <rect
-     style="opacity:0.7;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83333331;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+     style="opacity:1;fill:#c00000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.83333331;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
      id="rect864"
      width="2.9999993"
      height="9"
diff --git a/rtdata/images/themed/svg/gears-play.svg b/rtdata/images/themed/svg/gears-play.svg
index f2dd772c0..83c23557d 100644
--- a/rtdata/images/themed/svg/gears-play.svg
+++ b/rtdata/images/themed/svg/gears-play.svg
@@ -37,7 +37,7 @@
      inkscape:current-layer="SVGRoot"
      inkscape:document-units="px"
      inkscape:cy="12"
-     inkscape:cx="12"
+     inkscape:cx="7.684729"
      inkscape:zoom="33.833333"
      inkscape:pageshadow="2"
      inkscape:pageopacity="0"
@@ -71,7 +71,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -156,5 +156,5 @@
      inkscape:connector-curvature="0"
      id="Symbol-4-6-8"
      d="M 14,14.357876 V 11 L 22.925089,17.051146 14,23 v -3.298368 z"
-     style="display:inline;opacity:0.7;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
+     style="display:inline;opacity:1;fill:#008000;fill-opacity:1;stroke:none;stroke-width:0.04999533" />
 </svg>
diff --git a/rtdata/images/themed/svg/hand-closed.svg b/rtdata/images/themed/svg/hand-closed.svg
index 7a1990187..11117e1f1 100644
--- a/rtdata/images/themed/svg/hand-closed.svg
+++ b/rtdata/images/themed/svg/hand-closed.svg
@@ -69,7 +69,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -111,10 +111,32 @@
        id="rect2901"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="scccsccscscccsccsscccscccs" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00010002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 11.628906,1.5195312 c -0.680589,-0.05363 -1.235328,0.3845764 -1.466797,0.8925782 -0.234228,0.5140603 -0.258015,1.0988213 -0.07617,1.6171875 l -0.02148,-0.080078 C 10.19916,4.7208693 10.417435,5.448634 10.574219,6.1503906 10.122152,5.3406634 9.600653,4.5737108 9.007812,3.8730469 8.620822,3.2968214 7.938652,3.0851463 7.337891,3.1894531 6.752936,3.2910156 6.199059,3.7485697 6.068359,4.4316406 5.884465,4.9785341 5.951234,5.5225273 6.130859,5.96875 6.308848,6.4109055 6.567718,6.7822033 6.789062,7.1074219 7.443042,8.4263964 8.262774,9.5914438 8.490234,10.865234 8.557774,11.243729 8.492034,11.715203 8.3125,12.109375 8.150006,12.466104 7.888941,12.711381 7.609375,12.857422 7.319226,12.843636 7.066506,12.734874 6.84375,12.466797 6.596093,12.168753 6.413567,11.731498 6.353516,11.365234 6.295331,10.808329 6.067331,10.20483 5.638672,9.75 5.419888,9.5178583 5.129647,9.3211976 4.771484,9.2695312 4.413322,9.2178651 4.023049,9.3376648 3.693359,9.59375 h -0.002 V 9.5957 c -0.659619,0.518354 -0.930321,1.288752 -0.939453,2.023438 -0.009,0.723544 0.213387,1.431639 0.537109,2.021484 0.427607,1.018883 1.019899,1.996569 1.902344,2.753906 L 5.167969,16.375 c 1.26268,1.225532 2.184735,2.901177 2.078125,4.617188 v 0.01562 0.01563 c 0,0.794629 0.565532,1.392396 1.205078,1.785156 0.636492,0.390885 1.394295,0.618141 2.089844,0.638672 1.583921,0.125137 3.209634,0.02066 4.761718,-0.382813 l 0.01172,-0.0039 0.01367,-0.0039 c 0.435984,-0.138315 0.891906,-0.369194 1.261719,-0.726563 0.369812,-0.357369 0.652922,-0.879195 0.613281,-1.482422 v 0.07422 c 0.19266,-2.348546 0.778157,-4.65564 1.578125,-6.892578 l 0.0039,-0.0098 0.0039,-0.01172 C 19.437,11.893007 20.138321,9.7469155 20.482409,7.4960718 v -0.00195 C 20.605788,6.6697241 20.10458,5.9629266 19.464844,5.6425781 19.144976,5.4824039 18.761852,5.4099172 18.384766,5.5273438 18.023743,5.639768 17.724197,5.9534058 17.544922,6.3554688 17.519874,6.3948976 17.530262,6.4291146 17.509766,6.46875 17.439708,5.9462964 17.419267,5.474277 17.199219,4.9296875 17.104642,4.3832547 16.872741,3.8366828 16.474609,3.4121094 16.067373,2.9778264 15.455708,2.6783428 14.765625,2.7578125 l -0.0098,0.00195 -0.01172,0.00195 c -0.401204,0.063208 -0.748194,0.2916871 -0.929688,0.5917968 -0.06753,0.1116621 -0.04862,0.2281982 -0.08203,0.34375 C 13.572119,3.2711683 13.5166,2.8281379 13.246059,2.4257749 l -0.03125,-0.046875 -0.04102,-0.037109 C 12.836467,2.0229781 12.361452,1.5354152 11.628906,1.5195312 Z m -0.02734,0.4921876 c 0.515691,0.00248 0.880163,0.3641842 1.228516,0.6933593 1.055466,1.5697407 0.994821,3.54262 1.572266,5.2832031 0.238005,-0.063414 -0.11357,-1.6076762 -0.16211,-2.2226562 -0.01599,-0.7959087 -0.571382,-2.3280511 0.582032,-2.5097656 1.05084,-0.1210144 1.748564,0.8570145 1.898437,1.7890625 0.442874,1.0341573 0.370792,2.1781926 0.650391,3.25 0.388388,-0.097492 0.279818,-1.2650893 0.599609,-1.7148438 0.527032,-1.2962985 2.187352,-0.2948468 2.017578,0.8398438 -0.335878,2.1971372 -1.028082,4.3210651 -1.677734,6.4414061 -0.810532,2.266479 -1.410182,4.615155 -1.607422,7.019531 0.05751,0.875155 -0.779107,1.461842 -1.527344,1.699219 -1.495741,0.388826 -3.072241,0.494208 -4.611328,0.371094 C 9.384003,22.919712 7.746098,22.110017 7.746098,21.023438 7.864795,19.112875 6.853688,17.314319 5.515629,16.015625 4.703216,15.318391 4.142373,14.406715 3.734379,13.427734 3.149165,12.378967 2.945396,10.817029 4,9.9882812 4.997505,9.2134725 5.779533,10.557975 5.861328,11.447266 6.01012,12.354779 6.687355,13.458382 7.724609,13.398438 8.653521,13.01865 9.159259,11.768303 8.982422,10.777344 8.728108,9.353167 7.860693,8.1459602 7.230469,6.8710938 6.773205,6.1973061 6.222793,5.4143585 6.537109,4.5566406 6.686301,3.556509 8.066522,3.3600285 8.595703,4.1542969 c 1.100918,1.291917 1.994057,2.7998627 2.515625,4.4199219 0.47778,-1.581579 -0.284312,-3.1620798 -0.554687,-4.7109376 -0.26492,-0.7551926 0.07664,-1.9445014 1.044921,-1.8515624 z"
+       id="path840"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path849"
+       d="m 11.602196,26.011121 c -0.968279,-0.09294 -1.309807,1.097311 -1.044887,1.852503 0.270375,1.548858 1.032003,3.129502 0.554223,4.711081 C 10.589964,30.954646 9.696549,29.446787 8.5956314,28.15487 8.0664503,27.360601 6.6853476,27.556354 6.5361563,28.556485 c -0.314316,0.857718 0.2376356,1.64067 0.6948996,2.314457 0.6302245,1.274867 1.4962662,2.482414 1.7505805,3.906591 0.1768374,0.990959 -0.3289732,2.241539 -1.2578849,2.621327 -1.0372547,0.05994 -1.7140144,-1.044398 -1.8628061,-1.951911 -0.081795,-0.889291 -0.86326,-2.233825 -1.8607647,-1.459016 -1.0546044,0.828747 -0.8509919,2.390946 -0.2657818,3.439713 0.4079941,0.978981 0.969746,1.890696 1.7821593,2.58793 1.3380594,1.298694 2.3477705,3.097517 2.2290734,5.00808 0,1.086579 1.638441,1.89624 2.8188954,1.927695 1.539087,0.123114 3.116222,0.01728 4.611963,-0.371546 0.748237,-0.237377 1.585081,-0.823539 1.52757,-1.698694 0.19724,-2.404376 0.796669,-4.753262 1.607201,-7.019741 0.649652,-2.120341 1.340729,-4.243896 1.676607,-6.441033 0.169774,-1.134691 -1.489651,-2.135902 -2.016683,-0.839604 -0.319791,0.449755 -0.21195,1.616727 -0.600338,1.714219 -0.279599,-1.071807 -0.20687,-2.216252 -0.649744,-3.25041 -0.149873,-0.932048 -0.84734,-1.91055 -1.89818,-1.789536 -1.153414,0.181715 -0.597997,1.714518 -0.582003,2.510427 0.04854,0.61498 0.399825,2.15953 0.16182,2.222943 -0.577445,-1.740583 -0.516942,-3.713714 -1.572408,-5.283454 -0.348353,-0.329176 -0.712446,-0.691324 -1.228136,-0.693801 z"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
     <path
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
-       d="m 11.602196,2.0111213 c -0.968279,-0.092939 -1.309807,1.0973105 -1.044887,1.8525032 0.270375,1.5488577 1.032003,3.1295019 0.554223,4.7110809 C 10.589964,6.9546462 9.696549,5.4467866 8.5956314,4.1548696 8.0664503,3.3606012 6.6853476,3.5563539 6.5361563,4.5564855 6.2218403,5.4142034 6.7737919,6.1971549 7.2310559,6.8709425 7.8612804,8.145809 8.7273221,9.3533563 8.9816364,10.777533 9.1584738,11.768492 8.6526632,13.019072 7.7237515,13.39886 6.6864968,13.458805 6.0097371,12.354462 5.8609454,11.446949 5.7791508,10.557658 4.9976854,9.213124 4.0001807,9.9879327 2.9455763,10.81668 3.1491888,12.378879 3.7343989,13.427646 c 0.4079941,0.978981 0.969746,1.890696 1.7821593,2.58793 1.3380594,1.298694 2.3477705,3.097517 2.2290734,5.00808 0,1.086579 1.638441,1.89624 2.8188954,1.927695 1.539087,0.123114 3.116222,0.01728 4.611963,-0.371546 0.748237,-0.237377 1.585081,-0.823539 1.52757,-1.698694 0.19724,-2.404376 0.796669,-4.753262 1.607201,-7.019741 0.649652,-2.120341 1.340729,-4.2438958 1.676607,-6.441033 0.169774,-1.1346906 -1.489651,-2.1359021 -2.016683,-0.8396036 -0.319791,0.4497545 -0.21195,1.6167263 -0.600338,1.7142188 -0.279599,-1.0718074 -0.20687,-2.2162524 -0.649744,-3.2504097 -0.149873,-0.932048 -0.84734,-1.9105504 -1.89818,-1.789536 -1.153414,0.1817145 -0.597997,1.714518 -0.582003,2.5104267 0.04854,0.61498 0.399825,2.1595296 0.16182,2.2229431 C 13.825295,6.2477932 13.885798,4.2746623 12.830332,2.7049216 12.481979,2.3757465 12.117886,2.013598 11.602196,2.0111213 Z"
-       id="path2954"
+       d="m 11.602196,2.011121 c -0.968279,-0.09294 -1.309807,1.097311 -1.044887,1.852503 0.270375,1.548858 1.032003,3.129502 0.554223,4.711081 C 10.589964,6.954646 9.696549,5.446787 8.5956314,4.15487 8.0664503,3.360601 6.6853476,3.556354 6.5361563,4.556485 6.2218403,5.414203 6.7737919,6.197155 7.2310559,6.870942 7.8612804,8.145809 8.7273221,9.353356 8.9816364,10.777533 9.1584738,11.768492 8.6526632,13.019072 7.7237515,13.39886 6.6864968,13.4588 6.0097371,12.354462 5.8609454,11.446949 5.7791504,10.557658 4.9976854,9.213124 4.0001807,9.987933 2.9455763,10.81668 3.1491888,12.378879 3.7343989,13.427646 c 0.4079941,0.978981 0.969746,1.890696 1.7821593,2.58793 1.3380594,1.298694 2.3477705,3.097517 2.2290734,5.00808 0,1.086579 1.638441,1.89624 2.8188954,1.927695 1.539087,0.123114 3.116222,0.01728 4.611963,-0.371546 0.748237,-0.237377 1.585081,-0.823539 1.52757,-1.698694 0.19724,-2.404376 0.796669,-4.753262 1.607201,-7.019741 C 18.960913,11.741029 19.65199,9.617474 19.987868,7.420337 20.157642,6.285646 18.498217,5.284435 17.971185,6.580733 17.651394,7.030488 17.759235,8.19746 17.370847,8.294952 17.091248,7.223145 17.163977,6.0787 16.721103,5.044542 16.57123,4.112494 15.873763,3.133992 14.822923,3.255006 13.669509,3.436721 14.224926,4.969524 14.24092,5.765433 c 0.04854,0.61498 0.399825,2.15953 0.16182,2.222943 C 13.825295,6.247793 13.885798,4.274662 12.830332,2.704922 12.481979,2.375746 12.117886,2.013598 11.602196,2.011121 Z"
+       id="path852"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccccc" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00010002;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 11.601562,2.0117188 c -0.968278,-0.09294 -1.309841,1.0963704 -1.044921,1.8515624 0.270375,1.5488581 1.032467,3.1293586 0.554687,4.7109376 C 10.58976,6.9541598 9.696621,5.4462139 8.595703,4.1542969 8.066522,3.3600279 6.686301,3.5565096 6.537109,4.5566406 6.222793,5.4143586 6.773205,6.1973067 7.230469,6.8710938 7.860693,8.1459608 8.728108,9.3531667 8.982422,10.777344 9.15926,11.768303 8.653521,13.01865 7.724609,13.398438 6.687355,13.458377 6.01012,12.354779 5.861328,11.447266 5.779538,10.557975 4.997504,9.2134723 4,9.9882812 2.945395,10.817028 3.149165,12.378967 3.734375,13.427734 c 0.407994,0.978981 0.968837,1.890657 1.78125,2.587891 1.33806,1.298694 2.349166,3.09725 2.230469,5.007813 0,1.086579 1.637905,1.896279 2.818359,1.927734 1.539087,0.123114 3.115587,0.01773 4.611328,-0.371094 0.748237,-0.237377 1.584855,-0.824064 1.527344,-1.699219 0.19724,-2.404376 0.79689,-4.753052 1.607422,-7.019531 0.649652,-2.120341 1.341856,-4.2442691 1.677734,-6.4414061 0.169774,-1.134691 -1.490546,-2.1361418 -2.017578,-0.8398438 -0.319791,0.449755 -0.211221,1.6173518 -0.599609,1.7148438 -0.279599,-1.071807 -0.207517,-2.215842 -0.650391,-3.25 C 16.57083,4.1128739 15.873106,3.1348454 14.822266,3.2558594 13.668852,3.4375744 14.22424,4.969716 14.240234,5.765625 c 0.04854,0.61498 0.400115,2.1592432 0.16211,2.2226562 C 13.824899,6.2476983 13.885544,4.2748181 12.830078,2.7050781 12.481725,2.3759021 12.117253,2.0141957 11.601562,2.0117188 Z m -0.04687,0.4980468 0.02148,0.00195 h 0.02344 c 0.266338,0.00128 0.512596,0.2203056 0.835938,0.5234374 0.911727,1.3969818 0.882427,3.2733371 1.492187,5.1113282 L 14.076172,8.59375 14.53125,8.4707031 c 0.288525,-0.076874 0.385059,-0.3187823 0.417969,-0.4433593 0.03291,-0.1245773 0.0353,-0.2231743 0.03516,-0.328125 C 14.984086,7.4893172 14.957136,7.2601929 14.923828,7.015625 14.857211,6.5264891 14.759643,5.9724596 14.740234,5.7265625 v 0.029297 c -0.0102,-0.5077555 -0.149171,-1.0639976 -0.146484,-1.4726563 0.0013,-0.2043293 0.03985,-0.3488391 0.07813,-0.4121093 0.03633,-0.060078 0.065,-0.090553 0.216797,-0.1171876 0.355996,-0.03829 0.615867,0.088235 0.855469,0.34375 0.241675,0.2577268 0.422435,0.6523313 0.482421,1.0253907 l 0.0098,0.0625 0.02539,0.056641 c 0.382519,0.8932217 0.318109,2.0032601 0.625,3.1796875 l 0.125,0.4785156 0.480469,-0.1210937 c 0.330877,-0.083056 0.484119,-0.3569479 0.558593,-0.5527344 0.07447,-0.1957865 0.106671,-0.3850543 0.138672,-0.5722656 0.064,-0.3744227 0.163301,-0.7464229 0.189453,-0.7832031 l 0.0332,-0.048828 0.02148,-0.052734 c 0.08882,-0.2184574 0.171069,-0.2631381 0.248047,-0.2871093 0.07698,-0.023971 0.196292,-0.017193 0.335937,0.052734 0.279291,0.1398555 0.522983,0.5002917 0.476563,0.8105469 -0.327668,2.1434306 -1.008802,4.2432419 -1.660157,6.3691409 -0.817333,2.289621 -1.427699,4.672266 -1.628906,7.125 l -0.002,0.03711 0.002,0.03711 c 0.01787,0.27193 -0.08926,0.481468 -0.310547,0.695313 -0.218395,0.211047 -0.548661,0.388427 -0.857422,0.488281 -1.430398,0.370039 -2.948879,0.474234 -4.433593,0.355469 l -0.01172,-0.002 h -0.01367 C 10.095913,22.438362 9.449398,22.24861 8.974609,21.957031 8.499821,21.665452 8.246094,21.315386 8.246094,21.023438 l -0.00195,0.03125 C 8.374922,18.949572 7.278673,17.028106 5.865234,15.65625 l -0.011718,-0.0098 -0.011719,-0.0098 C 5.106419,15.005666 4.583017,14.164671 4.195312,13.234375 l -0.00977,-0.02539 -0.013672,-0.02539 C 3.91873,12.729917 3.745542,12.146651 3.751953,11.630859 c 0.0064,-0.515792 0.161652,-0.939603 0.556641,-1.25 0.166559,-0.128502 0.249369,-0.131327 0.320312,-0.121093 0.07147,0.01031 0.169755,0.05748 0.28125,0.175781 0.22299,0.236604 0.423426,0.73374 0.453125,1.056641 l 0.00195,0.01758 0.00195,0.01758 c 0.08874,0.54125 0.319796,1.112105 0.707031,1.578125 0.387234,0.46602 0.976274,0.833506 1.677734,0.792969 l 0.083985,-0.0059 0.076171,-0.03125 C 8.525107,13.610741 8.961282,13.099195 9.222656,12.525391 9.48403,11.951586 9.583904,11.301917 9.474609,10.689453 9.194359,9.1200327 8.284853,7.8726123 7.679688,6.6484375 L 7.664062,6.6191406 7.644531,6.5898438 C 7.41403,6.2500625 7.185203,5.9102242 7.058594,5.5957031 6.931984,5.2811821 6.898153,5.0224299 7.005859,4.7285156 L 7.023438,4.6816406 7.03125,4.6308594 C 7.07333,4.3487867 7.252096,4.220519 7.509766,4.1757812 7.767435,4.1310433 8.036905,4.2173332 8.179688,4.4316406 l 0.015624,0.025391 0.019532,0.021484 c 1.062957,1.2473704 1.921664,2.7023465 2.419922,4.25 L 11.126953,10.253906 11.589844,8.71875 C 12.136837,6.9080552 11.303711,5.2262641 11.050781,3.7773438 l -0.0078,-0.041016 -0.01367,-0.039063 c -0.08308,-0.2368265 -0.06941,-0.6244659 0.04297,-0.8710937 0.112374,-0.2466278 0.205943,-0.3429437 0.482422,-0.3164063 z"
+       id="path844"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke"
+       d="m 35.602196,2.011121 c -0.968279,-0.09294 -1.309807,1.097311 -1.044887,1.852503 0.270375,1.548858 1.032003,3.129502 0.554223,4.711081 C 34.589964,6.954646 33.696549,5.446787 32.595631,4.15487 32.06645,3.360601 30.685348,3.556354 30.536156,4.556485 c -0.314316,0.857718 0.237636,1.64067 0.6949,2.314457 0.630224,1.274867 1.496266,2.482414 1.75058,3.906591 0.176838,0.990959 -0.328973,2.241539 -1.257885,2.621327 -1.037254,0.05994 -1.714014,-1.044398 -1.862806,-1.951911 -0.08179,-0.889291 -0.86326,-2.233825 -1.860764,-1.459016 -1.054605,0.828747 -0.850992,2.390946 -0.265782,3.439713 0.407994,0.978981 0.969746,1.890696 1.782159,2.58793 1.33806,1.298694 2.347771,3.097517 2.229074,5.00808 0,1.086579 1.638441,1.89624 2.818895,1.927695 1.539087,0.123114 3.116222,0.01728 4.611963,-0.371546 0.748237,-0.237377 1.585081,-0.823539 1.52757,-1.698694 0.19724,-2.404376 0.796669,-4.753262 1.607201,-7.019741 C 42.960913,11.741029 43.65199,9.617474 43.987868,7.420337 44.157642,6.285646 42.498217,5.284435 41.971185,6.580733 41.651394,7.030488 41.759235,8.19746 41.370847,8.294952 41.091248,7.223145 41.163977,6.0787 40.721103,5.044542 40.57123,4.112494 39.873763,3.133992 38.822923,3.255006 37.669509,3.436721 38.224926,4.969524 38.24092,5.765433 c 0.04854,0.61498 0.399825,2.15953 0.16182,2.222943 C 37.825295,6.247793 37.885798,4.274662 36.830332,2.704922 36.481979,2.375746 36.117886,2.013598 35.602196,2.011121 Z"
+       id="path861"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccccccccccccccccccc" />
   </g>
diff --git a/rtdata/images/themed/svg/hand-open.svg b/rtdata/images/themed/svg/hand-open.svg
index 3e7a8e488..b2ed1b6c3 100644
--- a/rtdata/images/themed/svg/hand-open.svg
+++ b/rtdata/images/themed/svg/hand-open.svg
@@ -64,7 +64,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -106,5 +106,24 @@
        id="path2954"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccccccccccccccccc" />
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path814"
+       d="m 11.066359,42.319247 c 0.02103,2.179428 0.361946,4.343601 0.343124,6.524384 -0.705694,-2.097508 -1.7133931,-4.081554 -2.4020386,-6.183914 -0.308048,-1.25478 -2.3218595,-1.312801 -2.2953616,0.131995 0.1484682,1.51372 0.594459,2.99453 1.1453756,4.411873 0.5796458,1.525089 1.1947823,3.114026 1.0740212,4.776499 C 8.7200153,53.308132 7.126686,53.731266 6.2345901,52.561086 5.8181155,52.167522 5.6906617,51.907896 5.2741487,51.321342 4.8576356,50.734789 4.1520632,49.821307 3.4051693,50.101994 c -1.4976695,0.876326 -0.2941262,2.449671 0.3195361,3.475862 0.5291409,1.049899 1.265396,1.943333 2.0966285,2.765328 1.1394053,1.210646 2.0071456,2.792292 1.9277399,4.496496 0.044036,1.388514 1.5584783,2.053001 2.7640802,2.126395 1.546216,0.08721 3.127517,0.02028 4.631582,-0.365992 0.822251,-0.241424 1.611938,-0.89834 1.595907,-1.823778 0.244116,-4.074098 2.047676,-7.810263 3.063052,-11.714012 0.291102,-1.056513 0.644584,-2.129256 0.641543,-3.233776 -0.26812,-1.182495 -1.908089,-1.132589 -2.209115,0.198776 -0.26876,0.946642 -0.365981,1.941262 -0.740551,2.857254 -0.253525,-1.958499 0.188884,-3.950415 -0.127447,-5.905767 0.04525,-1.528018 -2.153907,-1.449921 -2.411142,-0.140805 -0.251524,1.925974 -0.159678,3.881751 -0.400925,5.810037 -0.563883,-2.270808 -0.28889,-4.693484 -1.109574,-6.908379 -0.575162,-1.136295 -2.32306,-0.644964 -2.380125,0.579614 z"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers fill stroke" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 12.482422 0.60742188 C 12.297073 0.59653826 12.112185 0.61483733 11.9375 0.66015625 C 11.238761 0.84143193 10.605844 1.4505738 10.566406 2.296875 L 10.566406 2.3105469 L 10.566406 2.3242188 C 10.577746 3.499862 10.658806 4.6188373 10.748047 5.7617188 C 10.298469 4.6844719 9.8370617 3.5865832 9.4824219 2.5039062 L 9.4921875 2.5410156 C 9.2784358 1.670354 8.4743848 1.200053 7.7265625 1.2128906 C 7.3526513 1.2193094 6.9684886 1.3446714 6.6738281 1.6210938 C 6.3791676 1.897516 6.2041381 2.3235491 6.2128906 2.8007812 L 6.2128906 2.8203125 L 6.2148438 2.8398438 C 6.3695934 4.4175761 6.8307266 5.9398679 7.390625 7.3808594 C 7.9668003 8.8968168 8.5292407 10.404055 8.4296875 11.910156 C 8.3497941 12.380427 8.066771 12.640619 7.7246094 12.720703 C 7.3789371 12.801609 6.974231 12.705658 6.6328125 12.257812 L 6.6074219 12.226562 L 6.578125 12.197266 C 6.204422 11.844124 6.1106011 11.635333 5.6816406 11.03125 C 5.4671605 10.729209 5.172481 10.324442 4.7832031 10.001953 C 4.3939252 9.6794647 3.817693 9.4133494 3.2285156 9.6347656 L 3.1894531 9.6484375 L 3.1523438 9.6699219 C 2.6964437 9.936681 2.3869176 10.30919 2.2597656 10.722656 C 2.1326136 11.136122 2.1816769 11.552311 2.2949219 11.927734 C 2.517642 12.666081 2.985278 13.31873 3.2773438 13.802734 C 3.2784338 13.804934 3.28016 13.806394 3.28125 13.808594 C 3.8396994 14.914336 4.6090389 15.845168 5.4570312 16.685547 C 6.5343087 17.830142 7.3208538 19.295744 7.25 20.816406 L 7.2480469 20.835938 L 7.25 20.855469 C 7.277694 21.728708 7.7921751 22.4037 8.421875 22.814453 C 9.0515749 23.225207 9.800943 23.423357 10.482422 23.464844 L 10.484375 23.464844 C 12.064087 23.553944 13.697165 23.487794 15.269531 23.083984 L 15.277344 23.082031 L 15.285156 23.080078 C 15.772388 22.93702 16.246593 22.676383 16.617188 22.291016 C 16.98778 21.905649 17.250748 21.3745 17.240234 20.767578 L 17.240234 20.806641 C 17.476492 16.863698 19.252732 13.160478 20.285156 9.1953125 L 20.285156 9.1914062 C 20.571627 8.1522564 20.948646 7.0369059 20.945312 5.8261719 L 20.945312 5.7714844 L 20.933594 5.71875 C 20.750585 4.9116225 20.017611 4.4412768 19.320312 4.4863281 C 18.724507 4.5248222 18.199969 4.9741686 17.921875 5.6210938 C 17.954195 4.7352914 18.003193 3.9097621 17.863281 2.984375 C 17.874837 2.4875655 17.692861 2.0425781 17.384766 1.7597656 C 17.074206 1.4746908 16.674032 1.3490659 16.283203 1.34375 C 15.501546 1.3331182 14.647027 1.8249624 14.466797 2.7421875 L 14.462891 2.7578125 L 14.460938 2.7734375 C 14.408157 3.1775652 14.408276 3.5556998 14.378906 3.9570312 C 14.271531 3.1589249 14.209783 2.3592365 13.916016 1.5664062 L 13.90625 1.5390625 L 13.892578 1.5136719 C 13.597984 0.93156519 13.038467 0.64007272 12.482422 0.60742188 z M 12.455078 1.1015625 C 12.849587 1.1170679 13.23158 1.3141238 13.447266 1.7402344 C 14.26795 3.9551294 13.992758 6.3776292 14.556641 8.6484375 C 14.797888 6.7201513 14.705507 4.763864 14.957031 2.8378906 C 15.214266 1.5287748 17.412433 1.450498 17.367188 2.9785156 C 17.683518 4.9338681 17.242569 6.9262668 17.496094 8.8847656 C 17.870664 7.9687737 17.967568 6.973985 18.236328 6.0273438 C 18.537354 4.6959782 20.177193 4.6456298 20.445312 5.828125 C 20.448353 6.9326448 20.093836 8.0059864 19.802734 9.0625 C 18.787358 12.966248 16.98435 16.701293 16.740234 20.775391 C 16.756265 21.700829 15.966782 22.358185 15.144531 22.599609 C 13.640466 22.985881 12.059888 23.054007 10.513672 22.966797 C 9.30807 22.893403 7.794036 22.228358 7.75 20.839844 C 7.8294057 19.13564 6.9616709 17.554396 5.8222656 16.34375 C 4.9910331 15.521755 4.2537503 14.628024 3.7246094 13.578125 C 3.1109471 12.551934 1.9066274 10.977889 3.4042969 10.101562 C 4.1511908 9.8208755 4.8569244 10.735713 5.2734375 11.322266 C 5.6899505 11.90882 5.8179004 12.166983 6.234375 12.560547 C 7.1264709 13.730727 8.7201763 13.308517 8.9316406 11.980469 C 9.0524017 10.317996 8.4370677 8.7282135 7.8574219 7.203125 C 7.3065053 5.7857817 6.8613588 4.3047361 6.7128906 2.7910156 C 6.6863927 1.3462201 8.6997645 1.4053767 9.0078125 2.6601562 C 9.696458 4.7625164 10.704462 6.7462413 11.410156 8.84375 C 11.428978 6.6629669 11.087436 4.4977875 11.066406 2.3183594 C 11.102072 1.5529984 11.797563 1.0757202 12.455078 1.1015625 z M 17.755859 5.890625 C 17.753259 5.899665 17.7526 5.9069846 17.75 5.9160156 C 17.75 5.9160156 17.748047 5.9179688 17.748047 5.9179688 L 17.755859 5.890625 z "
+       id="path816" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path820"
+       d="m -12.0625,0.66015625 c -0.698739,0.18127568 -1.331656,0.79041755 -1.371094,1.63671875 v 0.013672 0.013672 c 0.01134,1.1756433 0.0924,2.2946186 0.181641,3.4375 -0.449578,-1.0772468 -0.910985,-2.1751358 -1.265625,-3.2578128 l 0.0098,0.037109 c -0.213752,-0.8706616 -1.017807,-1.3409622 -1.76563,-1.3281246 -0.373911,0.00642 -0.758073,0.1317809 -1.052734,0.4082032 -0.29466,0.2764222 -0.46969,0.7024553 -0.460937,1.1796874 v 0.019531 l 0.0019,0.019531 c 0.154749,1.5777324 0.615886,3.1000247 1.175784,4.5410162 0.576175,1.5159574 1.138616,3.0231956 1.039062,4.5292966 -0.07989,0.470271 -0.362916,0.730463 -0.705078,0.810547 -0.345672,0.08091 -0.750378,-0.01505 -1.091797,-0.462891 l -0.02539,-0.03125 -0.0293,-0.0293 c -0.373704,-0.353142 -0.467524,-0.561929 -0.896484,-1.166012 -0.214481,-0.302041 -0.50916,-0.706808 -0.898438,-1.029297 -0.389278,-0.3224884 -0.96551,-0.5886036 -1.554687,-0.3671874 l -0.03906,0.013672 -0.03711,0.021484 c -0.4559,0.2667591 -0.765427,0.6392684 -0.892579,1.0527344 -0.127152,0.413466 -0.07809,0.829655 0.03516,1.205078 0.222721,0.738347 0.690357,1.390996 0.982422,1.875 0.0011,0.0022 0.0028,0.0037 0.0039,0.0059 0.561462,1.111707 1.336036,2.046692 2.189453,2.890625 l -0.01367,-0.01367 c 1.077278,1.144595 1.86382,2.610155 1.792966,4.130817 l -0.002,0.01953 0.002,0.01953 c 0.02769,0.873239 0.542175,1.548231 1.171875,1.958984 0.6297,0.410754 1.379068,0.608904 2.060547,0.650391 h 0.002 c 1.579712,0.0891 3.21279,0.02295 4.785156,-0.38086 l 0.0078,-0.002 0.0078,-0.002 c 0.487232,-0.143058 0.961438,-0.403695 1.332032,-0.789062 0.370593,-0.385367 0.63356,-0.916516 0.623046,-1.523438 v 0.03906 c 0.236258,-3.942943 2.012498,-7.646163 3.044922,-11.6113285 v -0.00391 C -3.428351,8.1521527 -3.051332,7.0368022 -3.054666,5.8260682 V 5.7714844 L -3.066406,5.71875 C -3.249415,4.9116225 -3.982389,4.4412768 -4.679688,4.4863281 -5.275494,4.5248222 -5.800031,4.9741686 -6.078125,5.6210938 -6.045805,4.7352914 -5.996807,3.9097621 -6.136719,2.984375 -6.125163,2.4875655 -6.307139,2.0425781 -6.615234,1.7597656 -6.925794,1.4746908 -7.325968,1.3490659 -7.716797,1.34375 -8.498454,1.3331182 -9.352973,1.8249624 -9.533203,2.7421875 l -0.0039,0.015625 -0.002,0.015625 c -0.05278,0.4041277 -0.05266,0.7822623 -0.08203,1.1835937 -0.107375,-0.7981063 -0.169123,-1.5977948 -0.46289,-2.390625 l -0.0098,-0.027344 -0.01367,-0.025391 C -10.500285,0.73752895 -11.363761,0.47888057 -12.0625,0.66015625 Z m 0.25,0.96874995 c 0.327629,-0.084998 0.615816,-0.014161 0.798828,0.3300782 0.747739,2.0597572 0.494913,4.4363486 1.083984,6.8085937 l 0.982422,-0.056641 C -8.70016,6.735827 -8.78812,4.7904773 -8.548828,2.9316406 -8.469639,2.5430223 -8.099804,2.3387264 -7.730469,2.34375 c 0.185458,0.00252 0.342359,0.063217 0.439453,0.1523438 0.09709,0.089127 0.167925,0.206397 0.160157,0.46875 l -0.002,0.046875 0.0078,0.046875 C -6.828955,4.8885487 -7.268573,6.874471 -7,8.9492188 l 0.242188,1.8750002 0.716796,-1.7500002 c 0.411093,-1.0053066 0.505532,-2.0215571 0.757813,-2.9101563 l 0.0039,-0.013672 0.0039,-0.013672 c 0.107736,-0.4764884 0.395184,-0.6352244 0.660157,-0.6523438 0.251375,-0.016241 0.449106,0.1022573 0.542968,0.4316406 -0.01505,0.9710696 -0.318057,1.9705536 -0.605468,3.0136719 l -0.002,0.00391 v 0.00195 C -5.678376,12.774915 -7.506052,16.543442 -7.75787,20.746094 l -0.002,0.01953 v 0.01953 c 0.0055,0.318516 -0.117945,0.577694 -0.34375,0.8125 -0.223319,0.232223 -0.551559,0.418326 -0.882812,0.517578 -1.43352,0.367311 -2.960591,0.436603 -4.470703,0.351563 -0.524019,-0.03191 -1.134184,-0.203265 -1.574115,-0.490233 -0.439931,-0.286967 -0.704361,-0.637069 -0.720703,-1.152343 v 0.03906 c 0.08796,-1.887744 -0.86097,-3.586624 -2.0625,-4.863279 l -0.0059,-0.0059 -0.0059,-0.0059 c -0.807393,-0.79834 -1.505397,-1.649441 -2.001952,-2.634684 l -0.0078,-0.01758 -0.0098,-0.01563 c -0.322958,-0.54006 -0.748063,-1.170179 -0.902342,-1.681634 -0.07714,-0.255727 -0.08634,-0.461023 -0.03711,-0.621094 0.04425,-0.143897 0.168742,-0.284663 0.398438,-0.435547 0.148565,-0.04428 0.291098,-0.0095 0.531249,0.189453 0.254361,0.210719 0.520624,0.555332 0.722657,0.839844 0.388512,0.547122 0.564085,0.853027 0.984375,1.261719 0.550791,0.711482 1.379594,0.989291 2.101562,0.820312 0.726883,-0.170128 1.337555,-0.786297 1.472656,-1.634765 l 0.0019,-0.02149 0.002,-0.02148 c 0.131323,-1.8078 -0.526579,-3.4671485 -1.105463,-4.9902334 v -0.00195 -0.00195 c -0.537613,-1.3831218 -0.962413,-2.8116379 -1.107422,-4.2500062 -7.18e-4,-0.2313914 0.05782,-0.3441971 0.140625,-0.421875 0.0851,-0.079836 0.22003,-0.1338908 0.384765,-0.1367188 0.329471,-0.00566 0.684997,0.1822887 0.779297,0.5664063 l 0.0059,0.017578 0.0059,0.017578 c 0.704593,2.151049 1.712135,4.1379731 2.402343,6.1894533 l 0.974609,-0.15625 c 0.01924,-2.227041 -0.318816,-4.3853297 -0.341775,-6.5078124 0.01905,-0.3764263 0.286845,-0.6247291 0.619141,-0.7109376 z m 5.568359,4.2617188 c -0.0026,0.00904 -0.0033,0.01636 -0.0059,0.025391 -2.2e-4,9.659e-4 -0.0017,9.865e-4 -0.002,0.00195 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 12.455078 1.1015625 C 11.797563 1.0757202 11.102072 1.5529984 11.066406 2.3183594 C 11.087436 4.4977875 11.428978 6.6629669 11.410156 8.84375 C 10.704462 6.7462413 9.696458 4.7625164 9.0078125 2.6601562 C 8.6997645 1.4053767 6.6863927 1.3462201 6.7128906 2.7910156 C 6.8613588 4.3047361 7.3065053 5.7857817 7.8574219 7.203125 C 8.4370677 8.7282135 9.0524017 10.317996 8.9316406 11.980469 C 8.7201763 13.308517 7.1264709 13.730727 6.234375 12.560547 C 5.8179004 12.166983 5.6899505 11.90882 5.2734375 11.322266 C 4.8569244 10.735713 4.1511908 9.8208755 3.4042969 10.101562 C 1.9066274 10.977889 3.1109471 12.551934 3.7246094 13.578125 C 4.2537503 14.628024 4.9910331 15.521755 5.8222656 16.34375 C 6.9616709 17.554396 7.8294057 19.13564 7.75 20.839844 C 7.794036 22.228358 9.30807 22.893403 10.513672 22.966797 C 12.059888 23.054007 13.640466 22.985881 15.144531 22.599609 C 15.966782 22.358185 16.756265 21.700829 16.740234 20.775391 C 16.98435 16.701293 18.787358 12.966248 19.802734 9.0625 C 20.093836 8.0059864 20.448353 6.9326448 20.445312 5.828125 C 20.177193 4.6456298 18.537354 4.6959782 18.236328 6.0273438 C 17.967568 6.973985 17.870664 7.9687737 17.496094 8.8847656 C 17.242569 6.9262668 17.683518 4.9338681 17.367188 2.9785156 C 17.412433 1.450498 15.214266 1.5287748 14.957031 2.8378906 C 14.705507 4.763864 14.797888 6.7201513 14.556641 8.6484375 C 13.992758 6.3776292 14.26795 3.9551294 13.447266 1.7402344 C 13.23158 1.3141238 12.849587 1.1170679 12.455078 1.1015625 z M 12.423828 1.5957031 C 12.651678 1.5959037 12.849069 1.700805 12.986328 1.9589844 C 13.734067 4.0187416 13.481241 6.395333 14.070312 8.7675781 L 15.052734 8.7109375 C 15.29984 6.7358274 15.21188 4.7904773 15.451172 2.9316406 C 15.530361 2.5430223 15.900196 2.3387264 16.269531 2.34375 C 16.454989 2.34627 16.61189 2.4069669 16.708984 2.4960938 C 16.806074 2.5852207 16.876909 2.7024908 16.869141 2.9648438 L 16.867188 3.0117188 L 16.875 3.0585938 C 17.171104 4.8885486 16.731427 6.8744709 17 8.9492188 L 17.242188 10.824219 L 17.958984 9.0742188 C 18.370077 8.0689121 18.464516 7.0526617 18.716797 6.1640625 L 18.720703 6.1503906 L 18.724609 6.1367188 C 18.832345 5.6602303 19.119793 5.5014944 19.384766 5.484375 C 19.636141 5.468134 19.833872 5.5866323 19.927734 5.9160156 C 19.912684 6.8870852 19.609677 7.8865692 19.322266 8.9296875 L 19.320312 8.9335938 L 19.320312 8.9355469 C 18.321682 12.774915 16.494006 16.543442 16.242188 20.746094 L 16.240234 20.765625 L 16.240234 20.785156 C 16.245734 21.103672 16.122289 21.36285 15.896484 21.597656 C 15.673165 21.829879 15.344925 22.015982 15.013672 22.115234 C 13.580152 22.482545 12.053081 22.551837 10.542969 22.466797 C 10.01895 22.434887 9.408681 22.263531 8.96875 21.976562 C 8.528819 21.689595 8.2643889 21.339493 8.2480469 20.824219 C 8.3210557 18.952282 7.3786895 17.267743 6.1855469 16 L 6.1796875 15.994141 L 6.1738281 15.988281 C 5.3664351 15.189941 4.66843 14.338759 4.171875 13.353516 L 4.1640625 13.335938 L 4.1542969 13.320312 C 3.8313389 12.780252 3.4062321 12.150127 3.2519531 11.638672 C 3.1748131 11.382945 3.1656138 11.177649 3.2148438 11.017578 C 3.2590937 10.873681 3.3835852 10.732915 3.6132812 10.582031 C 3.7618463 10.537751 3.9043802 10.572531 4.1445312 10.771484 C 4.3988923 10.982203 4.6651545 11.326816 4.8671875 11.611328 C 5.2556995 12.15845 5.4312725 12.464355 5.8515625 12.873047 C 6.4023535 13.584529 7.231157 13.862338 7.953125 13.693359 C 8.680008 13.523231 9.2906803 12.907062 9.4257812 12.058594 L 9.4277344 12.037109 L 9.4296875 12.015625 C 9.5610105 10.207825 8.9031028 8.5484755 8.3242188 7.0253906 L 8.3242188 7.0234375 L 8.3242188 7.0214844 C 7.7866058 5.6383626 7.3618059 4.2098527 7.2167969 2.7714844 C 7.2160789 2.540093 7.2746169 2.4272873 7.3574219 2.3496094 C 7.4425219 2.2697734 7.5774525 2.2157186 7.7421875 2.2128906 C 8.0716585 2.2072306 8.4271844 2.3951793 8.5214844 2.7792969 L 8.5273438 2.796875 L 8.5332031 2.8144531 C 9.2377961 4.9655021 10.245339 6.952426 10.935547 9.0039062 L 11.910156 8.8476562 C 11.929396 6.6206153 11.591318 4.4623264 11.568359 2.3398438 C 11.587409 1.9634174 11.855204 1.7151147 12.1875 1.6289062 C 12.269407 1.6076568 12.347878 1.5956363 12.423828 1.5957031 z "
+       id="path825" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/magnifier-1to1-small.svg b/rtdata/images/themed/svg/magnifier-1to1-small.svg
index d75b8da8a..68aa7d6c2 100644
--- a/rtdata/images/themed/svg/magnifier-1to1-small.svg
+++ b/rtdata/images/themed/svg/magnifier-1to1-small.svg
@@ -42,9 +42,10 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
-     inkscape:object-nodes="false"
+     inkscape:object-nodes="true"
      inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false">
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-smooth-nodes="false">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -63,7 +64,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,33 +102,47 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55112457;marker:none;enable-background:accumulate"
-       d="m 6.7404391,9.0000001 c -1.469845,0 -2.9388456,0.5873872 -4.059495,1.7058289 -2.2412588,2.236891 -2.2412588,5.854755 0,8.091647 1.7743708,1.770867 4.4065391,2.128859 6.5456729,1.095853 0.056267,-0.02721 0.1274312,-0.05292 0.1829934,-0.08203 0.3334768,-0.131456 1.1438766,-0.383157 1.5796276,0.0064 0.435752,0.389446 0.320078,0.838532 0.843449,1.360878 L 13.673132,23 l 1.32512,-1.402944 -1.794171,-1.785758 c -0.523371,-0.522345 -0.938229,-0.408648 -1.367187,-0.912861 -0.428958,-0.504212 0.0542,-1.59093 0.08624,-1.659554 1.035018,-2.1349 0.659589,-4.76218 -1.114784,-6.533054 C 9.6876943,9.5873873 8.2102851,9.0000001 6.7404391,9.0000001 Z M 6.7194067,10.747897 A 3.9722949,3.9722949 0 0 1 10.692663,14.71905 3.9722949,3.9722949 0 0 1 6.7194056,18.692308 3.9722949,3.9722949 0 0 1 2.7482517,14.71905 3.9722949,3.9722949 0 0 1 6.7194067,10.747897 Z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       d="m 5.7958539,17.232828 h -0.958965 v -3.614035 c -0.3503704,0.327622 -0.4435315,0.35674 -0.9190311,0.51372 v -0.870234 c 0.2502625,-0.0819 0.2023666,-0.02342 0.4958588,-0.250943 0.293489,-0.229783 0.4948377,-0.49711 0.6040447,-0.801981 h 0.7780926 v 5.023473"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.50748277"
-       id="path11691"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 7,1 C 3.6951749,1 1,3.695175 1,7 c 0,3.304825 2.6951749,6 6,6 1.1597667,0 2.2406824,-0.338405 3.160156,-0.912109 l 2.763672,2.765625 c 0.195481,0.196523 0.513503,0.196523 0.708984,0 l 1.220704,-1.222657 c 0.195151,-0.195271 0.195151,-0.51176 0,-0.707031 L 12.089844,10.160156 C 12.663219,9.2408655 13,8.1594062 13,7 13,3.695175 10.304825,1 7,1 Z m 0,1.5 c 2.4941648,0 4.5,2.005835 4.5,4.5 0,2.494165 -2.0058352,4.5 -4.5,4.5 C 4.5058352,11.5 2.5,9.494165 2.5,7 2.5,4.505835 4.5058352,2.5 7,2.5 Z"
+       transform="translate(0,8)"
+       id="circle818"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssccccccsssssss" />
     <path
        inkscape:connector-curvature="0"
-       id="path11693"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.50748277"
-       d="m 9.0998297,17.232828 h -0.958965 v -3.614035 c -0.3503703,0.327622 -0.4435314,0.35674 -0.9190312,0.51372 v -0.870234 c 0.2502627,-0.0819 0.2023668,-0.02342 0.4958583,-0.250943 0.2934897,-0.229783 0.4948377,-0.49711 0.6040453,-0.801981 h 0.7780926 v 5.023473"
-       sodipodi:nodetypes="ccccccccc" />
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.8333332,14 v 4 H 6 V 12.2 H 4.8333332 C 4.5922221,13.071999 4.7244447,13.263999 3.6666664,13.4 V 14 Z"
+       id="path846"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 8,15 H 7 v 1 h 1 z"
+       id="path848"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path866"
+       d="m 8.8333332,14 v 4 H 10 V 12.2 H 8.8333332 C 8.5922218,13.071999 8.7244435,13.263999 7.6666657,13.4 V 14 Z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
     <path
        inkscape:connector-curvature="0"
-       id="path11687"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.50748277"
-       d="m 6.4341292,17.232828 v -0.958965 h 0.958965 v 0.958965 h -0.958965"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       d="m 6.4341292,15.619421 v -0.958965 h 0.958965 v 0.958965 h -0.958965"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.50748277"
-       id="path11695"
-       inkscape:connector-curvature="0" />
+       id="path868"
+       d="M 8,17 H 7 v 1 h 1 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <circle
+       r="5.25"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="circle1483"
+       cx="-13"
+       cy="15.000001" />
+    <rect
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="rect1485"
+       width="3.9282172"
+       height="1.7284168"
+       x="7.2274308"
+       y="18.934778"
+       transform="matrix(0.70707151,0.70714205,-0.70707151,0.70714205,0,0)" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/magnifier-1to1.svg b/rtdata/images/themed/svg/magnifier-1to1.svg
index 1f79d24cd..d009f054f 100644
--- a/rtdata/images/themed/svg/magnifier-1to1.svg
+++ b/rtdata/images/themed/svg/magnifier-1to1.svg
@@ -44,8 +44,7 @@
      inkscape:snap-others="false"
      inkscape:object-nodes="false"
      inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true">
+     inkscape:snap-bbox-midpoints="false">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -64,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,33 +100,42 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55112457;marker:none;enable-background:accumulate"
-       d="M 10.02069,1 C 7.7109336,1 5.4025041,1.9230371 3.6414836,3.6805883 c -3.52197814,3.5151143 -3.52197814,9.2003287 0,12.7154447 2.788297,2.782792 6.9245614,3.345351 10.2860574,1.722055 0.08842,-0.04275 0.200249,-0.08316 0.287561,-0.128903 0.524035,-0.206573 1.79752,-0.602103 2.482272,0.01 0.684753,0.611986 0.502979,1.317693 1.32542,2.138522 L 20.914921,23 22.997253,20.795373 20.177842,17.989182 c -0.82244,-0.820827 -1.474361,-0.64216 -2.148437,-1.434495 -0.674077,-0.792333 0.08517,-2.500033 0.13552,-2.607871 C 19.791381,10.591973 19.201422,6.4633903 16.413122,3.6805883 14.652091,1.9230371 12.330448,1 10.02069,1 Z M 9.9876392,3.7466949 A 6.2421776,6.2421776 0 0 1 16.231328,9.9870795 6.2421776,6.2421776 0 0 1 9.9876375,16.230769 6.2421776,6.2421776 0 0 1 3.7472529,9.9870795 6.2421776,6.2421776 0 0 1 9.9876392,3.7466949 Z"
-       id="path3803"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
+       id="path814" />
+    <circle
+       r="8"
+       cy="10"
+       cx="-30"
+       id="circle818"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <rect
+       transform="rotate(45)"
+       y="26.870058"
+       x="-4.2426414"
+       height="2.5927444"
+       width="5.8925962"
+       id="rect820"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 6.6,8.3999999 V 14 H 8.2 V 6 H 6.6 C 6.2693334,7.1626664 6.4506666,7.4186664 5,7.6 v 0.7999999 z"
+       id="path846" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 11.399999,9.1999992 H 9.8 v 1.5999998 h 1.599999 z"
+       id="path848"
        inkscape:connector-curvature="0" />
     <path
-       sodipodi:nodetypes="ccccccccc"
-       d="M 8.5363418,13.937301 H 7.0293968 V 8.2581039 c -0.550582,0.514834 -0.696978,0.560591 -1.4441917,0.807274 v -1.367511 c 0.3932697,-0.128701 0.3180047,-0.03681 0.7792067,-0.394339 0.461197,-0.361088 0.777602,-0.7811728 0.949213,-1.2602563 h 1.222717 v 7.8940294"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.50748277"
-       id="path11691"
+       id="path866"
+       d="M 13,8.3999999 V 14 h 1.6 V 6 H 13 c -0.330667,1.1626664 -0.149334,1.4186664 -1.600001,1.6 v 0.7999999 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
-       id="path11693"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.50748277"
-       d="M 13.728304,13.937301 H 12.221359 V 8.2581039 c -0.550582,0.514834 -0.696978,0.560591 -1.444192,0.807274 v -1.367511 c 0.39327,-0.128701 0.318005,-0.03681 0.779206,-0.394339 0.461198,-0.361088 0.777602,-0.7811728 0.949214,-1.2602563 h 1.222717 v 7.8940294"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path11687"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.50748277"
-       d="m 9.5393458,13.937301 v -1.506945 h 1.5069452 v 1.506945 H 9.5393458"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       d="M 9.5393458,11.401947 V 9.8950019 H 11.046291 V 11.401947 H 9.5393458"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:550px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:-60px;word-spacing:0px;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1.50748277"
-       id="path11695"
-       inkscape:connector-curvature="0" />
+       id="path868"
+       d="M 11.399999,12.399999 H 9.8 V 14 h 1.599999 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:'Nimbus Sans L';-inkscape-font-specification:'Nimbus Sans L';letter-spacing:0px;word-spacing:0px;opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/magnifier-crop.svg b/rtdata/images/themed/svg/magnifier-crop.svg
index dbc35c796..736258dae 100644
--- a/rtdata/images/themed/svg/magnifier-crop.svg
+++ b/rtdata/images/themed/svg/magnifier-crop.svg
@@ -42,10 +42,11 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
-     inkscape:object-nodes="false"
+     inkscape:object-nodes="true"
      inkscape:snap-grids="true"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="false">
+     inkscape:snap-midpoints="false"
+     inkscape:snap-smooth-nodes="false">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -101,20 +102,38 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55112457;marker:none;enable-background:accumulate"
-       d="M 10.02069,1 C 7.7109336,1 5.4025041,1.9230371 3.6414836,3.6805883 c -3.52197814,3.5151143 -3.52197814,9.2003287 0,12.7154447 2.788297,2.782792 6.9245614,3.345351 10.2860574,1.722055 0.08842,-0.04275 0.200249,-0.08316 0.287561,-0.128903 0.524035,-0.206573 1.79752,-0.602103 2.482272,0.01 0.684753,0.611986 0.502979,1.317693 1.32542,2.138522 L 20.914921,23 22.997253,20.795373 20.177842,17.989182 c -0.82244,-0.820827 -1.474361,-0.64216 -2.148437,-1.434495 -0.674077,-0.792333 0.08517,-2.500033 0.13552,-2.607871 C 19.791381,10.591973 19.201422,6.4633903 16.413122,3.6805883 14.652091,1.9230371 12.330448,1 10.02069,1 Z M 9.9876392,3.7466949 A 6.2421776,6.2421776 0 0 1 16.231328,9.9870795 6.2421776,6.2421776 0 0 1 9.9876375,16.230769 6.2421776,6.2421776 0 0 1 3.7472529,9.9870795 6.2421776,6.2421776 0 0 1 9.9876392,3.7466949 Z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
+       id="path814" />
+    <circle
+       r="8"
+       cy="10"
+       cx="-30"
+       id="circle818"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <rect
+       transform="rotate(45)"
+       y="26.870058"
+       x="-4.2426414"
+       height="2.5927444"
+       width="5.8925962"
+       id="rect820"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
-       d="M 6.8741604,5.6117332 V 13.175997 H 14.438424 V 11.583521 H 8.4666366 V 5.6117332 Z"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
+       d="M 6 5 L 6 6 L 5 6 L 5 8 L 6 8 L 6 14 L 12 14 L 12 15 L 14 15 L 14 14 L 15 14 L 15 12 L 14 12 L 14 6 L 8 6 L 8 5 L 6 5 z M 8 8 L 12 8 L 12 12 L 8 12 L 8 8 z "
        id="rect1322" />
     <path
+       sodipodi:nodetypes="ccccccc"
+       id="path818"
+       d="m 6,5 v 9 h 9 V 13 H 7 V 5 Z"
        style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal"
-       d="M 5.6798029,6.8060905 V 8.398567 h 5.9717881 v 5.971787 h 1.592476 V 6.8060905 Z"
-       id="rect1324"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccccc"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       id="path820"
+       d="m 5,6 v 1 h 8 v 8 h 1 V 6 Z"
+       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97660822;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/magnifier-fit.svg b/rtdata/images/themed/svg/magnifier-fit.svg
index d73d73cfb..1d531e2d7 100644
--- a/rtdata/images/themed/svg/magnifier-fit.svg
+++ b/rtdata/images/themed/svg/magnifier-fit.svg
@@ -42,10 +42,11 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
-     inkscape:object-nodes="false"
+     inkscape:object-nodes="true"
      inkscape:snap-grids="true"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true">
+     inkscape:snap-midpoints="false"
+     inkscape:snap-smooth-nodes="false">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -101,13 +102,46 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55112457;marker:none;enable-background:accumulate"
-       d="M 10.02069,1 C 7.7109336,1 5.4025041,1.9230371 3.6414836,3.6805883 c -3.52197814,3.5151143 -3.52197814,9.2003287 0,12.7154447 2.788297,2.782792 6.9245614,3.345351 10.2860574,1.722055 0.08842,-0.04275 0.200249,-0.08316 0.287561,-0.128903 0.524035,-0.206573 1.79752,-0.602103 2.482272,0.01 0.684753,0.611986 0.502979,1.317693 1.32542,2.138522 L 20.914921,23 22.997253,20.795373 20.177842,17.989182 c -0.82244,-0.820827 -1.474361,-0.64216 -2.148437,-1.434495 -0.674077,-0.792333 0.08517,-2.500033 0.13552,-2.607871 C 19.791381,10.591973 19.201422,6.4633903 16.413122,3.6805883 14.652091,1.9230371 12.330448,1 10.02069,1 Z M 9.9876392,3.7466949 A 6.2421776,6.2421776 0 0 1 16.231328,9.9870795 6.2421776,6.2421776 0 0 1 9.9876375,16.230769 6.2421776,6.2421776 0 0 1 3.7472529,9.9870795 6.2421776,6.2421776 0 0 1 9.9876392,3.7466949 Z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
+       id="path814" />
+    <circle
+       r="8"
+       cy="10"
+       cx="-30"
+       id="circle818"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <rect
+       transform="rotate(45)"
+       y="26.870058"
+       x="-4.2426414"
+       height="2.5927444"
+       width="5.8925962"
+       id="rect820"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     <path
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       d="M 6 6 L 6 9 L 7 9 L 7 7 L 9 7 L 9 6 L 6 6 z M 11 6 L 11 7 L 13 7 L 13 9 L 14 9 L 14 6 L 11 6 z M 6 11 L 6 14 L 9 14 L 9 13 L 7 13 L 7 11 L 6 11 z M 13 11 L 13 13 L 11 13 L 11 14 L 14 14 L 14 11 L 13 11 z "
-       id="rect7737" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 11,6 v 1 h 2 v 2 h 1 V 6 Z"
+       id="rect921"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0"
+       id="path817"
+       d="M 9,14 V 13 H 7 V 11 H 6 v 3 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 9,6 V 7 H 7 V 9 H 6 V 6 Z"
+       id="path819"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0"
+       id="path821"
+       d="m 11,14 v -1 h 2 v -2 h 1 v 3 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.9;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/magnifier-minus-small.svg b/rtdata/images/themed/svg/magnifier-minus-small.svg
index b0184fdd9..08871ed77 100644
--- a/rtdata/images/themed/svg/magnifier-minus-small.svg
+++ b/rtdata/images/themed/svg/magnifier-minus-small.svg
@@ -45,7 +45,7 @@
      inkscape:object-nodes="true"
      inkscape:snap-grids="true"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true">
+     inkscape:snap-smooth-nodes="false">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -64,7 +64,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -102,15 +102,31 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55112457;marker:none;enable-background:accumulate"
-       d="m 6.7404391,9.0000001 c -1.469845,0 -2.9388456,0.5873872 -4.059495,1.7058289 -2.2412588,2.236891 -2.2412588,5.854755 0,8.091647 1.7743708,1.770867 4.4065391,2.128859 6.5456729,1.095853 0.056267,-0.02721 0.1274312,-0.05292 0.1829934,-0.08203 0.3334768,-0.131456 1.1438766,-0.383157 1.5796276,0.0064 0.435752,0.389446 0.320078,0.838532 0.843449,1.360878 L 13.673132,23 l 1.32512,-1.402944 -1.794171,-1.785758 c -0.523371,-0.522345 -0.938229,-0.408648 -1.367187,-0.912861 -0.428958,-0.504212 0.0542,-1.59093 0.08624,-1.659554 1.035018,-2.1349 0.659589,-4.76218 -1.114784,-6.533054 C 9.6876943,9.5873873 8.2102851,9.0000001 6.7404391,9.0000001 Z M 6.7194067,10.747897 A 3.9722949,3.9722949 0 0 1 10.692663,14.71905 3.9722949,3.9722949 0 0 1 6.7194056,18.692308 3.9722949,3.9722949 0 0 1 2.7482517,14.71905 3.9722949,3.9722949 0 0 1 6.7194067,10.747897 Z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       d="m 3.7259259,14.225925 v 1 h 6 v -1 z"
-       id="rect9844"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 7,1 C 3.6951749,1 1,3.695175 1,7 c 0,3.304825 2.6951749,6 6,6 1.1597667,0 2.2406824,-0.338405 3.160156,-0.912109 l 2.763672,2.765625 c 0.195481,0.196523 0.513503,0.196523 0.708984,0 l 1.220704,-1.222657 c 0.195151,-0.195271 0.195151,-0.51176 0,-0.707031 L 12.089844,10.160156 C 12.663219,9.2408655 13,8.1594062 13,7 13,3.695175 10.304825,1 7,1 Z m 0,1.5 c 2.4941648,0 4.5,2.005835 4.5,4.5 0,2.494165 -2.0058352,4.5 -4.5,4.5 C 4.5058352,11.5 2.5,9.494165 2.5,7 2.5,4.505835 4.5058352,2.5 7,2.5 Z"
+       transform="translate(0,8)"
+       id="circle818"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="sssccccccsssssss" />
+    <circle
+       r="5.25"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="circle1483"
+       cx="-13"
+       cy="15.000001" />
+    <rect
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="rect1485"
+       width="3.9282172"
+       height="1.7284168"
+       x="7.2274308"
+       y="18.934778"
+       transform="matrix(0.70707151,0.70714205,-0.70707151,0.70714205,0,0)" />
+    <path
+       id="path4979"
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.0142425,15 H 9.9857576"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/magnifier-minus.svg b/rtdata/images/themed/svg/magnifier-minus.svg
index 8bb0ffcd8..567845d57 100644
--- a/rtdata/images/themed/svg/magnifier-minus.svg
+++ b/rtdata/images/themed/svg/magnifier-minus.svg
@@ -42,10 +42,11 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
-     inkscape:object-nodes="false"
+     inkscape:object-nodes="true"
      inkscape:snap-grids="true"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true">
+     inkscape:snap-midpoints="false"
+     inkscape:snap-smooth-nodes="false">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -64,7 +65,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,15 +102,28 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55112457;marker:none;enable-background:accumulate"
-       d="M 10.02069,1 C 7.7109336,1 5.4025041,1.9230371 3.6414836,3.6805883 c -3.52197814,3.5151143 -3.52197814,9.2003287 0,12.7154447 2.788297,2.782792 6.9245614,3.345351 10.2860574,1.722055 0.08842,-0.04275 0.200249,-0.08316 0.287561,-0.128903 0.524035,-0.206573 1.79752,-0.602103 2.482272,0.01 0.684753,0.611986 0.502979,1.317693 1.32542,2.138522 L 20.914921,23 22.997253,20.795373 20.177842,17.989182 c -0.82244,-0.820827 -1.474361,-0.64216 -2.148437,-1.434495 -0.674077,-0.792333 0.08517,-2.500033 0.13552,-2.607871 C 19.791381,10.591973 19.201422,6.4633903 16.413122,3.6805883 14.652091,1.9230371 12.330448,1 10.02069,1 Z M 9.9876392,3.7466949 A 6.2421776,6.2421776 0 0 1 16.231328,9.9870795 6.2421776,6.2421776 0 0 1 9.9876375,16.230769 6.2421776,6.2421776 0 0 1 3.7472529,9.9870795 6.2421776,6.2421776 0 0 1 9.9876392,3.7466949 Z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
+       id="path814" />
+    <circle
+       r="8"
+       cy="10"
+       cx="-30"
+       id="circle818"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <rect
+       transform="rotate(45)"
+       y="26.870058"
+       x="-4.2426414"
+       height="2.5927444"
+       width="5.8925962"
+       id="rect820"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     <path
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       d="m 5,9 v 2 H 15 V 9 Z"
-       id="rect9179"
+       id="path4979"
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6,10 h 8"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/magnifier-plus-small.svg b/rtdata/images/themed/svg/magnifier-plus-small.svg
index 10ec999ce..a93e8cd8e 100644
--- a/rtdata/images/themed/svg/magnifier-plus-small.svg
+++ b/rtdata/images/themed/svg/magnifier-plus-small.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="50.625"
-     inkscape:cx="5.0962963"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
      inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -42,10 +42,10 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
-     inkscape:object-nodes="false"
+     inkscape:object-nodes="true"
      inkscape:snap-grids="true"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="false">
+     inkscape:snap-smooth-nodes="false">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -64,7 +64,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -102,14 +102,31 @@
      inkscape:label="Layer 1"
      transform="translate(0,-8)">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55112457;marker:none;enable-background:accumulate"
-       d="m 6.7404391,9.0000001 c -1.469845,0 -2.9388456,0.5873872 -4.059495,1.7058289 -2.2412588,2.236891 -2.2412588,5.854755 0,8.091647 1.7743708,1.770867 4.4065391,2.128859 6.5456729,1.095853 0.056267,-0.02721 0.1274312,-0.05292 0.1829934,-0.08203 0.3334768,-0.131456 1.1438766,-0.383157 1.5796276,0.0064 0.435752,0.389446 0.320078,0.838532 0.843449,1.360878 L 13.673132,23 l 1.32512,-1.402944 -1.794171,-1.785758 c -0.523371,-0.522345 -0.938229,-0.408648 -1.367187,-0.912861 -0.428958,-0.504212 0.0542,-1.59093 0.08624,-1.659554 1.035018,-2.1349 0.659589,-4.76218 -1.114784,-6.533054 C 9.6876943,9.5873873 8.2102851,9.0000001 6.7404391,9.0000001 Z M 6.7194067,10.747897 A 3.9722949,3.9722949 0 0 1 10.692663,14.71905 3.9722949,3.9722949 0 0 1 6.7194056,18.692308 3.9722949,3.9722949 0 0 1 2.7482517,14.71905 3.9722949,3.9722949 0 0 1 6.7194067,10.747897 Z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 7,1 C 3.6951749,1 1,3.695175 1,7 c 0,3.304825 2.6951749,6 6,6 1.1597667,0 2.2406824,-0.338405 3.160156,-0.912109 l 2.763672,2.765625 c 0.195481,0.196523 0.513503,0.196523 0.708984,0 l 1.220704,-1.222657 c 0.195151,-0.195271 0.195151,-0.51176 0,-0.707031 L 12.089844,10.160156 C 12.663219,9.2408655 13,8.1594062 13,7 13,3.695175 10.304825,1 7,1 Z m 0,1.5 c 2.4941648,0 4.5,2.005835 4.5,4.5 0,2.494165 -2.0058352,4.5 -4.5,4.5 C 4.5058352,11.5 2.5,9.494165 2.5,7 2.5,4.505835 4.5058352,2.5 7,2.5 Z"
+       transform="translate(0,8)"
+       id="circle818"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssccccccsssssss" />
+    <circle
+       r="5.25"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.50000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="circle1483"
+       cx="-13"
+       cy="15.000001" />
+    <rect
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="rect1485"
+       width="3.9282172"
+       height="1.7284168"
+       x="7.2274308"
+       y="18.934778"
+       transform="matrix(0.70707151,0.70714205,-0.70707151,0.70714205,0,0)" />
     <path
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       d="m 6.2259259,11.725925 v 2.5 h -2.5 v 1 h 2.5 v 2.5 h 1 v -2.5 h 2.5 v -1 h -2.5 v -2.5 z"
-       id="rect9844"
-       inkscape:connector-curvature="0" />
+       id="path4979"
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.0142425,15 H 9.9857576 M 7.0000001,12.014242 v 5.971515"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/magnifier-plus.svg b/rtdata/images/themed/svg/magnifier-plus.svg
index 9b3963fca..a98c19bad 100644
--- a/rtdata/images/themed/svg/magnifier-plus.svg
+++ b/rtdata/images/themed/svg/magnifier-plus.svg
@@ -42,10 +42,11 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
-     inkscape:object-nodes="false"
+     inkscape:object-nodes="true"
      inkscape:snap-grids="true"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-global="true">
+     inkscape:snap-midpoints="false"
+     inkscape:snap-smooth-nodes="false">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -64,7 +65,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -101,13 +102,28 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55112457;marker:none;enable-background:accumulate"
-       d="M 10.02069,1 C 7.7109336,1 5.4025041,1.9230371 3.6414836,3.6805883 c -3.52197814,3.5151143 -3.52197814,9.2003287 0,12.7154447 2.788297,2.782792 6.9245614,3.345351 10.2860574,1.722055 0.08842,-0.04275 0.200249,-0.08316 0.287561,-0.128903 0.524035,-0.206573 1.79752,-0.602103 2.482272,0.01 0.684753,0.611986 0.502979,1.317693 1.32542,2.138522 L 20.914921,23 22.997253,20.795373 20.177842,17.989182 c -0.82244,-0.820827 -1.474361,-0.64216 -2.148437,-1.434495 -0.674077,-0.792333 0.08517,-2.500033 0.13552,-2.607871 C 19.791381,10.591973 19.201422,6.4633903 16.413122,3.6805883 14.652091,1.9230371 12.330448,1 10.02069,1 Z M 9.9876392,3.7466949 A 6.2421776,6.2421776 0 0 1 16.231328,9.9870795 6.2421776,6.2421776 0 0 1 9.9876375,16.230769 6.2421776,6.2421776 0 0 1 3.7472529,9.9870795 6.2421776,6.2421776 0 0 1 9.9876392,3.7466949 Z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
+       id="path814" />
+    <circle
+       r="8"
+       cy="10"
+       cx="-30"
+       id="circle818"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <rect
+       transform="rotate(45)"
+       y="26.870058"
+       x="-4.2426414"
+       height="2.5927444"
+       width="5.8925962"
+       id="rect820"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     <path
-       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       d="M 9 5 L 9 9 L 5 9 L 5 11 L 9 11 L 9 15 L 11 15 L 11 11 L 15 11 L 15 9 L 11 9 L 11 5 L 9 5 z "
-       id="rect9179" />
+       id="path4979"
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6,10 h 8 M 10,6 v 8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/magnifier.svg b/rtdata/images/themed/svg/magnifier.svg
index 5b837005d..3b7ae2fd2 100644
--- a/rtdata/images/themed/svg/magnifier.svg
+++ b/rtdata/images/themed/svg/magnifier.svg
@@ -26,9 +26,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="23.864854"
-     inkscape:cx="4.5449276"
-     inkscape:cy="11.901816"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -63,7 +63,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -100,9 +100,22 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55112457;marker:none;enable-background:accumulate"
-       d="M 10.02069,1 C 7.7109336,1 5.4025041,1.9230371 3.6414836,3.6805883 c -3.52197814,3.5151143 -3.52197814,9.2003287 0,12.7154447 2.788297,2.782792 6.9245614,3.345351 10.2860574,1.722055 0.08842,-0.04275 0.200249,-0.08316 0.287561,-0.128903 0.524035,-0.206573 1.79752,-0.602103 2.482272,0.01 0.684753,0.611986 0.502979,1.317693 1.32542,2.138522 L 20.914921,23 22.997253,20.795373 20.177842,17.989182 c -0.82244,-0.820827 -1.474361,-0.64216 -2.148437,-1.434495 -0.674077,-0.792333 0.08517,-2.500033 0.13552,-2.607871 C 19.791381,10.591973 19.201422,6.4633903 16.413122,3.6805883 14.652091,1.9230371 12.330448,1 10.02069,1 Z M 9.9876392,3.7466949 A 6.2421776,6.2421776 0 0 1 16.231328,9.9870795 6.2421776,6.2421776 0 0 1 9.9876375,16.230769 6.2421776,6.2421776 0 0 1 3.7472529,9.9870795 6.2421776,6.2421776 0 0 1 9.9876392,3.7466949 Z"
-       id="path3803"
-       inkscape:connector-curvature="0" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 10 1 C 5.0412819 1 1 5.0412819 1 10 C 1 14.958718 5.0412819 19 10 19 C 12.045471 19 13.929364 18.304475 15.443359 17.148438 C 15.073392 17.540358 15.075431 18.155432 15.458984 18.539062 L 19.626953 22.707031 C 20.0175 23.0975 20.650469 23.0975 21.041016 22.707031 L 22.873047 20.873047 C 23.263516 20.4825 23.263516 19.849531 22.873047 19.458984 L 18.707031 15.292969 C 18.316484 14.9025 17.683516 14.9025 17.292969 15.292969 L 17.166016 15.419922 C 18.311336 13.909868 19 12.034977 19 10 C 19 5.0412819 14.958718 1 10 1 z M 10 3 C 13.877838 3 17 6.1221621 17 10 C 17 13.877838 13.877838 17 10 17 C 6.1221621 17 3 13.877838 3 10 C 3 6.1221621 6.1221621 3 10 3 z "
+       id="path814" />
+    <circle
+       r="8"
+       cy="10"
+       cx="-30"
+       id="circle818"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <rect
+       transform="rotate(45)"
+       y="26.870058"
+       x="-4.2426414"
+       height="2.5927444"
+       width="5.8925962"
+       id="rect820"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/one-to-one.svg b/rtdata/images/themed/svg/one-to-one-small.svg
similarity index 100%
rename from rtdata/images/themed/svg/one-to-one.svg
rename to rtdata/images/themed/svg/one-to-one-small.svg
diff --git a/rtdata/images/themed/svg/padlock-locked.svg b/rtdata/images/themed/svg/padlock-locked-small.svg
similarity index 100%
rename from rtdata/images/themed/svg/padlock-locked.svg
rename to rtdata/images/themed/svg/padlock-locked-small.svg
diff --git a/rtdata/images/themed/svg/padlock-unlocked.svg b/rtdata/images/themed/svg/padlock-unlocked-small.svg
similarity index 100%
rename from rtdata/images/themed/svg/padlock-unlocked.svg
rename to rtdata/images/themed/svg/padlock-unlocked-small.svg
diff --git a/rtdata/images/themed/svg/perspective-horizontal-left-small.svg b/rtdata/images/themed/svg/perspective-horizontal-left-small.svg
new file mode 100644
index 000000000..c4797a6a2
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-horizontal-left-small.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="perspective-horizontal-left-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="50.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       id="path1207"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m -18.5,10.5 13,2 v 7 l -13,2 z"
+       id="rect1209"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path892"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 6.6071429,11.622449 v 8.755102 m 5.1937041,-8.013144 v 7.271186 M 14.15,17.269231 2.3313953,17.918605 M 14.15,14.730769 2.3313953,14.081395 M 14.15,19.3 2.3313953,20.988372 V 11.011628 L 14.15,12.7 Z"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/perspective-horizontal-right-small.svg b/rtdata/images/themed/svg/perspective-horizontal-right-small.svg
new file mode 100644
index 000000000..4721117c8
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-horizontal-right-small.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="perspective-horizontal-right-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="50.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       id="path1207"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m -18.5,10.5 13,2 v 7 l -13,2 z"
+       id="rect1209"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path892"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.00157475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 9.8742524,11.622449 v 8.755102 M 4.6805483,12.364407 v 7.271186 M 2.3313953,17.269231 14.15,17.918605 M 2.3313953,14.730769 14.15,14.081395 M 2.3313953,19.3 14.15,20.988372 V 11.011628 L 2.3313953,12.7 Z"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/perspective-vertical-bottom-small.svg b/rtdata/images/themed/svg/perspective-vertical-bottom-small.svg
new file mode 100644
index 000000000..80f023b74
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-vertical-bottom-small.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="perspective-vertical-bottom-small.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/tmp/template.png"
+   id="SVGRoot"
+   version="1.1"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16">
+  <sodipodi:namedview
+     inkscape:snap-grids="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:grid-bbox="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="1019"
+     inkscape:window-width="1920"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="8"
+     inkscape:cx="8"
+     inkscape:zoom="50.75"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     bordercolor="#666768"
+     pagecolor="#E0E1E2"
+     id="base">
+    <inkscape:grid
+       spacingy="0.5"
+       spacingx="0.5"
+       dotted="false"
+       empspacing="7"
+       originy="1"
+       originx="1"
+       id="grid1374"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-8)"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1207"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       d="M 2.9162881,17.179006 H 13.088261 M 3.7783196,12.788459 H 12.22623 M 9.4769099,10.802581 10.231374,20.793549 M 6.5276395,10.802581 5.773175,20.793549 m 6.063151,-9.990968 1.961607,9.990968 H 2.2066156 l 1.9616076,-9.990968 z"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       id="path992"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m -18.387811,21.496377 2.323667,-10.989672 h 8.132837 l 2.323667,10.989672 z"
+       id="path1014"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/perspective-vertical-top-small.svg b/rtdata/images/themed/svg/perspective-vertical-top-small.svg
new file mode 100644
index 000000000..1ec0fafa7
--- /dev/null
+++ b/rtdata/images/themed/svg/perspective-vertical-top-small.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="perspective-vertical-top-small.svg"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   inkscape:export-ydpi="96"
+   inkscape:export-xdpi="96"
+   inkscape:export-filename="/tmp/template.png"
+   id="SVGRoot"
+   version="1.1"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16">
+  <sodipodi:namedview
+     inkscape:snap-grids="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:grid-bbox="true"
+     inkscape:window-maximized="1"
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="1019"
+     inkscape:window-width="1920"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:document-units="px"
+     inkscape:cy="8"
+     inkscape:cx="8"
+     inkscape:zoom="50.75"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     bordercolor="#666768"
+     pagecolor="#E0E1E2"
+     id="base">
+    <inkscape:grid
+       spacingy="0.5"
+       spacingx="0.5"
+       dotted="false"
+       empspacing="7"
+       originy="1"
+       originx="1"
+       id="grid1374"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-8)"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path1207"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 21.5,18.5 h 13 m -13,-5 h 13 m -4,-3 v 11 m -5,-11 v 11 m -4,-11 h 13 v 11 h -13 z"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       d="M 2.9162881,14.417124 H 13.088261 M 3.7783196,18.807671 H 12.22623 M 9.4769099,20.793549 10.231374,10.802581 M 6.5276395,20.793549 5.773175,10.802581 m 6.063151,9.990968 1.961607,-9.990968 H 2.2066156 l 1.9616076,9.990968 z"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       id="path992"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d40000;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m -18.387811,21.496377 2.323667,-10.989672 h 8.132837 l 2.323667,10.989672 z"
+       id="path1014"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/power-inconsistent.svg b/rtdata/images/themed/svg/power-inconsistent-small.svg
similarity index 100%
rename from rtdata/images/themed/svg/power-inconsistent.svg
rename to rtdata/images/themed/svg/power-inconsistent-small.svg
diff --git a/rtdata/images/themed/svg/power-off.svg b/rtdata/images/themed/svg/power-off-small.svg
similarity index 100%
rename from rtdata/images/themed/svg/power-off.svg
rename to rtdata/images/themed/svg/power-off-small.svg
diff --git a/rtdata/images/themed/svg/power-on.svg b/rtdata/images/themed/svg/power-on-small.svg
similarity index 100%
rename from rtdata/images/themed/svg/power-on.svg
rename to rtdata/images/themed/svg/power-on-small.svg
diff --git a/rtdata/images/themed/svg/rotate-left-small.svg b/rtdata/images/themed/svg/rotate-left-small.svg
new file mode 100644
index 000000000..d85b5e8ea
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-left-small.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="rotate-left-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="50.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 5.268672,12.405793 c -0.0019,0.0019 -0.0038,0.0039 -0.0057,0.0058"
+       id="path1029"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1597-3"
+       d="M 3.390028,10.527595 7.1358337,14.295686 2,15.656154 Z"
+       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.54308969"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 6.511406,20.495343 a 5,5 0 0 0 1.1548863,0.39684 5,5 0 0 0 1.2161127,0.105074"
+       id="path1085"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-1.0007498"
+       inkscape:transform-center-y="4.7347907" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 4.701135,19 a 5,5 0 0 0 0.887626,0.913413"
+       id="path1096"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-3.5527073"
+       inkscape:transform-center-y="3.443561" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 3.863677,17.263528 a 5,5 0 0 0 0.303842,0.84478"
+       id="path1103"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-4.6820573"
+       inkscape:transform-center-y="1.6727725" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="M 13.549711,17.212025 A 5,5 0 0 0 13.698835,16 a 5,5 0 0 0 -5,-5 5,5 0 0 0 -3.459061,1.389612"
+       id="path1078" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 10.454545,20.681611 a 5,5 0 0 0 2.48396,-2.031101"
+       id="path1105" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/rotate-left.svg b/rtdata/images/themed/svg/rotate-left.svg
index ae39ab89c..c66020379 100644
--- a/rtdata/images/themed/svg/rotate-left.svg
+++ b/rtdata/images/themed/svg/rotate-left.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     inkscape:cx="7.6740741"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -67,7 +67,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
@@ -106,33 +106,33 @@
     <path
        sodipodi:nodetypes="cscssccsscc"
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="M 7.4212469,3.6242345 C 8.005676,3.2686506 8.6251811,2.9724374 9.269822,2.7394262 c 1.159632,-0.4191596 2.352952,-0.61204 3.527621,-0.6003228 0.328908,0.00328 0.656137,0.022132 0.981185,0.056897 3.797386,0.4061457 7.256535,2.9223504 8.623978,6.7219883 0.602852,1.6751093 0.733742,3.4183743 0.463306,5.0789383 L 19.558911,13.473242 C 19.746075,12.350686 19.662878,11.176085 19.259331,10.05477 17.988127,6.5225478 13.9306,4.6115657 10.404281,5.8861852 9.9449434,6.0522166 9.5016342,6.2684684 9.0863577,6.5283098 Z"
+       d="M 5.657714,5.0739174 C 6.130198,4.5791883 6.651928,4.1327287 7.214296,3.7408118 8.225928,3.0357998 9.328665,2.5406377 10.466341,2.247929 10.78489,2.1659695 11.105849,2.0994861 11.428819,2.0489379 15.20193,1.4584087 19.194453,2.9935821 21.49872,6.3098302 c 1.015861,1.4620018 1.593481,3.1119896 1.762046,4.7859648 l -3.329858,0.350074 C 19.821156,10.313122 19.436785,9.2000776 18.756771,8.2214161 16.614675,5.1385632 12.200807,4.3428615 9.12454,6.486728 8.723826,6.7659874 8.351592,7.0896074 8.017718,7.4480763 Z"
        id="path7246"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="m 6.2415019,14.759813 c 0.1354767,0.376442 0.3033704,0.734056 0.4981397,1.071757 L 3.8367277,17.49552 C 3.5484565,16.992167 3.3005745,16.458848 3.0982264,15.896595 Z"
+       d="m 7.400268,16.135401 c 0.228291,0.328551 0.483021,0.630525 0.758557,0.906309 L 5.785488,19.400292 C 5.376762,18.9887 4.999293,18.53771 4.658317,18.046987 Z"
        id="path7240"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="m 18.994585,15.300917 3.03761,1.410816 c -0.827276,1.788468 -2.155072,3.343835 -3.869005,4.420558 l -1.771938,-2.83905 c 1.149046,-0.726696 2.043631,-1.781304 2.603333,-2.992324 z"
+       d="m 19.858848,13.357326 3.299252,0.576553 c -0.336197,1.941642 -1.216191,3.78767 -2.593047,5.271303 l -2.446361,-2.283701 c 0.921811,-0.999329 1.512961,-2.249538 1.740156,-3.564155 z"
        id="path7236"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="m 7.9066139,17.324828 c 0.4633474,0.448072 0.9864998,0.828642 1.5501559,1.13446 L 7.867134,21.414454 C 7.030885,20.961202 6.2540607,20.394861 5.5668648,19.72612 Z"
+       d="m 9.672517,18.182052 c 0.563529,0.312882 1.167355,0.545082 1.790956,0.694595 l -0.770617,3.265899 C 9.767791,21.921175 8.870857,21.575189 8.033994,21.107094 Z"
        id="path7234"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="m 14.641375,19.073544 0.925449,3.215268 c -1.687758,0.481512 -3.422412,0.500398 -5.055716,0.125406 l 0.718762,-3.27681 c 1.105594,0.260514 2.278073,0.255438 3.411505,-0.06387 z"
+       d="m 16.630398,18.128098 1.726088,2.866186 c -1.505625,0.901929 -3.176284,1.369133 -4.850989,1.429649 l -0.15383,-3.351185 c 1.135347,-0.03451 2.266561,-0.342874 3.278729,-0.944656 z"
        id="path9832"
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        id="path1597"
-       d="M 5.8205798,0.83279215 10.687025,9.3197522 0.9042038,9.2918843 Z"
+       d="M 3.38911,2.7918742 10.286322,9.7301195 0.82963,12.235182 Z"
        style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
        sodipodi:nodetypes="cccc" />
   </g>
diff --git a/rtdata/images/themed/svg/rotate-right-small.svg b/rtdata/images/themed/svg/rotate-right-small.svg
new file mode 100644
index 000000000..89e6d4ac2
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-right-small.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="rotate-right-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="50.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-nodes="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-paths="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:bbox-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       d="m 11.430163,12.405793 c 0.0019,0.0019 0.0038,0.0039 0.0057,0.0058"
+       id="path1029"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path1597-3"
+       d="m 13.308807,10.527595 -3.7458057,3.768091 5.1358337,1.360468 z"
+       style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.54308969"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="M 10.187429,20.495343 A 5,5 0 0 1 9.0325427,20.892183 5,5 0 0 1 7.81643,20.997257"
+       id="path1085"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-1.0007498"
+       inkscape:transform-center-y="4.7347907" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 11.9977,19 a 5,5 0 0 1 -0.887626,0.913413"
+       id="path1096"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-3.5527073"
+       inkscape:transform-center-y="3.443561" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="m 12.835158,17.263528 a 5,5 0 0 1 -0.303842,0.84478"
+       id="path1103"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-4.6820573"
+       inkscape:transform-center-y="1.6727725" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="M 3.1491244 9.2120253 A 5 5 0 0 1 3 8 A 5 5 0 0 1 8 3 A 5 5 0 0 1 11.459061 4.3896124 "
+       id="path1078"
+       transform="translate(0,8)" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2;stroke-opacity:1;paint-order:normal"
+       d="M 6.2442904 12.681611 A 5 5 0 0 1 3.7603303 10.65051 "
+       id="path1105"
+       transform="translate(0,8)" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/rotate-right.svg b/rtdata/images/themed/svg/rotate-right.svg
index bf0314ef2..26a46a3f6 100644
--- a/rtdata/images/themed/svg/rotate-right.svg
+++ b/rtdata/images/themed/svg/rotate-right.svg
@@ -26,8 +26,8 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="33.75"
-     inkscape:cx="7.6740741"
+     inkscape:zoom="1"
+     inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -106,33 +106,33 @@
     <path
        sodipodi:nodetypes="cscssccsscc"
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="M 16.482957,3.6242345 C 15.898528,3.2686506 15.279023,2.9724374 14.634382,2.7394262 13.47475,2.3202666 12.28143,2.1273862 11.106761,2.1391034 10.777853,2.1423834 10.450624,2.1612354 10.125576,2.1960004 6.32819,2.6021461 2.869041,5.1183508 1.501598,8.9179887 0.898746,10.593098 0.767856,12.336363 1.038292,13.996927 L 4.345293,13.473242 C 4.158129,12.350686 4.241326,11.176085 4.644873,10.05477 5.916077,6.5225478 9.973604,4.6115657 13.499923,5.8861852 c 0.459338,0.1660314 0.902647,0.3822832 1.317923,0.6421246 z"
+       d="M 18.432682,5.0739174 C 17.960198,4.5791883 17.438468,4.1327287 16.8761,3.7408118 15.864468,3.0357998 14.761731,2.5406377 13.624055,2.247929 13.305506,2.1659695 12.984547,2.0994861 12.661577,2.0489379 8.8884658,1.4584087 4.8959427,2.9935821 2.5916756,6.3098302 1.5758151,7.771832 0.99819486,9.4218198 0.82963039,11.095795 L 4.1594877,11.445869 C 4.26924,10.313122 4.6536113,9.2000776 5.3336254,8.2214161 7.4757206,5.1385632 11.889589,4.3428615 14.965856,6.486728 c 0.400714,0.2792594 0.772948,0.6028794 1.106822,0.9613483 z"
        id="path7246"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="m 17.662702,14.759813 c -0.135477,0.376442 -0.30337,0.734056 -0.49814,1.071757 l 2.902914,1.66395 c 0.288271,-0.503353 0.536153,-1.036672 0.738502,-1.598925 z"
+       d="m 16.690128,16.135401 c -0.228291,0.328551 -0.483021,0.630525 -0.758557,0.906309 l 2.373337,2.358582 c 0.408726,-0.411592 0.786195,-0.862582 1.127171,-1.353305 z"
        id="path7240"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="m 4.909619,15.300917 -3.03761,1.410816 c 0.827276,1.788468 2.155072,3.343835 3.869005,4.420558 l 1.771938,-2.83905 C 6.363906,17.566545 5.469321,16.511937 4.909619,15.300917 Z"
+       d="m 4.2315477,13.357326 -3.29925202,0.576553 c 0.33619772,1.941642 1.21619152,3.78767 2.59304722,5.271303 L 5.9717038,16.921481 C 5.0498934,15.922152 4.4587433,14.671943 4.2315477,13.357326 Z"
        id="path7236"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="m 15.99759,17.324828 c -0.463347,0.448072 -0.9865,0.828642 -1.550156,1.13446 l 1.589636,2.955166 c 0.836249,-0.453252 1.613073,-1.019593 2.300269,-1.688334 z"
+       d="m 14.417879,18.182052 c -0.563529,0.312882 -1.167355,0.545082 -1.790956,0.694595 l 0.770617,3.265899 c 0.925065,-0.221371 1.821999,-0.567357 2.658862,-1.035452 z"
        id="path7234"
        inkscape:connector-curvature="0" />
     <path
        style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       d="M 9.262829,19.073544 8.33738,22.288812 c 1.687758,0.481512 3.422412,0.500398 5.055716,0.125406 l -0.718762,-3.27681 c -1.105594,0.260514 -2.278073,0.255438 -3.411505,-0.06387 z"
+       d="m 7.4599979,18.128098 -1.7260877,2.866186 c 1.5056246,0.901929 3.1762836,1.369133 4.8509888,1.429649 l 0.15383,-3.351185 C 9.6033817,19.038237 8.4721677,18.729874 7.4599995,18.128092 Z"
        id="path9832"
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
        id="path1597"
-       d="M 18.083624,0.83279215 13.217179,9.3197522 23,9.2918843 Z"
+       d="m 20.701286,2.7918742 -6.897212,6.9382453 9.456692,2.5050625 z"
        style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.99999994"
        sodipodi:nodetypes="cccc" />
   </g>
diff --git a/rtdata/images/themed/svg/rotate-straighten-small.svg b/rtdata/images/themed/svg/rotate-straighten-small.svg
new file mode 100644
index 000000000..00da936f8
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-straighten-small.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="rotate-straighten-small.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="50.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="7"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     transform="translate(0,-8)">
+    <path
+       style="opacity:0.7;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2,1;stroke-dashoffset:2.4;stroke-opacity:1"
+       d="M 1,22 15,18"
+       id="path886"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:nodetypes="cc"
+       style="opacity:0.9;fill:none;fill-rule:evenodd;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1,22.5 H 15"
+       id="path888"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path890"
+       d="M 14.99615,13.144029 14.012235,17 10.466293,15.193649 Z"
+       style="display:inline;opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:0.0216444" />
+    <path
+       sodipodi:nodetypes="cc"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1.86449265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       d="m 7.6181805,10.843357 c 2.2119757,0 4.2161825,1.303531 5.1130595,3.325522"
+       id="path937"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:0.62149757;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.24299514, 1.24299514;stroke-dashoffset:1;stroke-opacity:1;paint-order:normal"
+       d="M 2.7738413,19.233149 A 5.5934781,5.5934781 0 0 1 2.0247024,16.436835 5.5934781,5.5934781 0 0 1 7.6181805,10.843357"
+       id="path942"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/trash-remove-small.svg b/rtdata/images/themed/svg/trash-remove-small.svg
index 7a956c2e3..a58bafd39 100644
--- a/rtdata/images/themed/svg/trash-remove-small.svg
+++ b/rtdata/images/themed/svg/trash-remove-small.svg
@@ -26,12 +26,12 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="11.659093"
-     inkscape:cy="1.8102278"
+     inkscape:zoom="51.375"
+     inkscape:cx="8"
+     inkscape:cy="8"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      inkscape:window-width="1920"
      inkscape:window-height="1019"
      inkscape:window-x="0"
@@ -64,7 +64,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>Maciej Dworak</dc:title>
diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc
index c7dfd0020..469094fb8 100644
--- a/rtgui/blackwhite.cc
+++ b/rtgui/blackwhite.cc
@@ -179,18 +179,18 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
 
     //----------- RGB / ROYGCBPM Mixer ------------------------------
 
-    imgIcon[0] = Gtk::manage (new RTImage ("circle-red.png"));
-    imgIcon[1] = Gtk::manage (new RTImage ("circle-orange.png"));
-    imgIcon[2] = Gtk::manage (new RTImage ("circle-yellow.png"));
-    imgIcon[3] = Gtk::manage (new RTImage ("circle-green.png"));
-    imgIcon[4] = Gtk::manage (new RTImage ("circle-cyan.png"));
-    imgIcon[5] = Gtk::manage (new RTImage ("circle-blue.png"));
-    imgIcon[6] = Gtk::manage (new RTImage ("circle-purple.png"));
-    imgIcon[7] = Gtk::manage (new RTImage ("circle-magenta.png"));
+    imgIcon[0] = Gtk::manage (new RTImage ("circle-red-small.png"));
+    imgIcon[1] = Gtk::manage (new RTImage ("circle-orange-small.png"));
+    imgIcon[2] = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    imgIcon[3] = Gtk::manage (new RTImage ("circle-green-small.png"));
+    imgIcon[4] = Gtk::manage (new RTImage ("circle-cyan-small.png"));
+    imgIcon[5] = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    imgIcon[6] = Gtk::manage (new RTImage ("circle-purple-small.png"));
+    imgIcon[7] = Gtk::manage (new RTImage ("circle-magenta-small.png"));
 
-    imgIcon[8]  = Gtk::manage (new RTImage ("circle-empty-red.png"));
-    imgIcon[9]  = Gtk::manage (new RTImage ("circle-empty-green.png"));
-    imgIcon[10] = Gtk::manage (new RTImage ("circle-empty-blue.png"));
+    imgIcon[8]  = Gtk::manage (new RTImage ("circle-empty-red-small.png"));
+    imgIcon[9]  = Gtk::manage (new RTImage ("circle-empty-green-small.png"));
+    imgIcon[10] = Gtk::manage (new RTImage ("circle-empty-blue-small.png"));
 
     mixerVBox->pack_start (*Gtk::manage (new  Gtk::HSeparator()));
 
diff --git a/rtgui/cacorrection.cc b/rtgui/cacorrection.cc
index 4dbf09af6..ffaa57c34 100644
--- a/rtgui/cacorrection.cc
+++ b/rtgui/cacorrection.cc
@@ -26,10 +26,10 @@ using namespace rtengine::procparams;
 CACorrection::CACorrection () : FoldableToolPanel(this, "cacorrection", M("TP_CACORRECTION_LABEL"))
 {
 
-    Gtk::Image* icaredL =   Gtk::manage (new RTImage ("circle-red-cyan.png"));
-    Gtk::Image* icaredR =   Gtk::manage (new RTImage ("circle-cyan-red.png"));
-    Gtk::Image* icablueL =  Gtk::manage (new RTImage ("circle-blue-yellow.png"));
-    Gtk::Image* icablueR =  Gtk::manage (new RTImage ("circle-yellow-blue.png"));
+    Gtk::Image* icaredL =   Gtk::manage (new RTImage ("circle-red-cyan-small.png"));
+    Gtk::Image* icaredR =   Gtk::manage (new RTImage ("circle-cyan-red-small.png"));
+    Gtk::Image* icablueL =  Gtk::manage (new RTImage ("circle-blue-yellow-small.png"));
+    Gtk::Image* icablueR =  Gtk::manage (new RTImage ("circle-yellow-blue-small.png"));
 
     red = Gtk::manage (new Adjuster (M("TP_CACORRECTION_RED"), -0.005, 0.005, 0.0001, 0, icaredL, icaredR));
     red->setAdjusterListener (this);
diff --git a/rtgui/chmixer.cc b/rtgui/chmixer.cc
index c82c5c813..1e3bb395e 100644
--- a/rtgui/chmixer.cc
+++ b/rtgui/chmixer.cc
@@ -25,15 +25,15 @@ using namespace rtengine::procparams;
 ChMixer::ChMixer (): FoldableToolPanel(this, "chmixer", M("TP_CHMIXER_LABEL"), false, true)
 {
 
-    imgIcon[0] = Gtk::manage (new RTImage ("circle-red.png"));
-    imgIcon[1] = Gtk::manage (new RTImage ("circle-green-red.png"));
-    imgIcon[2] = Gtk::manage (new RTImage ("circle-blue-red.png"));
-    imgIcon[3] = Gtk::manage (new RTImage ("circle-red-green.png"));
-    imgIcon[4] = Gtk::manage (new RTImage ("circle-green.png"));
-    imgIcon[5] = Gtk::manage (new RTImage ("circle-blue-green.png"));
-    imgIcon[6] = Gtk::manage (new RTImage ("circle-red-blue.png"));
-    imgIcon[7] = Gtk::manage (new RTImage ("circle-green-blue.png"));
-    imgIcon[8] = Gtk::manage (new RTImage ("circle-blue.png"));
+    imgIcon[0] = Gtk::manage (new RTImage ("circle-red-small.png"));
+    imgIcon[1] = Gtk::manage (new RTImage ("circle-green-red-small.png"));
+    imgIcon[2] = Gtk::manage (new RTImage ("circle-blue-red-small.png"));
+    imgIcon[3] = Gtk::manage (new RTImage ("circle-red-green-small.png"));
+    imgIcon[4] = Gtk::manage (new RTImage ("circle-green-small.png"));
+    imgIcon[5] = Gtk::manage (new RTImage ("circle-blue-green-small.png"));
+    imgIcon[6] = Gtk::manage (new RTImage ("circle-red-blue-small.png"));
+    imgIcon[7] = Gtk::manage (new RTImage ("circle-green-blue-small.png"));
+    imgIcon[8] = Gtk::manage (new RTImage ("circle-blue-small.png"));
 
     Gtk::Label* rlabel = Gtk::manage (new Gtk::Label ());
     rlabel->set_markup (Glib::ustring("\t<span foreground=\"#b00000\"><b>") + M("TP_CHMIXER_RED") + Glib::ustring(":</b></span>"));
diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc
index d9d817272..2e83d63d9 100644
--- a/rtgui/colorappearance.cc
+++ b/rtgui/colorappearance.cc
@@ -268,10 +268,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
     wbmHBox->pack_start (*wbmodel);
     p1VBox->pack_start (*wbmHBox);
 
-    Gtk::Image* itempL =  Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* itempR =  Gtk::manage (new RTImage ("circle-yellow.png"));
-    Gtk::Image* igreenL = Gtk::manage (new RTImage ("circle-magenta.png"));
-    Gtk::Image* igreenR = Gtk::manage (new RTImage ("circle-green.png"));
+    Gtk::Image* itempL =  Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* itempR =  Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    Gtk::Image* igreenL = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+    Gtk::Image* igreenR = Gtk::manage (new RTImage ("circle-green-small.png"));
 
 
     tempsc = Gtk::manage (new Adjuster (M ("TP_WBALANCE_TEMPERATURE"), MINTEMP0, MAXTEMP0, 5, CENTERTEMP0, itempL, itempR, &wbSlider2Temp, &wbTemp2Slider));
@@ -575,10 +575,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
     p3VBox = Gtk::manage ( new Gtk::VBox());
     p3VBox->set_spacing (2);
 
-    Gtk::Image* itempL1 =  Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* itempR1 =  Gtk::manage (new RTImage ("circle-yellow.png"));
-    Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("circle-magenta.png"));
-    Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("circle-green.png"));
+    Gtk::Image* itempL1 =  Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* itempR1 =  Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+    Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("circle-green-small.png"));
 //   adaplum = Gtk::manage (new Adjuster (M ("TP_COLORAPP_ADAPTVIEWING"), 0.1,  16384., 0.1,   16.));
     adaplum = Gtk::manage (new Adjuster (M ("TP_COLORAPP_ADAPTVIEWING"), MINLA0, MAXLA0, 0.01, 16, NULL, NULL, &wbSlider2la, &wbla2Slider));
 
@@ -590,8 +590,8 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
     adaplum->set_tooltip_markup (M ("TP_COLORAPP_ADAPTVIEWING_TOOLTIP"));
     p3VBox->pack_start (*adaplum);
 
-//   Gtk::Image* iblueredL = Gtk::manage (new RTImage ("circle-blue.png"));
-//   Gtk::Image* iblueredR = Gtk::manage (new RTImage ("circle-red.png"));
+//   Gtk::Image* iblueredL = Gtk::manage (new RTImage ("circle-blue-small.png"));
+//   Gtk::Image* iblueredR = Gtk::manage (new RTImage ("circle-red-small.png"));
 
     degreeout  = Gtk::manage (new Adjuster (M ("TP_COLORAPP_CIECAT_DEGREE"),    0.,  100.,  1.,   100.));
 
@@ -604,10 +604,10 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel (this, "colorappearance"
     degreeout->set_tooltip_markup (M ("TP_COLORAPP_DEGREE_TOOLTIP"));
     p3VBox->pack_start (*degreeout);
     /*
-        Gtk::Image* itempL1 =  Gtk::manage (new RTImage ("circle-blue.png"));
-        Gtk::Image* itempR1 =  Gtk::manage (new RTImage ("circle-yellow.png"));
-        Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("circle-magenta.png"));
-        Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("circle-green.png"));
+        Gtk::Image* itempL1 =  Gtk::manage (new RTImage ("circle-blue-small.png"));
+        Gtk::Image* itempR1 =  Gtk::manage (new RTImage ("circle-yellow-small.png"));
+        Gtk::Image* igreenL1 = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+        Gtk::Image* igreenR1 = Gtk::manage (new RTImage ("circle-green-small.png"));
     */
     tempout = Gtk::manage (new Adjuster (M ("TP_WBALANCE_TEMPERATURE"), MINTEMP0, MAXTEMP0, 5, CENTERTEMP0, itempR1, itempL1, &wbSlider2Temp, &wbTemp2Slider));
     greenout = Gtk::manage (new Adjuster (M ("TP_WBALANCE_GREEN"), MINGREEN0, MAXGREEN0, 0.001, 1.0, igreenR1, igreenL1));
diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc
index 75a2b21b9..0d60b769e 100644
--- a/rtgui/colortoning.cc
+++ b/rtgui/colortoning.cc
@@ -104,8 +104,8 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
     pack_start( *opacityCurveEditorG, Gtk::PACK_SHRINK, 2);
 
     //---------Chroma curve 1 --------------------
-    iby   = Gtk::manage (new RTImage ("circle-yellow-blue.png"));
-    irg   = Gtk::manage (new RTImage ("circle-green-red.png"));
+    iby   = Gtk::manage (new RTImage ("circle-yellow-blue-small.png"));
+    irg   = Gtk::manage (new RTImage ("circle-green-red-small.png"));
 
     clCurveEditorG = new CurveEditorGroup (options.lastColorToningCurvesDir, M("TP_COLORTONING_CHROMAC"));
     clCurveEditorG->setCurveListener (this);
@@ -226,26 +226,26 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
     Gtk::VBox *chanMixerMidBox = Gtk::manage (new Gtk::VBox());
     Gtk::VBox *chanMixerShadowsBox = Gtk::manage (new Gtk::VBox());
 
-    Gtk::Image* iblueR   = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* iyelL    = Gtk::manage (new RTImage ("circle-yellow.png"));
-    Gtk::Image* imagL    = Gtk::manage (new RTImage ("circle-magenta.png"));
-    Gtk::Image* igreenR  = Gtk::manage (new RTImage ("circle-green.png"));
-    Gtk::Image* icyanL   = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* iredR    = Gtk::manage (new RTImage ("circle-red.png"));
+    Gtk::Image* iblueR   = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* iyelL    = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    Gtk::Image* imagL    = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+    Gtk::Image* igreenR  = Gtk::manage (new RTImage ("circle-green-small.png"));
+    Gtk::Image* icyanL   = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* iredR    = Gtk::manage (new RTImage ("circle-red-small.png"));
 
-    Gtk::Image* iblueRm  = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* iyelLm   = Gtk::manage (new RTImage ("circle-yellow.png"));
-    Gtk::Image* imagLm   = Gtk::manage (new RTImage ("circle-magenta.png"));
-    Gtk::Image* igreenRm = Gtk::manage (new RTImage ("circle-green.png"));
-    Gtk::Image* icyanLm  = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* iredRm   = Gtk::manage (new RTImage ("circle-red.png"));
+    Gtk::Image* iblueRm  = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* iyelLm   = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    Gtk::Image* imagLm   = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+    Gtk::Image* igreenRm = Gtk::manage (new RTImage ("circle-green-small.png"));
+    Gtk::Image* icyanLm  = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* iredRm   = Gtk::manage (new RTImage ("circle-red-small.png"));
 
-    Gtk::Image* iblueRh  = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* iyelLh   = Gtk::manage (new RTImage ("circle-yellow.png"));
-    Gtk::Image* imagLh   = Gtk::manage (new RTImage ("circle-magenta.png"));
-    Gtk::Image* igreenRh = Gtk::manage (new RTImage ("circle-green.png"));
-    Gtk::Image* icyanLh  = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* iredRh   = Gtk::manage (new RTImage ("circle-red.png"));
+    Gtk::Image* iblueRh  = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* iyelLh   = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    Gtk::Image* imagLh   = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+    Gtk::Image* igreenRh = Gtk::manage (new RTImage ("circle-green-small.png"));
+    Gtk::Image* icyanLh  = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* iredRh   = Gtk::manage (new RTImage ("circle-red-small.png"));
 
     redhigh   = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., icyanLh, iredRh  ));
     greenhigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., imagLh , igreenRh));
diff --git a/rtgui/crop.cc b/rtgui/crop.cc
index 29c64501d..caa3b5ea2 100644
--- a/rtgui/crop.cc
+++ b/rtgui/crop.cc
@@ -128,7 +128,7 @@ Crop::Crop():
     pack_start (*hb2, Gtk::PACK_SHRINK, 4);
 
     selectCrop = Gtk::manage (new Gtk::Button (M("TP_CROP_SELECTCROP")));
-    selectCrop->set_image (*Gtk::manage (new RTImage ("crop.png")));
+    selectCrop->set_image (*Gtk::manage (new RTImage ("crop-small.png")));
 
     pack_start (*selectCrop, Gtk::PACK_SHRINK, 2);
 
diff --git a/rtgui/curveeditor.cc b/rtgui/curveeditor.cc
index b5b5b33a7..8b319ecbe 100644
--- a/rtgui/curveeditor.cc
+++ b/rtgui/curveeditor.cc
@@ -34,10 +34,10 @@ DiagonalCurveEditor::DiagonalCurveEditor (Glib::ustring text, CurveEditorGroup*
 {
 
     // Order set in the same order than "enum DiagonalCurveType". Shouldn't change, for compatibility reason
-    curveType->addEntry("curve-linear.png", M("CURVEEDITOR_LINEAR")); // 0 Linear
-    curveType->addEntry("curve-spline.png", M("CURVEEDITOR_CUSTOM")); // 1 Spline
-    curveType->addEntry("curve-parametric.png", M("CURVEEDITOR_PARAMETRIC")); // 2 Parametric
-    curveType->addEntry("curve-nurbs.png", M("CURVEEDITOR_NURBS")); // 3 NURBS
+    curveType->addEntry("curve-linear-small.png", M("CURVEEDITOR_LINEAR")); // 0 Linear
+    curveType->addEntry("curve-spline-small.png", M("CURVEEDITOR_CUSTOM")); // 1 Spline
+    curveType->addEntry("curve-parametric-small.png", M("CURVEEDITOR_PARAMETRIC")); // 2 Parametric
+    curveType->addEntry("curve-nurbs-small.png", M("CURVEEDITOR_NURBS")); // 3 NURBS
     curveType->setSelected(DCT_Linear);
     curveType->show();
 
@@ -145,8 +145,8 @@ FlatCurveEditor::FlatCurveEditor (Glib::ustring text, CurveEditorGroup* ceGroup,
     identityValue = 0.5;
 
     // Order set in the same order than "enum FlatCurveType". Shouldn't change, for compatibility reason
-    curveType->addEntry("curve-flat.png", M("CURVEEDITOR_LINEAR")); // 0 Linear
-    curveType->addEntry("curve-controlpoints.png", M("CURVEEDITOR_MINMAXCPOINTS")); // 1 Min/Max ControlPoints
+    curveType->addEntry("curve-flat-small.png", M("CURVEEDITOR_LINEAR")); // 0 Linear
+    curveType->addEntry("curve-controlpoints-small.png", M("CURVEEDITOR_MINMAXCPOINTS")); // 1 Min/Max ControlPoints
     curveType->setSelected(FCT_Linear);
     curveType->show();
 }
diff --git a/rtgui/distortion.cc b/rtgui/distortion.cc
index 1fadec9d9..ae1da88f5 100644
--- a/rtgui/distortion.cc
+++ b/rtgui/distortion.cc
@@ -28,15 +28,15 @@ Distortion::Distortion (): FoldableToolPanel(this, "distortion", M("TP_DISTORTIO
 
     rlistener = nullptr;
     autoDistor = Gtk::manage (new Gtk::Button (M("GENERAL_AUTO")));
-    autoDistor->set_image (*Gtk::manage (new RTImage ("distortion-auto.png")));
+    autoDistor->set_image (*Gtk::manage (new RTImage ("distortion-auto-small.png")));
     autoDistor->set_alignment(0.5f, 0.5f);
     autoDistor->set_tooltip_text (M("TP_DISTORTION_AUTO_TIP"));
     idConn = autoDistor->signal_pressed().connect( sigc::mem_fun(*this, &Distortion::idPressed) );
     autoDistor->show();
     pack_start (*autoDistor);
 
-    Gtk::Image* idistL =   Gtk::manage (new RTImage ("distortion-pincushion.png"));
-    Gtk::Image* idistR =   Gtk::manage (new RTImage ("distortion-barrel.png"));
+    Gtk::Image* idistL =   Gtk::manage (new RTImage ("distortion-pincushion-small.png"));
+    Gtk::Image* idistR =   Gtk::manage (new RTImage ("distortion-barrel-small.png"));
 
     distor = Gtk::manage (new Adjuster (M("TP_DISTORTION_AMOUNT"), -0.5, 0.5, 0.001, 0, idistL, idistR));
     distor->setAdjusterListener (this);
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index 0406cd5e2..969352902 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -533,8 +533,8 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
     beforeAfter->set_relief (Gtk::RELIEF_NONE);
     beforeAfter->set_tooltip_markup (M ("MAIN_TOOLTIP_TOGGLE"));
 
-    iBeforeLockON = new RTImage ("padlock-locked.png");
-    iBeforeLockOFF = new RTImage ("padlock-unlocked.png");
+    iBeforeLockON = new RTImage ("padlock-locked-small.png");
+    iBeforeLockOFF = new RTImage ("padlock-unlocked-small.png");
 
     Gtk::VSeparator* vsept = Gtk::manage (new Gtk::VSeparator ());
     Gtk::VSeparator* vsepz = Gtk::manage (new Gtk::VSeparator ());
diff --git a/rtgui/fattaltonemap.cc b/rtgui/fattaltonemap.cc
index f97d758d4..545a313a9 100644
--- a/rtgui/fattaltonemap.cc
+++ b/rtgui/fattaltonemap.cc
@@ -32,8 +32,8 @@ FattalToneMapping::FattalToneMapping(): FoldableToolPanel(this, "fattal", M("TP_
 
     amount = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_AMOUNT"), 1., 100., 1., 30.));
     threshold = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_THRESHOLD"), -100., 100., 1., 0.0));
-    Gtk::Image *al = Gtk::manage(new RTImage("circle-black.png"));
-    Gtk::Image *ar = Gtk::manage(new RTImage("circle-white.png"));
+    Gtk::Image *al = Gtk::manage(new RTImage("circle-black-small.png"));
+    Gtk::Image *ar = Gtk::manage(new RTImage("circle-white-small.png"));
     anchor = Gtk::manage(new Adjuster(M("TP_TM_FATTAL_ANCHOR"), 1, 100, 1, 50, al, ar));
 
     amount->setAdjusterListener(this);
diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc
index 90cff786d..81b3dc274 100644
--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@@ -203,8 +203,8 @@ FileBrowser::FileBrowser () :
      ***********************/
 
     // Same image arrays in filecatalog.cc
-    std::array<std::string, 6> clabelActiveIcons = {"circle-empty-gray.png", "circle-red.png", "circle-yellow.png", "circle-green.png", "circle-blue.png", "circle-purple.png"};
-    std::array<std::string, 6> clabelInactiveIcons = {"circle-empty-darkgray.png", "circle-empty-red.png", "circle-empty-yellow.png", "circle-empty-green.png", "circle-empty-blue.png", "circle-empty-purple.png"};
+    std::array<std::string, 6> clabelActiveIcons = {"circle-empty-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"};
+    std::array<std::string, 6> clabelInactiveIcons = {"circle-empty-darkgray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"};
 
     if (options.menuGroupLabel) {
         pmenu->attach (*Gtk::manage(menuLabel = new Gtk::MenuItem (M("FILEBROWSER_POPUPCOLORLABEL"))), 0, 1, p, p + 1);
diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index 79e433d70..8b552a51f 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -190,8 +190,8 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
     }
 
     // Same image arrays in filebrowser.cc
-    std::array<std::string, 6> clabelActiveIcons = {"circle-empty-gray.png", "circle-red.png", "circle-yellow.png", "circle-green.png", "circle-blue.png", "circle-purple.png"};
-    std::array<std::string, 6> clabelInactiveIcons = {"circle-empty-darkgray.png", "circle-empty-red.png", "circle-empty-yellow.png", "circle-empty-green.png", "circle-empty-blue.png", "circle-empty-purple.png"};
+    std::array<std::string, 6> clabelActiveIcons = {"circle-empty-gray-small.png", "circle-red-small.png", "circle-yellow-small.png", "circle-green-small.png", "circle-blue-small.png", "circle-purple-small.png"};
+    std::array<std::string, 6> clabelInactiveIcons = {"circle-empty-darkgray-small.png", "circle-empty-red-small.png", "circle-empty-yellow-small.png", "circle-empty-green-small.png", "circle-empty-blue-small.png", "circle-empty-purple-small.png"};
 
     iUnCLabeled = new RTImage(clabelActiveIcons[0]);
     igUnCLabeled = new RTImage(clabelInactiveIcons[0]);
diff --git a/rtgui/filethumbnailbuttonset.cc b/rtgui/filethumbnailbuttonset.cc
index d4f3c8743..99ae18a8c 100644
--- a/rtgui/filethumbnailbuttonset.cc
+++ b/rtgui/filethumbnailbuttonset.cc
@@ -49,12 +49,12 @@ FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry)
         unTrashIcon = RTImage::createFromPng ("trash-remove-small.png");
         processIcon = RTImage::createFromPng ("gears-small.png");
 
-        colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray.png"); //("nocolorlabel.png");
-        colorLabelIcon_1 = RTImage::createFromPng ("circle-red.png");
-        colorLabelIcon_2 = RTImage::createFromPng ("circle-yellow.png");
-        colorLabelIcon_3 = RTImage::createFromPng ("circle-green.png");
-        colorLabelIcon_4 = RTImage::createFromPng ("circle-blue.png");
-        colorLabelIcon_5 = RTImage::createFromPng ("circle-purple.png");
+        colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.png"); //("nocolorlabel.png");
+        colorLabelIcon_1 = RTImage::createFromPng ("circle-red-small.png");
+        colorLabelIcon_2 = RTImage::createFromPng ("circle-yellow-small.png");
+        colorLabelIcon_3 = RTImage::createFromPng ("circle-green-small.png");
+        colorLabelIcon_4 = RTImage::createFromPng ("circle-blue-small.png");
+        colorLabelIcon_5 = RTImage::createFromPng ("circle-purple-small.png");
         iconsLoaded = true;
     }
 
diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc
index 623fcc8fb..28d3f6324 100644
--- a/rtgui/guiutils.cc
+++ b/rtgui/guiutils.cc
@@ -553,11 +553,11 @@ void ExpanderBox::hideBox()
 
 void MyExpander::init()
 {
-    inconsistentPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("power-inconsistent.png"));
-    enabledPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("power-on.png"));
-    disabledPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("power-off.png"));
-    openedPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("expander-open.png"));
-    closedPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("expander-closed.png"));
+    inconsistentPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("power-inconsistent-small.png"));
+    enabledPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("power-on-small.png"));
+    disabledPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("power-off-small.png"));
+    openedPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("expander-open-small.png"));
+    closedPBuf = Gdk::Pixbuf::create_from_file(rtengine::findIconAbsolutePath("expander-closed-small.png"));
 }
 
 MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) :
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index c8afaa491..bfb13ba3f 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -139,7 +139,7 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
     iVBox->pack_start (*dcpFrame);
 
     saveRef = Gtk::manage (new Gtk::Button (M("TP_ICM_SAVEREFERENCE")));
-    saveRef->set_image (*Gtk::manage (new RTImage ("save.png")));
+    saveRef->set_image (*Gtk::manage (new RTImage ("save-small.png")));
     saveRef->set_alignment (0.5f, 0.5f);
     saveRef->set_tooltip_markup (M("TP_ICM_SAVEREFERENCE_TOOLTIP"));
     iVBox->pack_start (*saveRef, Gtk::PACK_SHRINK);
diff --git a/rtgui/lensgeom.cc b/rtgui/lensgeom.cc
index 7cae75d87..2f74f4e42 100644
--- a/rtgui/lensgeom.cc
+++ b/rtgui/lensgeom.cc
@@ -30,7 +30,7 @@ LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGE
     pack_start (*fill);
 
     autoCrop = Gtk::manage (new Gtk::Button (M("TP_LENSGEOM_AUTOCROP")));
-    autoCrop->set_image (*Gtk::manage (new RTImage ("crop-auto.png")));
+    autoCrop->set_image (*Gtk::manage (new RTImage ("crop-auto-small.png")));
     pack_start (*autoCrop, Gtk::PACK_SHRINK, 2);
 
     packBox = Gtk::manage (new ToolParamBlock ());
diff --git a/rtgui/perspective.cc b/rtgui/perspective.cc
index 6f5d475d2..1ca6e54b6 100644
--- a/rtgui/perspective.cc
+++ b/rtgui/perspective.cc
@@ -25,10 +25,10 @@ using namespace rtengine::procparams;
 PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("TP_PERSPECTIVE_LABEL"))
 {
 
-    Gtk::Image* ipersHL =   Gtk::manage (new RTImage ("perspective-horizontal-left.png"));
-    Gtk::Image* ipersHR =   Gtk::manage (new RTImage ("perspective-horizontal-right.png"));
-    Gtk::Image* ipersVL =   Gtk::manage (new RTImage ("perspective-vertical-bottom.png"));
-    Gtk::Image* ipersVR =   Gtk::manage (new RTImage ("perspective-vertical-top.png"));
+    Gtk::Image* ipersHL =   Gtk::manage (new RTImage ("perspective-horizontal-left-small.png"));
+    Gtk::Image* ipersHR =   Gtk::manage (new RTImage ("perspective-horizontal-right-small.png"));
+    Gtk::Image* ipersVL =   Gtk::manage (new RTImage ("perspective-vertical-bottom-small.png"));
+    Gtk::Image* ipersVR =   Gtk::manage (new RTImage ("perspective-vertical-top-small.png"));
 
     horiz = Gtk::manage (new Adjuster (M("TP_PERSPECTIVE_HORIZONTAL"), -100, 100, 0.1, 0, ipersHL, ipersHR));
     horiz->setAdjusterListener (this);
diff --git a/rtgui/rawcacorrection.cc b/rtgui/rawcacorrection.cc
index 563d52fa6..7e263a19a 100644
--- a/rtgui/rawcacorrection.cc
+++ b/rtgui/rawcacorrection.cc
@@ -25,10 +25,10 @@ using namespace rtengine::procparams;
 
 RAWCACorr::RAWCACorr () : FoldableToolPanel(this, "rawcacorrection", M("TP_CHROMATABERR_LABEL"))
 {
-    Gtk::Image* icaredL =   Gtk::manage (new RTImage ("circle-red-cyan.png"));
-    Gtk::Image* icaredR =   Gtk::manage (new RTImage ("circle-cyan-red.png"));
-    Gtk::Image* icablueL =  Gtk::manage (new RTImage ("circle-blue-yellow.png"));
-    Gtk::Image* icablueR =  Gtk::manage (new RTImage ("circle-yellow-blue.png"));
+    Gtk::Image* icaredL =   Gtk::manage (new RTImage ("circle-red-cyan-small.png"));
+    Gtk::Image* icaredR =   Gtk::manage (new RTImage ("circle-cyan-red-small.png"));
+    Gtk::Image* icablueL =  Gtk::manage (new RTImage ("circle-blue-yellow-small.png"));
+    Gtk::Image* icablueR =  Gtk::manage (new RTImage ("circle-yellow-blue-small.png"));
 
     caAutocorrect = Gtk::manage (new CheckBox(M("TP_RAWCACORR_AUTO"), multiImage));
     caAutocorrect->setCheckBoxListener (this);
diff --git a/rtgui/rotate.cc b/rtgui/rotate.cc
index dae6e4f19..a5cd02c2d 100644
--- a/rtgui/rotate.cc
+++ b/rtgui/rotate.cc
@@ -30,15 +30,15 @@ Rotate::Rotate () : FoldableToolPanel(this, "rotate", M("TP_ROTATE_LABEL"))
     rlistener = nullptr;
 
     //TODO the action of the rotation slider is counter-intuitive
-    Gtk::Image* irotateL =   Gtk::manage (new RTImage ("rotate-right.png"));
-    Gtk::Image* irotateR =   Gtk::manage (new RTImage ("rotate-left.png"));
+    Gtk::Image* irotateL =   Gtk::manage (new RTImage ("rotate-right-small.png"));
+    Gtk::Image* irotateR =   Gtk::manage (new RTImage ("rotate-left-small.png"));
 
     degree = Gtk::manage (new Adjuster (M("TP_ROTATE_DEGREE"), -45, 45, 0.01, 0, irotateL, irotateR));
     degree->setAdjusterListener (this);
     pack_start (*degree);
 
     selectStraight = Gtk::manage (new Gtk::Button (M("TP_ROTATE_SELECTLINE")));
-    selectStraight->set_image (*Gtk::manage (new RTImage ("rotate-straighten.png")));
+    selectStraight->set_image (*Gtk::manage (new RTImage ("rotate-straighten-small.png")));
     pack_start (*selectStraight, Gtk::PACK_SHRINK, 2);
 
     selectStraight->signal_pressed().connect( sigc::mem_fun(*this, &Rotate::selectStraightPressed) );
diff --git a/rtgui/toolpanel.cc b/rtgui/toolpanel.cc
index e4bade804..0d441e01f 100644
--- a/rtgui/toolpanel.cc
+++ b/rtgui/toolpanel.cc
@@ -56,7 +56,7 @@ FoldableToolPanel::FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName,
         label->set_alignment(Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
         titleHBox->pack_start(*label, Gtk::PACK_EXPAND_WIDGET, 0);
 
-        RTImage *image = Gtk::manage (new RTImage("one-to-one.png"));
+        RTImage *image = Gtk::manage (new RTImage("one-to-one-small.png"));
         image->set_tooltip_text(M("TP_GENERAL_11SCALE_TOOLTIP"));
         titleHBox->pack_end(*image, Gtk::PACK_SHRINK, 0);
 
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index 60a9524d6..8053226a2 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -698,20 +698,20 @@ Wavelet::Wavelet() :
     cbenabConn = cbenab->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::cbenabToggled) );
     cbenab->set_tooltip_text (M("TP_WAVELET_CB_TOOLTIP"));
 
-    Gtk::Image* const iblueR   = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* const iyelL    = Gtk::manage (new RTImage ("circle-yellow.png"));
-    Gtk::Image* const imagL    = Gtk::manage (new RTImage ("circle-magenta.png"));
-    Gtk::Image* const igreenR  = Gtk::manage (new RTImage ("circle-green.png"));
+    Gtk::Image* const iblueR   = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* const iyelL    = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    Gtk::Image* const imagL    = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+    Gtk::Image* const igreenR  = Gtk::manage (new RTImage ("circle-green-small.png"));
 
-    Gtk::Image* const  iblueRm  = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* const  iyelLm   = Gtk::manage (new RTImage ("circle-yellow.png"));
-    Gtk::Image* const  imagLm   = Gtk::manage (new RTImage ("circle-magenta.png"));
-    Gtk::Image* const  igreenRm = Gtk::manage (new RTImage ("circle-green.png"));
+    Gtk::Image* const  iblueRm  = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* const  iyelLm   = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    Gtk::Image* const  imagLm   = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+    Gtk::Image* const  igreenRm = Gtk::manage (new RTImage ("circle-green-small.png"));
 
-    Gtk::Image* const iblueRh  = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* const iyelLh   = Gtk::manage (new RTImage ("circle-yellow.png"));
-    Gtk::Image* const imagLh   = Gtk::manage (new RTImage ("circle-magenta.png"));
-    Gtk::Image* const igreenRh = Gtk::manage (new RTImage ("circle-green.png"));
+    Gtk::Image* const iblueRh  = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* const iyelLh   = Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    Gtk::Image* const imagLh   = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+    Gtk::Image* const igreenRh = Gtk::manage (new RTImage ("circle-green-small.png"));
 
     greenhigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., igreenRh, imagLh));
     bluehigh = Gtk::manage (new Adjuster ("", -100., 100., 1., 0., iblueRh, iyelLh));
diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc
index ff073d354..3dc6569dc 100644
--- a/rtgui/whitebalance.cc
+++ b/rtgui/whitebalance.cc
@@ -303,14 +303,14 @@ WhiteBalance::WhiteBalance () : FoldableToolPanel(this, "whitebalance", M("TP_WB
 
     pack_start (*spotbox, Gtk::PACK_SHRINK, 0);
 
-    Gtk::Image* itempL =  Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* itempR =  Gtk::manage (new RTImage ("circle-yellow.png"));
-    Gtk::Image* igreenL = Gtk::manage (new RTImage ("circle-magenta.png"));
-    Gtk::Image* igreenR = Gtk::manage (new RTImage ("circle-green.png"));
-    Gtk::Image* iblueredL = Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* iblueredR = Gtk::manage (new RTImage ("circle-red.png"));
-    Gtk::Image* itempbiasL =  Gtk::manage (new RTImage ("circle-blue.png"));
-    Gtk::Image* itempbiasR =  Gtk::manage (new RTImage ("circle-yellow.png"));
+    Gtk::Image* itempL =  Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* itempR =  Gtk::manage (new RTImage ("circle-yellow-small.png"));
+    Gtk::Image* igreenL = Gtk::manage (new RTImage ("circle-magenta-small.png"));
+    Gtk::Image* igreenR = Gtk::manage (new RTImage ("circle-green-small.png"));
+    Gtk::Image* iblueredL = Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* iblueredR = Gtk::manage (new RTImage ("circle-red-small.png"));
+    Gtk::Image* itempbiasL =  Gtk::manage (new RTImage ("circle-blue-small.png"));
+    Gtk::Image* itempbiasR =  Gtk::manage (new RTImage ("circle-yellow-small.png"));
 
     temp = Gtk::manage (new Adjuster (M("TP_WBALANCE_TEMPERATURE"), MINTEMP, MAXTEMP, 5, CENTERTEMP, itempL, itempR, &wbSlider2Temp, &wbTemp2Slider));
     green = Gtk::manage (new Adjuster (M("TP_WBALANCE_GREEN"), MINGREEN, MAXGREEN, 0.001, 1.0, igreenL, igreenR));
diff --git a/tools/generatePngIcons b/tools/generatePngIcons
index 9b3fc86dc..aa39ca0ca 100755
--- a/tools/generatePngIcons
+++ b/tools/generatePngIcons
@@ -45,7 +45,7 @@ colRef="#2a7fff"
 
 # Define theme names, and for each theme the color which will replace colorRef:
 declare -A themes
-themes=( ["dark"]="#BBBBBB" ["light"]="#252525" )
+themes=( ["dark"]="#CCCCCC" ["light"]="#252525" )
 
 # Optionally use pngquant to compress resulting PNGs:
 doCompress="false"