diff --git a/rtdata/images/Dark/actions/expanderClosed.png b/rtdata/images/Dark/actions/expanderClosed.png
index 0df54f055..1de089570 100644
Binary files a/rtdata/images/Dark/actions/expanderClosed.png and b/rtdata/images/Dark/actions/expanderClosed.png differ
diff --git a/rtdata/images/Dark/actions/expanderDisabled.png b/rtdata/images/Dark/actions/expanderDisabled.png
index 228902030..1593dc5b5 100644
Binary files a/rtdata/images/Dark/actions/expanderDisabled.png and b/rtdata/images/Dark/actions/expanderDisabled.png differ
diff --git a/rtdata/images/Dark/actions/expanderEnabled.png b/rtdata/images/Dark/actions/expanderEnabled.png
index 8e9ff1a81..a3d16f51c 100644
Binary files a/rtdata/images/Dark/actions/expanderEnabled.png and b/rtdata/images/Dark/actions/expanderEnabled.png differ
diff --git a/rtdata/images/Dark/actions/expanderInconsistent.png b/rtdata/images/Dark/actions/expanderInconsistent.png
index af7e889cb..06619ca10 100644
Binary files a/rtdata/images/Dark/actions/expanderInconsistent.png and b/rtdata/images/Dark/actions/expanderInconsistent.png differ
diff --git a/rtdata/images/Dark/actions/expanderOpened.png b/rtdata/images/Dark/actions/expanderOpened.png
index b06c69f0e..176e99dae 100644
Binary files a/rtdata/images/Dark/actions/expanderOpened.png and b/rtdata/images/Dark/actions/expanderOpened.png differ
diff --git a/rtdata/images/Light/actions/expanderClosed.png b/rtdata/images/Light/actions/expanderClosed.png
index c436748b6..90d1269aa 100644
Binary files a/rtdata/images/Light/actions/expanderClosed.png and b/rtdata/images/Light/actions/expanderClosed.png differ
diff --git a/rtdata/images/Light/actions/expanderDisabled.png b/rtdata/images/Light/actions/expanderDisabled.png
index ad974a6d5..27b1ed1d7 100644
Binary files a/rtdata/images/Light/actions/expanderDisabled.png and b/rtdata/images/Light/actions/expanderDisabled.png differ
diff --git a/rtdata/images/Light/actions/expanderEnabled.png b/rtdata/images/Light/actions/expanderEnabled.png
index db02844f7..402d4aae2 100644
Binary files a/rtdata/images/Light/actions/expanderEnabled.png and b/rtdata/images/Light/actions/expanderEnabled.png differ
diff --git a/rtdata/images/Light/actions/expanderInconsistent.png b/rtdata/images/Light/actions/expanderInconsistent.png
index 46092d748..9f87059dc 100644
Binary files a/rtdata/images/Light/actions/expanderInconsistent.png and b/rtdata/images/Light/actions/expanderInconsistent.png differ
diff --git a/rtdata/images/Light/actions/expanderOpened.png b/rtdata/images/Light/actions/expanderOpened.png
index 4f690bc86..e53435263 100644
Binary files a/rtdata/images/Light/actions/expanderOpened.png and b/rtdata/images/Light/actions/expanderOpened.png differ
diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc
index 1aa4be64b..9237488af 100644
--- a/rtgui/guiutils.cc
+++ b/rtgui/guiutils.cc
@@ -401,108 +401,6 @@ bool ExpanderBox::on_expose_event(GdkEventExpose* event) {
 	return retVal;
 }
 
