diff --git a/rtdata/images/Dark/actions/gamut-plus.png b/rtdata/images/Dark/actions/gamut-plus.png
deleted file mode 100644
index 2ef6f6041..000000000
Binary files a/rtdata/images/Dark/actions/gamut-plus.png and /dev/null differ
diff --git a/rtdata/images/Light/actions/gamut-plus.png b/rtdata/images/Light/actions/gamut-plus.png
deleted file mode 100644
index 0270d145d..000000000
Binary files a/rtdata/images/Light/actions/gamut-plus.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/circle-darkgray-small.png b/rtdata/images/themed/png/dark/circle-darkgray-small.png
new file mode 100644
index 000000000..e706b1eba
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-darkgray-small.png differ
diff --git a/rtdata/images/themed/png/dark/circle-gray-small.png b/rtdata/images/themed/png/dark/circle-gray-small.png
new file mode 100644
index 000000000..18ad6330a
Binary files /dev/null and b/rtdata/images/themed/png/dark/circle-gray-small.png differ
diff --git a/rtdata/images/themed/png/dark/star-small.png b/rtdata/images/themed/png/dark/star-small.png
index f9e4a7361..c8f21783c 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/light/circle-darkgray-small.png b/rtdata/images/themed/png/light/circle-darkgray-small.png
new file mode 100644
index 000000000..e706b1eba
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-darkgray-small.png differ
diff --git a/rtdata/images/themed/png/light/circle-gray-small.png b/rtdata/images/themed/png/light/circle-gray-small.png
new file mode 100644
index 000000000..18ad6330a
Binary files /dev/null and b/rtdata/images/themed/png/light/circle-gray-small.png differ
diff --git a/rtdata/images/themed/png/light/star-small.png b/rtdata/images/themed/png/light/star-small.png
index d4ecdd6a8..8ff98fa6b 100644
Binary files a/rtdata/images/themed/png/light/star-small.png and b/rtdata/images/themed/png/light/star-small.png differ
diff --git a/rtdata/images/themed/svg/circle-darkgray-small.svg b/rtdata/images/themed/svg/circle-darkgray-small.svg
new file mode 100644
index 000000000..8183c820f
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-darkgray-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/circle-gray-small.svg b/rtdata/images/themed/svg/circle-gray-small.svg
new file mode 100644
index 000000000..6ed1fd51d
--- /dev/null
+++ b/rtdata/images/themed/svg/circle-gray-small.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/rtdata/images/themed/svg/gamut-plus.svg b/rtdata/images/themed/svg/gamut-plus.svg
index 4f4ed503b..218f3068d 100644
--- a/rtdata/images/themed/svg/gamut-plus.svg
+++ b/rtdata/images/themed/svg/gamut-plus.svg
@@ -17,7 +17,7 @@
inkscape:export-filename="/tmp/template.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
- inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ inkscape:version="0.92.2 2405546, 2018-03-11"
sodipodi:docname="gamut-plus.svg">
+ transform="matrix(0.48946382,-0.15758811,0.15903644,0.48500634,1.5397064,9.0803117)"
+ inkscape:transform-center-y="-0.29218439" />
diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc
index 81b3dc274..edd37f7dd 100644
--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@@ -202,7 +202,8 @@ FileBrowser::FileBrowser () :
* color labels
***********************/
- // Same image arrays in filecatalog.cc
+ // Thumbnail context menu
+ // Similar image arrays in filecatalog.cc
std::array 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 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"};
diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index 58184aa1c..a0d767d79 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -193,9 +193,10 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
bRank[i]->signal_button_press_event().connect (sigc::mem_fun(*this, &FileCatalog::capture_event), false);
}
- // Same image arrays in filebrowser.cc
- std::array 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 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"};
+ // Toolbar
+ // Similar image arrays in filebrowser.cc
+ std::array clabelActiveIcons = {"circle-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 clabelInactiveIcons = {"circle-empty-gray-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 99ae18a8c..d32c1c339 100644
--- a/rtgui/filethumbnailbuttonset.cc
+++ b/rtgui/filethumbnailbuttonset.cc
@@ -49,7 +49,7 @@ FileThumbnailButtonSet::FileThumbnailButtonSet (FileBrowserEntry* myEntry)
unTrashIcon = RTImage::createFromPng ("trash-remove-small.png");
processIcon = RTImage::createFromPng ("gears-small.png");
- colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.png"); //("nocolorlabel.png");
+ colorLabelIcon_0 = RTImage::createFromPng ("circle-empty-gray-small.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");
diff --git a/tools/source_icons/scalable/gamut-plus.file b/tools/source_icons/scalable/gamut-plus.file
deleted file mode 100644
index ec6f9f83f..000000000
--- a/tools/source_icons/scalable/gamut-plus.file
+++ /dev/null
@@ -1 +0,0 @@
-gamut-plus.png,w22,actions
diff --git a/tools/source_icons/scalable/gamut-plus.svg b/tools/source_icons/scalable/gamut-plus.svg
deleted file mode 100644
index 268bcde62..000000000
--- a/tools/source_icons/scalable/gamut-plus.svg
+++ /dev/null
@@ -1,653 +0,0 @@
-
-
-
-