-void MyExpander::init() {
-    inconsistentPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderInconsistent.png"));
-    enabledPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderEnabled.png"));
-    disabledPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderDisabled.png"));
-    openedPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderOpened.png"));
-    closedPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderClosed.png"));
-}
-
-MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) :
-        enabled(false), inconsistent(false), flushEvent(false), expBox(NULL),
-        child(NULL), headerWidget(NULL), statusImage(NULL),
-        label(NULL), useEnabled(useEnabled)
-{
-    set_spacing(options.slimUI ? 0 : 2);
-    set_name("MyExpander");
-    set_can_focus(false);
-
-    headerHBox = Gtk::manage( new Gtk::HBox());
-    headerHBox->set_can_focus(false);
-
-    if (useEnabled) {
-        statusImage = Gtk::manage(new Gtk::Image(disabledPBuf));
-        Gtk::EventBox *imageEvBox = Gtk::manage(new Gtk::EventBox());
-        imageEvBox->add(*statusImage);
-        imageEvBox->set_above_child(true);
-        imageEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_enabled_change) );
-        headerHBox->pack_start(*imageEvBox, Gtk::PACK_SHRINK, 0);
-    }
-    else {
-        statusImage = Gtk::manage(new Gtk::Image(openedPBuf));
-        headerHBox->pack_start(*statusImage, Gtk::PACK_SHRINK, 0);
-    }
-    statusImage->set_can_focus(false);
-
-    if (titleWidget) {
-        headerHBox->pack_start(*titleWidget, Gtk::PACK_EXPAND_WIDGET, 0);
-        headerWidget = titleWidget;
-    }
-
-    titleEvBox = Gtk::manage(new Gtk::EventBox());
-    titleEvBox->set_name("MyExpanderTitle");
-    titleEvBox->add(*headerHBox);
-    titleEvBox->set_above_child(false);  // this is the key! By making it below the child, they will get the events first.
-    titleEvBox->set_can_focus(false);
-
-    pack_start(*titleEvBox, Gtk::PACK_EXPAND_WIDGET, 0);
-
-    updateStyle();
-    titleEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_toggle) );
-    titleEvBox->signal_enter_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave), false);
-    titleEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave), false);
-}
-
-MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) :
-        enabled(false), inconsistent(false), flushEvent(false), expBox(NULL),
-        child(NULL), headerWidget(NULL), statusImage(NULL),
-        label(NULL), useEnabled(useEnabled)
-{
-    set_spacing(options.slimUI ? 0 : 2);
-    set_name("MyExpander");
-    set_can_focus(false);
-
-    headerHBox = Gtk::manage( new Gtk::HBox());
-    headerHBox->set_can_focus(false);
-
-
-    if (useEnabled) {
-        statusImage = Gtk::manage(new Gtk::Image(disabledPBuf));
-        Gtk::EventBox *imageEvBox = Gtk::manage(new Gtk::EventBox());
-        imageEvBox->add(*statusImage);
-        imageEvBox->set_above_child(true);
-        imageEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_enabled_change) );
-        headerHBox->pack_start(*imageEvBox, Gtk::PACK_SHRINK, 0);
-    }
-    else {
-        statusImage = Gtk::manage(new Gtk::Image(openedPBuf));
-        headerHBox->pack_start(*statusImage, Gtk::PACK_SHRINK, 0);
-    }
-    statusImage->set_can_focus(false);
-
-    Glib::ustring str("-");
-    if (!titleLabel.empty())
-        str = titleLabel;
-    label = Gtk::manage(new Gtk::Label());
-    label->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
-    label->set_markup(Glib::ustring("<b>") + escapeHtmlChars(titleLabel) + Glib::ustring("</b>"));
-    headerHBox->pack_start(*label, Gtk::PACK_EXPAND_WIDGET, 0);
-
-    titleEvBox = Gtk::manage(new Gtk::EventBox());
-    titleEvBox->set_name("MyExpanderTitle");
-    titleEvBox->add(*headerHBox);
-    titleEvBox->set_above_child(false);  // this is the key! By make it below the child, they will get the events first.
-    titleEvBox->set_can_focus(false);
-
-    pack_start(*titleEvBox, Gtk::PACK_EXPAND_WIDGET, 0);
-
-    updateStyle();
-    titleEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_toggle));
-    titleEvBox->signal_enter_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave), false);
-    titleEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave), false);
-}
-
 ExpanderBox::ExpanderBox( Gtk::Container *p):pC(p) {
 	set_name ("ExpanderBox");
 	updateStyle();
@@ -529,7 +427,113 @@ void ExpanderBox::hideBox() {
 	Gtk::EventBox::hide();
 }
 
-bool MyExpander::on_enter_leave (GdkEventCrossing* event) {
+void MyExpander::init() {
+    inconsistentPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderInconsistent.png"));
+    enabledPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderEnabled.png"));
+    disabledPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderDisabled.png"));
+    openedPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderOpened.png"));
+    closedPBuf = Gdk::Pixbuf::create_from_file(RTImage::findIconAbsolutePath("expanderClosed.png"));
+}
+
+MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) :
+        enabled(false), inconsistent(false), flushEvent(false), expBox(NULL),
+        child(NULL), headerWidget(NULL), statusImage(NULL),
+        label(NULL), useEnabled(useEnabled)
+{
+    set_spacing(options.slimUI ? 0 : 2);
+    set_name("MyExpander");
+    set_can_focus(false);
+
+    headerHBox = Gtk::manage( new Gtk::HBox());
+    headerHBox->set_can_focus(false);
+
+    if (useEnabled) {
+        statusImage = Gtk::manage(new Gtk::Image(disabledPBuf));
+        imageEvBox = Gtk::manage(new Gtk::EventBox());
+        imageEvBox->add(*statusImage);
+        imageEvBox->set_above_child(true);
+        imageEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_enabled_change) );
+        imageEvBox->signal_enter_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_enable), false );
+        imageEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_enable), false );
+        headerHBox->pack_start(*imageEvBox, Gtk::PACK_SHRINK, 0);
+    }
+    else {
+        statusImage = Gtk::manage(new Gtk::Image(openedPBuf));
+        headerHBox->pack_start(*statusImage, Gtk::PACK_SHRINK, 0);
+    }
+    statusImage->set_can_focus(false);
+
+    if (titleWidget) {
+        headerHBox->pack_start(*titleWidget, Gtk::PACK_EXPAND_WIDGET, 0);
+        headerWidget = titleWidget;
+    }
+
+    titleEvBox = Gtk::manage(new Gtk::EventBox());
+    titleEvBox->set_name("MyExpanderTitle");
+    titleEvBox->add(*headerHBox);
+    titleEvBox->set_above_child(false);  // this is the key! By making it below the child, they will get the events first.
+    titleEvBox->set_can_focus(false);
+
+    pack_start(*titleEvBox, Gtk::PACK_EXPAND_WIDGET, 0);
+
+    updateStyle();
+    titleEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_toggle) );
+    titleEvBox->signal_enter_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_title), false);
+    titleEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_title), false);
+}
+
+MyExpander::MyExpander(bool useEnabled, Glib::ustring titleLabel) :
+        enabled(false), inconsistent(false), flushEvent(false), expBox(NULL),
+        child(NULL), headerWidget(NULL), statusImage(NULL),
+        label(NULL), useEnabled(useEnabled)
+{
+    set_spacing(options.slimUI ? 0 : 2);
+    set_name("MyExpander");
+    set_can_focus(false);
+
+    headerHBox = Gtk::manage( new Gtk::HBox());
+    headerHBox->set_can_focus(false);
+
+
+    if (useEnabled) {
+        statusImage = Gtk::manage(new Gtk::Image(disabledPBuf));
+        imageEvBox = Gtk::manage(new Gtk::EventBox());
+        imageEvBox->add(*statusImage);
+        imageEvBox->set_above_child(true);
+        imageEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_enabled_change) );
+        imageEvBox->signal_enter_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_enable), false );
+        imageEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_enable), false );
+        headerHBox->pack_start(*imageEvBox, Gtk::PACK_SHRINK, 0);
+    }
+    else {
+        statusImage = Gtk::manage(new Gtk::Image(openedPBuf));
+        headerHBox->pack_start(*statusImage, Gtk::PACK_SHRINK, 0);
+    }
+    statusImage->set_can_focus(false);
+
+    Glib::ustring str("-");
+    if (!titleLabel.empty())
+        str = titleLabel;
+    label = Gtk::manage(new Gtk::Label());
+    label->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+    label->set_markup(Glib::ustring("<b>") + escapeHtmlChars(titleLabel) + Glib::ustring("</b>"));
+    headerHBox->pack_start(*label, Gtk::PACK_EXPAND_WIDGET, 0);
+
+    titleEvBox = Gtk::manage(new Gtk::EventBox());
+    titleEvBox->set_name("MyExpanderTitle");
+    titleEvBox->add(*headerHBox);
+    titleEvBox->set_above_child(false);  // this is the key! By make it below the child, they will get the events first.
+    titleEvBox->set_can_focus(false);
+
+    pack_start(*titleEvBox, Gtk::PACK_EXPAND_WIDGET, 0);
+
+    updateStyle();
+    titleEvBox->signal_button_release_event().connect( sigc::mem_fun(this, & MyExpander::on_toggle));
+    titleEvBox->signal_enter_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_title), false);
+    titleEvBox->signal_leave_notify_event().connect( sigc::mem_fun(this, & MyExpander::on_enter_leave_title), false);
+}
+
+bool MyExpander::on_enter_leave_title (GdkEventCrossing* event) {
 	if (is_sensitive()) {
 		if (event->type == GDK_ENTER_NOTIFY) {
 			titleEvBox->set_state(Gtk::STATE_PRELIGHT);
@@ -543,6 +547,20 @@ bool MyExpander::on_enter_leave (GdkEventCrossing* event) {
 	return true;
 }
 
+bool MyExpander::on_enter_leave_enable (GdkEventCrossing* event) {
+	if (is_sensitive()) {
+		if (event->type == GDK_ENTER_NOTIFY) {
+			imageEvBox->set_state(Gtk::STATE_PRELIGHT);
+			queue_draw();
+		}
+		else if (event->type == GDK_LEAVE_NOTIFY) {
+			imageEvBox->set_state(Gtk::STATE_NORMAL);
+			queue_draw();
+		}
+	}
+	return true;
+}
+
 void MyExpander::updateStyle() {
 	headerHBox->set_spacing(options.slimUI ? 2 : 5);
 	headerHBox->set_border_width(options.slimUI ? 1 : 2);
diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h
index bc6c52b5e..960401a2e 100644
--- a/rtgui/guiutils.h
+++ b/rtgui/guiutils.h
@@ -126,13 +126,16 @@ private:
 	Gtk::HBox *headerHBox;
 	bool flushEvent;            /// Flag to control the weird event mechanism of Gtk (please prove me wrong!)
 	ExpanderBox* expBox;        /// Frame that includes the child and control its visibility
+	Gtk::EventBox *imageEvBox;  /// Enable/Disable or Open/Close arrow event box
 
 	/// Triggered on opened/closed event
 	bool on_toggle(GdkEventButton* event);
 	/// Triggered on enabled/disabled change -> will emit a toggle event to the connected objects
 	bool on_enabled_change(GdkEventButton* event);
-	/// Used to handle the colored background
-	bool on_enter_leave (GdkEventCrossing* event);
+	/// Used to handle the colored background for the whole Title
+	bool on_enter_leave_title (GdkEventCrossing* event);
+	/// Used to handle the colored background for the Enable button
+	bool on_enter_leave_enable (GdkEventCrossing* event);
 	/// Update the style of this widget, depending in the "slim" option
 	void updateStyle();
 
diff --git a/tools/source_icons/scalable/expanderClosed.file b/tools/source_icons/scalable/expanderClosed.file
index 42abd041b..039041106 100644
--- a/tools/source_icons/scalable/expanderClosed.file
+++ b/tools/source_icons/scalable/expanderClosed.file
@@ -1 +1 @@
-expanderClosed.png,w12,actions
+expanderClosed.png,w18,actions
diff --git a/tools/source_icons/scalable/expanderClosed.svg b/tools/source_icons/scalable/expanderClosed.svg
index a7dca0cfc..ca47969f8 100644
--- a/tools/source_icons/scalable/expanderClosed.svg
+++ b/tools/source_icons/scalable/expanderClosed.svg
@@ -10,7 +10,7 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1000"
+   width="1300"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
@@ -307,20 +307,20 @@
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3631"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3206"
        gradientUnits="userSpaceOnUse"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientTransform="translate(769.49471,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -604,8 +604,7 @@
        y1="-169.86348"
        x2="261.61749"
        y2="-169.86348"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(883.91549,87.549725)" />
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4277"
@@ -617,7 +616,7 @@
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4219"
+       xlink:href="#linearGradient4219-3"
        id="linearGradient3960"
        x1="-159.38728"
        y1="34.699814"
@@ -625,7 +624,20 @@
        y2="34.699814"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.82222221,0,0,0.82222221,-7.9296946,6.1688563)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4219-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4221-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4223-6" />
+    </linearGradient>
     <filter
+       color-interpolation-filters="sRGB"
        inkscape:collect="always"
        id="filter4026"
        x="-0.20649599"
@@ -637,6 +649,26 @@
          stdDeviation="26.799307"
          id="feGaussianBlur4028" />
     </filter>
+    <linearGradient
+       y2="34.699814"
+       x2="219.43365"
+       y1="34.699814"
+       x1="-159.38728"
+       gradientTransform="matrix(0.82222221,0,0,0.82222221,-7.9296946,6.1688563)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4053"
+       xlink:href="#linearGradient4219-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4219-3"
+       id="linearGradient3173"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82222221,0,0,0.82222221,-7.9296946,6.1688563)"
+       x1="35.372913"
+       y1="343.3028"
+       x2="35.372913"
+       y2="-273.91107" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -645,9 +677,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.394"
-     inkscape:cx="145.80882"
-     inkscape:cy="97.193659"
+     inkscape:zoom="0.839"
+     inkscape:cx="650"
+     inkscape:cy="500"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -668,7 +700,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -683,19 +715,23 @@
       <g
          id="g4060"
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
-        <path
-           style="opacity:0.4;fill:#2a7fff;fill-opacity:1;stroke:none"
-           d="M -159.38728,-165.01457 219.43366,47.966965 -159.38728,260.9485 z"
-           id="rect3181"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="path3952"
-           d="m -138.98151,-140.41833 311.475,175.118144 -311.475,175.118146 z"
-           style="opacity:0.4;fill:url(#linearGradient3960);fill-opacity:1;stroke:none;filter:url(#filter4026)"
-           transform="matrix(0.80956693,0,0,0.80956693,3.1908946,19.875143)" />
+        <g
+           id="g3165"
+           transform="matrix(0,-1.0901186,1.0901183,0,-142.93877,128.71258)">
+          <path
+             sodipodi:nodetypes="cccc"
+             inkscape:connector-curvature="0"
+             id="rect3181"
+             d="M 243.00472,-87.371579 30.023187,291.44936 -182.95835,-87.371579 z"
+             style="opacity:0.4;fill:#2a7fff;fill-opacity:1;stroke:none" />
+          <path
+             transform="matrix(0,0.80956693,-0.80956693,0,58.115009,75.206602)"
+             style="opacity:0.4;fill:url(#linearGradient3173);fill-opacity:1;stroke:none;filter:url(#filter4026)"
+             d="m -138.98151,-140.41833 311.475,175.118144 -311.475,175.118146 z"
+             id="path3952"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccc" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/tools/source_icons/scalable/expanderDisabled.file b/tools/source_icons/scalable/expanderDisabled.file
index 28eb79392..e2cc81d31 100644
--- a/tools/source_icons/scalable/expanderDisabled.file
+++ b/tools/source_icons/scalable/expanderDisabled.file
@@ -1 +1 @@
-expanderDisabled.png,w12,actions
+expanderDisabled.png,w18,actions
diff --git a/tools/source_icons/scalable/expanderDisabled.svg b/tools/source_icons/scalable/expanderDisabled.svg
index 5e82ba4d8..1826d71f7 100644
--- a/tools/source_icons/scalable/expanderDisabled.svg
+++ b/tools/source_icons/scalable/expanderDisabled.svg
@@ -10,7 +10,7 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1000"
+   width="1300"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
@@ -283,20 +283,20 @@
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3631"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3206"
        gradientUnits="userSpaceOnUse"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientTransform="translate(769.49471,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -580,9 +580,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.394"
-     inkscape:cx="543.66361"
-     inkscape:cy="97.193659"
+     inkscape:zoom="0.839"
+     inkscape:cx="650"
+     inkscape:cy="500"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -619,15 +619,15 @@
          id="g4060"
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
         <path
-           style="fill:none;stroke:#2a7fff;stroke-width:33.16787720000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.65098040999999995;stroke-dasharray:none;opacity:0.7"
-           d="m 30.014965,-15.704302 c 0,-132.754478 0,-168.634068 0,-168.634068"
+           style="opacity:0.7;fill:none;stroke:#2a7fff;stroke-width:33.1678772;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.65098039;stroke-dasharray:none"
+           d="m 30.011141,-21.405379 c 0,-160.199321 0,-203.496441 0,-203.496441"
            id="path3062"
            inkscape:connector-curvature="0" />
         <path
            style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.7;color:#000000;fill:#2a7fff;fill-opacity:0.65158374;stroke:none;stroke-width:50.6696434;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-           d="M 351.53125 285.5625 C 255.7874 338.19327 190.75 440.04328 190.75 556.78125 C 190.75 727.28691 329.49434 866.03125 500 866.03125 C 670.50566 866.03125 809.28125 727.28691 809.28125 556.78125 C 809.28125 440.04152 744.21496 338.19258 648.46875 285.5625 L 648.46875 344.03125 C 715.50536 390.84104 759.25 468.57989 759.25 556.78125 C 759.25 700.26491 643.48366 816.03125 500 816.03125 C 356.51635 816.03125 240.75 700.26491 240.75 556.78125 C 240.75 468.57989 284.48566 390.84104 351.53125 344.03125 L 351.53125 285.5625 z "
-           transform="matrix(0.66335753,0,0,0.66335753,-301.65558,-296.97895)"
-           id="path3832" />
+           d="m -88.73454,-132.23737 c -76.58256,42.130688 -128.60399,123.6612321 -128.60399,217.10952 0,136.48913 110.97734,247.55344 247.359582,247.55344 136.382238,0 247.384578,-111.06431 247.384578,-247.55344 0,-93.4496955 -52.04453,-174.9794 -128.62899,-217.10952 l 0,46.803955 c 53.62053,37.471077 88.61052,99.700722 88.61052,170.305565 0,114.85813 -92.59794,207.52864 -207.366108,207.52864 -114.768164,0 -207.366112,-92.67051 -207.366112,-207.52864 0,-70.604843 34.98281,-132.834488 88.61052,-170.305565 l 0,-46.803955 z"
+           id="path3832"
+           inkscape:connector-curvature="0" />
       </g>
     </g>
   </g>
diff --git a/tools/source_icons/scalable/expanderEnabled.file b/tools/source_icons/scalable/expanderEnabled.file
index 55afa72ed..790e109da 100644
--- a/tools/source_icons/scalable/expanderEnabled.file
+++ b/tools/source_icons/scalable/expanderEnabled.file
@@ -1 +1 @@
-expanderEnabled.png,w12,actions
+expanderEnabled.png,w18,actions
diff --git a/tools/source_icons/scalable/expanderEnabled.svg b/tools/source_icons/scalable/expanderEnabled.svg
index 318e61341..1407ca335 100644
--- a/tools/source_icons/scalable/expanderEnabled.svg
+++ b/tools/source_icons/scalable/expanderEnabled.svg
@@ -10,12 +10,12 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1000"
+   width="1300"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="crop.svg"
+   sodipodi:docname="expanderEnabled.svg"
    inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png"
    inkscape:export-xdpi="2.1600001"
    inkscape:export-ydpi="2.1600001"
@@ -283,37 +283,21 @@
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3631"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter4666">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="8.7866288"
-         id="feGaussianBlur4668" />
-    </filter>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3206"
        gradientUnits="userSpaceOnUse"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientTransform="translate(769.49471,0)" />
-    <filter
-       inkscape:collect="always"
-       id="filter4031">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="7.7996628"
-         id="feGaussianBlur4033" />
-    </filter>
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
@@ -570,7 +554,8 @@
        y2="51.536308" />
     <filter
        inkscape:collect="always"
-       id="filter4171">
+       id="filter4171"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="10.145805"
@@ -582,12 +567,63 @@
        x="-0.42725736"
        width="1.8545147"
        y="-0.11401727"
-       height="1.2280345">
+       height="1.2280345"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="10.79173"
          id="feGaussianBlur4185" />
     </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3625"
+       id="linearGradient4004"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.12517641,0.013274)"
+       x1="-181.28325"
+       y1="51.536308"
+       x2="246.02574"
+       y2="51.536308" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3625"
+       id="linearGradient4006"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.125176,0.013274)"
+       x1="-12.918397"
+       y1="-91.573822"
+       x2="71.28112"
+       y2="-91.573822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3625"
+       id="linearGradient4784"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.12517641,0.013274)"
+       x1="-181.28325"
+       y1="51.536308"
+       x2="246.02574"
+       y2="51.536308" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3625"
+       id="linearGradient4786"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.125176,0.013274)"
+       x1="-12.918397"
+       y1="-91.573822"
+       x2="71.28112"
+       y2="-91.573822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3625"
+       id="linearGradient5308"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.12517641,0.013274)"
+       x1="-181.28325"
+       y1="51.536308"
+       x2="246.02574"
+       y2="51.536308" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -596,9 +632,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.394"
-     inkscape:cx="980.21183"
-     inkscape:cy="97.193659"
+     inkscape:zoom="0.839"
+     inkscape:cx="650"
+     inkscape:cy="500"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -634,32 +670,28 @@
       <g
          id="g4060"
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
-        <g
-           id="g4017">
-          <path
-             id="path3977"
-             d="m -69.98833,-129.82915 c -74.05583,36.970192 -125.16727,113.595324 -125.16727,201.660686 0,123.932424 101.235997,225.168424 225.168418,225.168424 123.932422,0 225.189152,-101.23601 225.189152,-225.168424 0,-88.065362 -51.12612,-164.690487 -125.188,-201.660686 l 0,86.588884 c 32.05262,27.840353 52.21867,68.963704 52.21867,115.071802 0,84.496864 -67.72296,152.199094 -152.219822,152.199094 -84.496864,0 -152.199098,-67.70223 -152.199098,-152.199094 0,-46.108091 20.15094,-87.231449 52.19795,-115.071802 l 0,-86.588884 z"
-             style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.7;color:#000000;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:110;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect3983"
-             d="m 30.014965,-227.60032 c 24.20902,0 43.698593,19.48957 43.698593,43.69859 l 0,167.760787 c 0,24.2090202 -19.489573,43.698593 -43.698593,43.698593 -24.2090206,0 -43.698593,-19.4895728 -43.698593,-43.698593 l 0,-167.760787 c 0,-24.20902 19.4895724,-43.69859 43.698593,-43.69859 z"
-             style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           id="g4187">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4023"
-             d="m -84.608103,-105.4371 c -69.642327,44.661782 -109.181527,132.532075 -93.258607,214.29637 13.44009,76.22164 71.66655,143.2426 146.284938,164.94906 63.759636,19.74658 137.047852,7.32543 189.485042,-34.04264 52.7998,-40.15991 85.69439,-105.52517 83.40508,-172.233816 -1.10889,-66.410105 -35.55286,-131.377207 -90.58266,-168.808374 -4.78391,-4.26562 -8.27846,-5.48626 -6.58379,2.558154 0,16.385417 0,32.770833 0,49.15625 56.14382,50.91672 69.13892,143.45002 28.40625,207.718746 C 138.78498,214.62906 69.263351,247.80003 4.0071204,236.11437 -56.222649,226.76969 -110.23476,182.44137 -127.97661,123.61087 -146.551,66.724854 -132.57655,-0.395256 -90.264353,-43.093346 c 2.88248,-3.521257 8.08026,-5.790521 6.35861,-11.187433 -0.11159,-17.197889 0.33825,-34.397473 -0.0461,-51.593821 l -0.65625,0.4375 z"
-             style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.40000000000000002;color:#000000;fill:url(#linearGradient4157);fill-opacity:1;stroke:none;stroke-width:110;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;filter:url(#filter4171)" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4025"
-             d="m 29.516897,-213.5621 c -19.01785,-0.45893 -33.405125,20.68617 -29.0625,38.625 0.840363,56.26749 -1.826979,112.660516 1.53125,168.843754 6.247713,19.868021 36.47712,27.037079 49.75,10.375 9.811776,-10.238045 8.975246,-25.328196 8.00686,-38.374926 -0.690159,-53.435465 2.126278,-107.079548 -1.72561,-160.375078 -4.401797,-11.34603 -16.205972,-19.72291 -28.5,-19.09375 z"
-             style="opacity:0.4;fill:url(#linearGradient4154);fill-opacity:1;stroke:none;filter:url(#filter4183)" />
-        </g>
+        <path
+           inkscape:connector-curvature="0"
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:1;color:#000000;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:110;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           d="m -87.653525,-158.75326 c -87.136425,43.5003 -147.275765,133.659853 -147.275765,237.280341 0,145.822809 119.11747,264.940279 264.940276,264.940279 145.822804,0 264.964674,-119.11748 264.964674,-264.940279 0,-103.620488 -60.15661,-193.780031 -147.30016,-237.280341 l 0,101.883222 c 37.71413,32.757839 61.44214,81.144873 61.44214,135.397119 0,99.421679 -79.68498,179.082259 -179.106654,179.082259 -99.421681,0 -179.082266,-79.66058 -179.082266,-179.082259 0,-54.252237 23.71023,-102.63928 61.417755,-135.397119 l 0,-101.883222 z"
+           id="path3977" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none"
+           d="m 30.013512,-273.7939 c 28.485098,0 51.417145,22.93204 51.417145,51.41714 l 0,197.392642 c 0,28.485098 -22.932047,51.417145 -51.417145,51.417145 -28.4850987,0 -51.417145,-22.932047 -51.417145,-51.417145 l 0,-197.392642 c 0,-28.4851 22.9320463,-51.41714 51.417145,-51.41714 z"
+           id="rect3983" />
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.4;color:#000000;fill:url(#linearGradient5308);fill-opacity:1;stroke:none;stroke-width:110;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4171);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           d="m -84.608103,-105.4371 c -69.642327,44.661782 -109.181527,132.532075 -93.258607,214.29637 13.44009,76.22164 71.66655,143.2426 146.284938,164.94906 63.759636,19.74658 137.047852,7.32543 189.485042,-34.04264 52.7998,-40.15991 85.69439,-105.52517 83.40508,-172.233816 -1.10889,-66.410105 -35.55286,-131.377207 -90.58266,-168.808374 -4.78391,-4.26562 -8.27846,-5.48626 -6.58379,2.558154 0,16.385417 0,32.770833 0,49.15625 56.14382,50.91672 69.13892,143.45002 28.40625,207.718746 C 138.78498,214.62906 69.263351,247.80003 4.0071204,236.11437 -56.222649,226.76969 -110.23476,182.44137 -127.97661,123.61087 -146.551,66.724854 -132.57655,-0.395256 -90.264353,-43.093346 c 2.88248,-3.521257 8.08026,-5.790521 6.35861,-11.187433 -0.11159,-17.197889 0.33825,-34.397473 -0.0461,-51.593821 l -0.65625,0.4375 z"
+           id="path4023"
+           inkscape:connector-curvature="0"
+           transform="matrix(1.1766316,0,0,1.1766316,-5.3030442,-5.9921746)" />
+        <path
+           style="opacity:0.4;fill:url(#linearGradient4786);fill-opacity:1;stroke:none;filter:url(#filter4183)"
+           d="m 29.516897,-213.5621 c -19.01785,-0.45893 -33.405125,20.68617 -29.0625,38.625 0.840363,56.26749 -1.826979,112.660516 1.53125,168.843754 6.247713,19.868021 36.47712,27.037079 49.75,10.375 9.811776,-10.238045 8.975246,-25.328196 8.00686,-38.374926 -0.690159,-53.435465 2.126278,-107.079548 -1.72561,-160.375078 -4.401797,-11.34603 -16.205972,-19.72291 -28.5,-19.09375 z"
+           id="path4025"
+           inkscape:connector-curvature="0"
+           transform="matrix(1.1766316,0,0,1.1766316,-5.3030443,-5.9921746)" />
       </g>
     </g>
   </g>
diff --git a/tools/source_icons/scalable/expanderInconsistent.file b/tools/source_icons/scalable/expanderInconsistent.file
index 594ef14d9..0ce1f9a2e 100644
--- a/tools/source_icons/scalable/expanderInconsistent.file
+++ b/tools/source_icons/scalable/expanderInconsistent.file
@@ -1 +1 @@
-expanderInconsistent.png,w12,actions
+expanderInconsistent.png,w18,actions
diff --git a/tools/source_icons/scalable/expanderInconsistent.svg b/tools/source_icons/scalable/expanderInconsistent.svg
index 176b900df..167b86b66 100644
--- a/tools/source_icons/scalable/expanderInconsistent.svg
+++ b/tools/source_icons/scalable/expanderInconsistent.svg
@@ -10,12 +10,12 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1000"
+   width="1300"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="expanderDisabled.svg"
+   sodipodi:docname="expanderInconsistent.svg"
    inkscape:export-filename="/home/philippe/devel/rawtherapee/icons/NewIcons/crop22.png"
    inkscape:export-xdpi="2.1600001"
    inkscape:export-ydpi="2.1600001"
@@ -283,20 +283,20 @@
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3631"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3206"
        gradientUnits="userSpaceOnUse"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientTransform="translate(769.49471,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -578,7 +578,8 @@
        width="1.8545147"
        x="-0.42725736"
        id="filter4183"
-       inkscape:collect="always">
+       inkscape:collect="always"
+       color-interpolation-filters="sRGB">
       <feGaussianBlur
          id="feGaussianBlur4185"
          stdDeviation="10.79173"
@@ -840,20 +841,20 @@
        inkscape:collect="always" />
     <linearGradient
        gradientTransform="translate(769.49471,0)"
-       y2="34.445074"
-       x2="334.30281"
-       y1="34.445074"
-       x1="-274.27156"
+       y2="34.445072"
+       x2="334.3028"
+       y1="34.445072"
+       x1="-274.27155"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3206-1"
        xlink:href="#linearGradient3625-4"
        inkscape:collect="always" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
-       y2="34.445074"
-       x2="334.30281"
-       y1="34.445074"
-       x1="-274.27156"
+       y2="34.445072"
+       x2="334.3028"
+       y1="34.445072"
+       x1="-274.27155"
        id="linearGradient3631-3"
        xlink:href="#linearGradient3625-4"
        inkscape:collect="always" />
@@ -1154,6 +1155,26 @@
        y1="-91.573822"
        x2="71.28112"
        y2="-91.573822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3625-4"
+       id="linearGradient4008"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(583.87979,3.473256)"
+       x1="-12.918397"
+       y1="-91.573822"
+       x2="71.28112"
+       y2="-91.573822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3625-4"
+       id="linearGradient4796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(583.87979,3.473256)"
+       x1="-12.918397"
+       y1="-91.573822"
+       x2="71.28112"
+       y2="-91.573822" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -1162,9 +1183,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.394"
-     inkscape:cx="543.66361"
-     inkscape:cy="97.193659"
+     inkscape:zoom="0.839"
+     inkscape:cx="444.99404"
+     inkscape:cy="500"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -1185,7 +1206,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -1202,23 +1223,20 @@
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
         <path
            style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.7;color:#000000;fill:#2a7fff;fill-opacity:0.65158374;stroke:none;stroke-width:50.6696434;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
-           d="M 351.53125 285.5625 C 255.7874 338.19327 190.75 440.04328 190.75 556.78125 C 190.75 727.28691 329.49434 866.03125 500 866.03125 C 670.50566 866.03125 809.28125 727.28691 809.28125 556.78125 C 809.28125 440.04152 744.21496 338.19258 648.46875 285.5625 L 648.46875 344.03125 C 715.50536 390.84104 759.25 468.57989 759.25 556.78125 C 759.25 700.26491 643.48366 816.03125 500 816.03125 C 356.51635 816.03125 240.75 700.26491 240.75 556.78125 C 240.75 468.57989 284.48566 390.84104 351.53125 344.03125 L 351.53125 285.5625 z "
-           transform="matrix(0.66335753,0,0,0.66335753,-301.65558,-296.97895)"
-           id="path3832" />
-        <g
-           id="g4096"
-           transform="translate(-583.75461,0)">
-          <path
-             id="rect3983"
-             d="m 613.76957,-224.14034 c 24.20902,0 43.6986,19.48957 43.6986,43.69859 l 0,167.760789 c 0,24.20902 -19.48958,43.698593 -43.6986,43.698593 -24.20902,0 -43.69859,-19.489573 -43.69859,-43.698593 l 0,-167.760789 c 0,-24.20902 19.48957,-43.69859 43.69859,-43.69859 z"
-             style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke:none"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4025"
-             d="m 613.27151,-210.10212 c -19.01785,-0.45893 -33.40513,20.68617 -29.0625,38.625 0.84036,56.26749 -1.82698,112.660518 1.53125,168.843756 6.24771,19.868021 36.47712,27.037079 49.75,10.375 9.81177,-10.238045 8.97524,-25.328196 8.00686,-38.374926 -0.69016,-53.435465 2.12627,-107.07955 -1.72561,-160.37508 -4.4018,-11.34603 -16.20598,-19.72291 -28.5,-19.09375 z"
-             style="opacity:0.4;fill:url(#linearGradient4100);fill-opacity:1;stroke:none;filter:url(#filter4183)" />
-        </g>
+           d="M -88.785465,-132.68836 C -165.40086,-90.572569 -217.44459,-9.0709456 -217.44459,84.344206 c 0,136.440714 111.02492,247.465634 247.465635,247.465634 136.440715,0 247.490635,-111.02492 247.490635,-247.465634 0,-93.41656 -52.06684,-174.917327 -128.68413,-217.032566 l 0,46.787414 c 53.64352,37.457766 88.64852,99.665345 88.64852,170.245152 0,114.817384 -92.63765,207.455024 -207.455025,207.455024 -114.817372,0 -207.455025,-92.63764 -207.455025,-207.455024 0,-70.579807 34.99781,-132.787386 88.648515,-170.245152 l 0,-46.787414 z"
+           id="path3832"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="opacity:1;fill:#2a7fff;fill-opacity:1;stroke:none"
+           d="m 30.011126,-273.3333 c 29.203489,0 52.713888,23.51038 52.713888,52.71387 l 0,202.370865 c 0,29.203488 -23.510399,52.713879 -52.713888,52.713879 -29.20348822,0 -52.713875,-23.510391 -52.713875,-52.713879 l 0,-202.370865 c 0,-29.20349 23.51038678,-52.71387 52.713875,-52.71387 z"
+           id="rect3983" />
+        <path
+           style="opacity:0.4;fill:url(#linearGradient4796);fill-opacity:1;stroke:none;filter:url(#filter4183)"
+           d="m 613.27151,-210.10212 c -19.01785,-0.45893 -33.40513,20.68617 -29.0625,38.625 0.84036,56.26749 -1.82698,112.660518 1.53125,168.843756 6.24771,19.868021 36.47712,27.037079 49.75,10.375 9.81177,-10.238045 8.97524,-25.328196 8.00686,-38.374926 -0.69016,-53.435465 2.12627,-107.07955 -1.72561,-160.37508 -4.4018,-11.34603 -16.20598,-19.72291 -28.5,-19.09375 z"
+           id="path4025"
+           inkscape:connector-curvature="0"
+           transform="matrix(1.2063061,0,0,1.2063061,-710.38285,-2.9514445)" />
       </g>
     </g>
   </g>
diff --git a/tools/source_icons/scalable/expanderOpened.file b/tools/source_icons/scalable/expanderOpened.file
index 7b7d1aad6..c2175efad 100644
--- a/tools/source_icons/scalable/expanderOpened.file
+++ b/tools/source_icons/scalable/expanderOpened.file
@@ -1 +1 @@
-expanderOpened.png,w12,actions
+expanderOpened.png,w18,actions
diff --git a/tools/source_icons/scalable/expanderOpened.svg b/tools/source_icons/scalable/expanderOpened.svg
index 06d8e8bf9..c00fe2d85 100644
--- a/tools/source_icons/scalable/expanderOpened.svg
+++ b/tools/source_icons/scalable/expanderOpened.svg
@@ -10,7 +10,7 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1000"
+   width="1300"
    height="1000"
    id="svg2"
    sodipodi:version="0.32"
@@ -307,20 +307,20 @@
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3631"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3625"
        id="linearGradient3206"
        gradientUnits="userSpaceOnUse"
-       x1="-274.27156"
-       y1="34.445074"
-       x2="334.30281"
-       y2="34.445074"
+       x1="-274.27155"
+       y1="34.445072"
+       x2="334.3028"
+       y2="34.445072"
        gradientTransform="translate(769.49471,0)" />
     <linearGradient
        inkscape:collect="always"
@@ -669,6 +669,16 @@
        y1="343.3028"
        x2="35.372913"
        y2="-273.91107" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4219-3"
+       id="linearGradient3173"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82222221,0,0,0.82222221,-7.9296946,6.1688563)"
+       x1="35.372913"
+       y1="343.3028"
+       x2="35.372913"
+       y2="-273.91107" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -677,9 +687,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.394"
-     inkscape:cx="188.33366"
-     inkscape:cy="97.193659"
+     inkscape:zoom="0.839"
+     inkscape:cx="650"
+     inkscape:cy="500"
      inkscape:document-units="px"
      inkscape:current-layer="g4060"
      showguides="true"
@@ -715,19 +725,23 @@
       <g
          id="g4060"
          transform="matrix(1.5074827,0,0,1.5074827,-9.4212231,-17.89429)">
-        <path
-           style="opacity:0.4;fill:#2a7fff;fill-opacity:1;stroke:none"
-           d="M 243.00472,-87.371579 30.023187,291.44936 -182.95835,-87.371579 z"
-           id="rect3181"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-        <path
-           sodipodi:nodetypes="cccc"
-           inkscape:connector-curvature="0"
-           id="path3952"
-           d="m -138.98151,-140.41833 311.475,175.118144 -311.475,175.118146 z"
-           style="opacity:0.4;fill:url(#linearGradient4082);fill-opacity:1;stroke:none;filter:url(#filter4026)"
-           transform="matrix(0,0.80956693,-0.80956693,0,58.115009,75.206602)" />
+        <g
+           id="g3165"
+           transform="matrix(1.0901186,0,0,1.0901184,-69.04139,11.516234)">
+          <path
+             sodipodi:nodetypes="cccc"
+             inkscape:connector-curvature="0"
+             id="rect3181"
+             d="M 243.00472,-87.371579 30.023187,291.44936 -182.95835,-87.371579 z"
+             style="opacity:0.4;fill:#2a7fff;fill-opacity:1;stroke:none" />
+          <path
+             transform="matrix(0,0.80956693,-0.80956693,0,58.115009,75.206602)"
+             style="opacity:0.4;fill:url(#linearGradient3173);fill-opacity:1;stroke:none;filter:url(#filter4026)"
+             d="m -138.98151,-140.41833 311.475,175.118144 -311.475,175.118146 z"
+             id="path3952"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cccc" />
+        </g>
       </g>
     </g>
   </g>