diff --git a/rtdata/themes/RawTherapee-bak.css b/rtdata/themes/RawTherapee-bak.css
new file mode 100644
index 000000000..06abc2974
--- /dev/null
+++ b/rtdata/themes/RawTherapee-bak.css
@@ -0,0 +1,439 @@
+/*
+  This file is part of RawTherapee.
+
+  Copyright (c) 2015 DrSlony
+  Copyright (c) 2016 Hombre
+
+  RawTherapee is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  RawTherapee is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+* {
+    color: #AAAAAA;
+}
+
+.view:selected {
+    color: #262626;
+    background-color: #AAAAAA
+}
+
+/* The Places and Dir browser panels */
+.view {
+    background-color: #262626;
+}
+/* The headers of these panels */
+.view .button {
+    background-color: #363636;
+    padding: 2px;
+}
+
+.plainback {
+    background-color: #404040;
+}
+
+box {
+    border-width: 0;
+    border-style: none;
+    border-radius: 0;
+    margin: 0;
+	padding: 0;
+}
+
+grid {
+    margin: 2px;
+    padding: 0;
+    border-width: 0;
+    border-style: none;
+    border-radius: 0;
+}
+
+/* Affects all frames except in the toolbox */
+frame {
+    border-width: 0;
+    border-color: #303030;
+    border-radius: 0;
+    border-style: solid;
+    /*border-style: none none none solid;*/
+    padding: 4px;
+}
+
+frame > label {
+    color: #D8D8D8;
+}
+
+#FileBrowser {
+    padding: 10px;
+    margin: 10px;
+}
+
+/* Frames in Preferences */
+#PrefNotebook frame {
+    background-color: #3B3B3B;
+    border: 1px solid #505050;
+    border-radius: 4px;
+}
+
+/* Frames in the toolbox. Not MyExpander frames. */
+eventbox .frame {
+    border-color: #565656;
+}
+
+/*.EditorTopPanel .button, .ToolBarPanelFileBrowser .button, .EditorZoomPanel .button {*/
+.button {
+     padding: 1px;
+     margin: 1px;
+}
+
+/* Adjusters */
+.text-button {
+    padding: 0;
+}
+
+/* Any text-button which is a real button, unlike Slider label */
+.text-button.button {
+    padding: 4px;
+}
+
+.separator {
+    color: #363636;
+}
+
+progressbar {
+    -progressbar-min-vertical-bar-width: 10;
+    -progressbar-min-horizontal-bar-height: 10;
+}
+
+drawingarea {
+    border-radius: 0;
+    padding: 0;
+    margin: 0;
+    background-color: #363636;
+    border: 1px solid #252525;
+}
+
+drawingarea:selected {
+    background-color: #565656;
+    border-radius: 10px;
+}
+
+image {
+    padding: 1px;
+}
+
+/* Vertical group of buttons in 1 column */
+button.Top {
+    border-radius: 10px 4px 0 0;
+    border-style: solid solid none solid;
+    margin-bottom: 0;
+}
+button.MiddleV {
+    border-radius: 0;
+    border-style: none solid none solid;
+    margin-top: 0;
+    margin-bottom: 0;
+}
+button.Bottom {
+    border-radius: 0 0 4px 4px;
+    border-style: none solid solid solid;
+    margin-top: 0;
+}
+/* end */
+
+/* Horizontal group of buttons in 1 row */
+button.Left {
+    border-radius: 4px 0 0 4px;
+    border-style: solid none solid solid;
+    margin-right: 0;
+}
+button.MiddleH {
+    border-radius: 0;
+    border-style: solid none solid none;
+    margin-left: 0;
+    margin-right: 0;
+}
+button.Right {
+    border-radius: 0 4px 4px 0;
+    border-style: solid solid solid none;
+    margin-left: 0;
+}
+/* end */
+
+/* [1.23[-][+]] */
+entry, spinbutton {
+    padding: 1px;
+    background-color: #262626;
+}
+
+entry:insensitive, spinbutton:insensitive {
+    background-color: #363636;
+}
+
+entry:hover, spinbutton:hover {
+    background-color: #565656;
+}
+
+entry:selected {
+    color: #262626;
+    background-color: #AAAAAA;
+}
+
+/* Context menus */
+menu {
+    background-color: #262626;
+    color: #909090;
+}
+
+/* Context menu item */
+.menuitem {
+    padding: 2px;
+}
+
+#MyExpander {
+    margin: 10px;
+    padding: 5px;
+}
+
+/* Tool background */
+#ExpanderBox {
+    background-color: #363636;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #252525;
+    border-radius: 4px;
+    margin: 9px;
+    padding: 4px;
+}
+
+#ExpanderBox drawingarea {
+    background-color: #363636;
+}
+
+#ExpanderBox frame {
+    background-color: #3B3B3B;
+    border: 1px solid #313131;
+    border-radius: 4px;
+    margin: 3px;
+    padding: 2px;
+}
+
+#ExpanderBox frame drawingarea {
+    background-color: #3B3B3B;
+}
+
+#ExpanderBox frame  frame {
+    background-color: #414141;
+    border: 1px solid #373737;
+    border-radius: 4px;
+    margin: 3px;
+    padding: 2px;
+}
+
+#ExpanderBox frame  frame drawingarea {
+    background-color: #414141;
+}
+
+/* Sub-tool (MyExpander) background */
+#ExpanderBox2 {
+    background-color: #3B3B3B;
+    border: 1px solid #2A2A2A;
+    border-radius: 4px;
+    margin: 9px;
+    padding: 4px;
+}
+
+#ExpanderBox2 drawingarea {
+    background-color: #3B3B3B;
+}
+
+#ExpanderBox2 frame {
+    background-color: #414141;
+    border: 1px solid #373737;
+    border-radius: 4px;
+}
+
+#ExpanderBox2 frame drawingarea {
+    background-color: #414141;
+}
+
+#ExpanderBox2 frame frame {
+    background-color: #474747;
+    border: 1px solid #3D3D3D;
+    border-radius: 4px;
+    margin: 3px;
+    padding: 2px;
+}
+
+#ExpanderBox2 frame frame drawingarea {
+    background-color: #474747;
+}
+
+#MyExpanderTitle {
+    margin: 5px;
+    padding: 3px 1px 3px 1px;
+    font-size: 120%;
+}
+#MyExpanderTitle label {
+    color: #CCCCCC;
+}
+#MyExpanderTitle:hover {
+    background-color: #202020;
+}
+#MyExpanderTitle:hover label {
+    color: #D8D8D8;
+}
+
+#ExpanderBox2 separator, #ExpanderBox3 separator {
+    color: #292929;
+}
+
+/* Editor tab button */
+#MainNotebook > grid label, #MainNotebook > grid image  {
+    /* OK */
+    padding: 1px;
+}
+
+/* File Browser right side tabs - Toolbox, Inspector, Fast Export, Filter */
+notebook tab {
+    background-color: #383838;
+    border-width: 1px;
+    border-style: none;
+    border-color: #262626;
+    border-radius: 0;
+    padding: 3px;
+}
+
+notebook tab:hover {
+    background-color: #505050;
+}
+
+notebook tab:active {
+    border-width: 5px;
+    border-color: #989898;
+}
+
+/* Get rid of shitty notebook header shadow */
+notebook.top tab {
+    border-bottom-style: solid;
+    padding-bottom: 8px;
+}
+notebook.right tab {
+    border-left-style: solid;
+    padding-left: 8px;
+}
+notebook.bottom tab {
+    border-top-style: solid;
+    padding-top: 8px;
+}
+notebook.left tab {
+    border-right-style: solid;
+    padding-right: 8px;
+}
+
+/* Get rid of notebook frame border - too many borders */
+notebook.top.header, notebook.right.header, notebook.bottom.header, notebook.left.header {
+    box-shadow: none;
+    border-width: 1px;
+    border-color: #262626;
+    border-style: none;
+    border-radius: 0;
+    background-color: #383838;
+    padding: 0;
+}
+/* Get rid of notebook header border - too many borders */
+notebook.top.header {
+    /* OK */
+    border-bottom-style: solid;
+}
+notebook.right.header {
+    /* OK */
+    border-left-style: solid;
+}
+notebook.bottom.header {
+    /* OK */
+    border-top-style: solid;
+}
+notebook.left.header {
+    /* OK */
+    border-right-style: solid;
+}
+notebook.frame {
+    /* OK */
+    border-radius: 0;
+    border-style: none;
+}
+
+/* Pad notebooks, makes the other borders look nicer */
+notebook {
+    /* OK */
+    background-color: #484848;
+    padding: 0;
+}
+
+
+#MainNotebook.header {
+    /* OK */
+    background-color: #2A2A2A;
+}
+#MainNotebook > tab {
+    /* OK */
+    background-color: #2A2A2A;
+}
+#MainNotebook > tab:hover {
+    /* OK */
+    background-color: #505050;
+}
+#MainNotebook > tab:active {
+    /* OK */
+    border-color: #989898;
+}
+
+#RightNotebook.header {
+    /* OK */
+    background-color: #2A2A2A;
+}
+#RightNotebook > tab {
+    /* OK */
+    background-color: #2A2A2A;
+}
+#RightNotebook > tab:hover {
+    /* OK */
+    background-color: #505050;
+}
+#RightNotebook > tab:active {
+    /* OK */
+    border-color: #989898;
+}
+
+
+/* All tool panels have a frame except for Meta which unlike the rest is a notebook itself.
+ * So we use CSS to make it look like a frame. */
+#MetaPanelNotebook.frame {
+    border: 1px solid #262626;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-top-width: 0;
+}
+
+#MetaPanelNotebook.header {
+    border: 1px solid #262626;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-bottom-width: 0;
+    padding: 5px;
+    margin: 5px;
+}
+
diff --git a/rtdata/themes/RawTherapee.css b/rtdata/themes/RawTherapee.css
index 23f2af631..3c95e633f 100644
--- a/rtdata/themes/RawTherapee.css
+++ b/rtdata/themes/RawTherapee.css
@@ -2,6 +2,7 @@
   This file is part of RawTherapee.
 
   Copyright (c) 2015 DrSlony
+  Copyright (c) 2016 Hombre
 
   RawTherapee is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -40,23 +41,43 @@
     background-color: #404040;
 }
 
-GtkNotebook {
-    background-color: #404040;
+GtkBox {
+    border-width: 0;
+    border-style: none;
+    border-radius: 0;
+    margin: 0;
+	padding: 0;
+}
+
+GtkGrid {
+    margin: 2px;
+    padding: 0;
+    border-width: 0;
+    border-style: none;
+    border-radius: 0;
 }
 
 /* Affects all frames except in the toolbox */
-.frame {
+GtkFrame {
+    border-width: 0;
     border-color: #303030;
-    border-radius: 4px;
-    padding: 4px 4px 4px 4px;
+    border-radius: 0;
+    border-style: solid;
+    /*border-style: none none none solid;*/
+    padding: 4px;
 }
 
-.filebrowserFrame {
-     padding: 0px;
+GtkFrame > GtkLabel {
+    color: #D8D8D8;
+}
+
+#FileBrowser {
+    padding: 10px;
+    margin: 10px;
 }
 
 /* Frames in Preferences */
-.prefNotebook GtkFrame {
+#PrefNotebook GtkFrame {
     background-color: #3B3B3B;
     border: 1px solid #505050;
     border-radius: 4px;
@@ -67,7 +88,7 @@ GtkEventBox .frame {
     border-color: #565656;
 }
 
-/*.editorTopPanel .button, .toolBarPanelFileBrowser .button, .editorZoomPanel .button {*/
+/*.EditorTopPanel .button, .ToolBarPanelFileBrowser .button, .EditorZoomPanel .button {*/
 .button {
      padding: 1px;
      margin: 1px;
@@ -75,7 +96,7 @@ GtkEventBox .frame {
 
 /* Adjusters */
 .text-button {
-    padding: 0px;
+    padding: 0;
 }
 
 /* Any text-button which is a real button, unlike Slider label */
@@ -149,7 +170,7 @@ GtkButton.Right {
 
 /* [1.23[-][+]] */
 GtkEntry, GtkSpinButton {
-    padding: 1px 10px 0 1px;
+    padding: 1px;
     background-color: #262626;
 }
 
@@ -177,11 +198,20 @@ GtkMenu {
     padding: 2px;
 }
 
+#MyExpander {
+    margin: 10px;
+    padding: 5px;
+}
+
 /* Tool background */
 #ExpanderBox {
     background-color: #363636;
-    border: 1px solid #252525;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #252525;
     border-radius: 4px;
+    margin: 9px;
+    padding: 4px;
 }
 
 #ExpanderBox GtkDrawingArea {
@@ -192,6 +222,8 @@ GtkMenu {
     background-color: #3B3B3B;
     border: 1px solid #313131;
     border-radius: 4px;
+    margin: 3px;
+    padding: 2px;
 }
 
 #ExpanderBox GtkFrame GtkDrawingArea {
@@ -202,6 +234,8 @@ GtkMenu {
     background-color: #414141;
     border: 1px solid #373737;
     border-radius: 4px;
+    margin: 3px;
+    padding: 2px;
 }
 
 #ExpanderBox GtkFrame  GtkFrame GtkDrawingArea {
@@ -213,6 +247,8 @@ GtkMenu {
     background-color: #3B3B3B;
     border: 1px solid #2A2A2A;
     border-radius: 4px;
+    margin: 9px;
+    padding: 4px;
 }
 
 #ExpanderBox2 GtkDrawingArea {
@@ -233,6 +269,8 @@ GtkMenu {
     background-color: #474747;
     border: 1px solid #3D3D3D;
     border-radius: 4px;
+    margin: 3px;
+    padding: 2px;
 }
 
 #ExpanderBox2 GtkFrame GtkFrame GtkDrawingArea {
@@ -240,6 +278,8 @@ GtkMenu {
 }
 
 #MyExpanderTitle {
+    margin: 5px;
+    padding: 3px 1px 3px 1px;
     font-size: 120%;
 }
 #MyExpanderTitle GtkLabel {
@@ -257,15 +297,18 @@ GtkMenu {
 }
 
 /* Editor tab button */
-.mainNotebook > GtkGrid GtkLabel, .mainNotebook > GtkGrid GtkImage  {
+#MainNotebook > GtkGrid GtkLabel, #MainNotebook > GtkGrid GtkImage  {
+    /* OK */
     padding: 1px;
 }
 
 /* File Browser right side tabs - Toolbox, Inspector, Fast Export, Filter */
 GtkNotebook tab {
-    background-color: #404040;
-    border: 1px solid #505050;
-    border-radius: 4px;
+    background-color: #383838;
+    border-width: 1px;
+    border-style: none;
+    border-color: #262626;
+    border-radius: 0;
     padding: 3px;
 }
 
@@ -274,47 +317,122 @@ GtkNotebook tab:hover {
 }
 
 GtkNotebook tab:active {
-    background-color: #262626;
+    border-width: 5px;
+    border-color: #989898;
 }
 
 /* Get rid of shitty notebook header shadow */
-GtkNotebook.header.top, GtkNotebook.header.right, GtkNotebook.header.bottom, GtkNotebook.header.left {
-    box-shadow: none;
+GtkNotebook.top tab {
+    border-bottom-style: solid;
+    padding-bottom: 8px;
 }
-
-/* Get rid of notebook header border - too many borders */
-GtkNotebook.header {
-    border: 0px;
+GtkNotebook.right tab {
+    border-left-style: solid;
+    padding-left: 8px;
+}
+GtkNotebook.bottom tab {
+    border-top-style: solid;
+    padding-top: 8px;
+}
+GtkNotebook.left tab {
+    border-right-style: solid;
+    padding-right: 8px;
 }
 
 /* Get rid of notebook frame border - too many borders */
+GtkNotebook.top.header, GtkNotebook.right.header, GtkNotebook.bottom.header, GtkNotebook.left.header {
+    box-shadow: none;
+    border-width: 1px;
+    border-color: #262626;
+    border-style: none;
+    border-radius: 0;
+    background-color: #383838;
+    padding: 0;
+}
+/* Get rid of notebook header border - too many borders */
+GtkNotebook.top.header {
+    /* OK */
+    border-bottom-style: solid;
+}
+GtkNotebook.right.header {
+    /* OK */
+    border-left-style: solid;
+}
+GtkNotebook.bottom.header {
+    /* OK */
+    border-top-style: solid;
+}
+GtkNotebook.left.header {
+    /* OK */
+    border-right-style: solid;
+}
 GtkNotebook.frame {
-    border: 0px;
+    /* OK */
+    border-radius: 0;
+    border-style: none;
 }
 
 /* Pad notebooks, makes the other borders look nicer */
 GtkNotebook {
-    padding: 2px;
+    /* OK */
+    background-color: #484848;
+    padding: 0;
 }
 
+
+#MainNotebook.header {
+    /* OK */
+    background-color: #2A2A2A;
+}
+#MainNotebook > tab {
+    /* OK */
+    background-color: #2A2A2A;
+}
+#MainNotebook > tab:hover {
+    /* OK */
+    background-color: #505050;
+}
+#MainNotebook > tab:active {
+    /* OK */
+    border-color: #989898;
+}
+
+#RightNotebook.header {
+    /* OK */
+    background-color: #2A2A2A;
+}
+#RightNotebook > tab {
+    /* OK */
+    background-color: #2A2A2A;
+}
+#RightNotebook > tab:hover {
+    /* OK */
+    background-color: #505050;
+}
+#RightNotebook > tab:active {
+    /* OK */
+    border-color: #989898;
+}
+
+
 /* All tool panels have a frame except for Meta which unlike the rest is a notebook itself.
  * So we use CSS to make it look like a frame. */
-.metaPanelNotebook.frame {
+#MetaPanelNotebook.frame {
     border: 1px solid #262626;
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px;
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
-    border-top: 0px;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-top-width: 0;
 }
 
-.metaPanelNotebook.header {
+#MetaPanelNotebook.header {
     border: 1px solid #262626;
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;
-    border-bottom: 0px;
+    border-bottom-width: 0;
     padding: 5px;
     margin: 5px;
 }
diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc
index 0a6e82241..24b063780 100644
--- a/rtgui/adjuster.cc
+++ b/rtgui/adjuster.cc
@@ -66,7 +66,6 @@ Adjuster::Adjuster (Glib::ustring vlabel, double vmin, double vmax, double vstep
 
     delay = options.adjusterMinDelay;
 
-    set_border_width (0);
     set_column_spacing(0);
     set_column_homogeneous(false);
     set_row_spacing(0);
diff --git a/rtgui/batchqueuepanel.cc b/rtgui/batchqueuepanel.cc
index f2000b8c2..2775ba980 100644
--- a/rtgui/batchqueuepanel.cc
+++ b/rtgui/batchqueuepanel.cc
@@ -84,7 +84,6 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog)
     // Output directory selection
     fdir = Gtk::manage (new Gtk::Frame (M("PREFERENCES_OUTDIR")));
     Gtk::VBox* odvb = Gtk::manage (new Gtk::VBox ());
-    odvb->set_border_width (4);
     Gtk::HBox* hb2 = Gtk::manage (new Gtk::HBox ());
     useTemplate = Gtk::manage (new Gtk::RadioButton (M("PREFERENCES_OUTDIRTEMPLATE") + ":"));
     hb2->pack_start (*useTemplate, Gtk::PACK_SHRINK, 4);
@@ -135,7 +134,6 @@ BatchQueuePanel::BatchQueuePanel (FileCatalog* aFileCatalog)
     saveFormatPanel = Gtk::manage (new SaveFormatPanel ());
     setExpandAlignProperties(saveFormatPanel, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
     fformat->add (*saveFormatPanel);
-    fformat->set_border_width(4);
 
     outdirTemplate->set_text (options.savePathTemplate);
     useTemplate->set_active (options.saveUsePathTemplate);
diff --git a/rtgui/bayerprocess.cc b/rtgui/bayerprocess.cc
index bb21d3cab..e1bf790a6 100644
--- a/rtgui/bayerprocess.cc
+++ b/rtgui/bayerprocess.cc
@@ -39,7 +39,6 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
     pack_start( *hb1, Gtk::PACK_SHRINK, 4);
 
     dcbOptions = Gtk::manage (new Gtk::VBox ());
-    dcbOptions->set_border_width(4);
 
     dcbIterations = Gtk::manage (new Adjuster (M("TP_RAW_DCBITERATIONS"), 0, 5, 1, 2));
     dcbIterations->setAdjusterListener (this);
@@ -55,7 +54,6 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
     pack_start( *dcbOptions, Gtk::PACK_SHRINK, 4);
 
     lmmseOptions = Gtk::manage (new Gtk::VBox ());
-    lmmseOptions->set_border_width(4);
 
     lmmseIterations = Gtk::manage (new Adjuster (M("TP_RAW_LMMSEITERATIONS"), 0, 6, 1, 2));
     lmmseIterations->setAdjusterListener (this);
@@ -82,7 +80,6 @@ BayerProcess::BayerProcess () : FoldableToolPanel(this, "bayerprocess", M("TP_RA
 
     //pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
     //allOptions = Gtk::manage (new Gtk::VBox ());
-    //allOptions->set_border_width(2);
     //allEnhance = Gtk::manage (new Gtk::CheckButton(M("TP_RAW_ALLENHANCE")));
     //allOptions->pack_start(*allEnhance);
     //pack_start( *allOptions, Gtk::PACK_SHRINK, 4);
diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc
index 968a67ab6..346c6618e 100644
--- a/rtgui/blackwhite.cc
+++ b/rtgui/blackwhite.cc
@@ -39,7 +39,6 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
     //----------- Method combobox ------------------------------
 
     Gtk::HBox* metHBox = Gtk::manage (new Gtk::HBox ());
-    metHBox->set_border_width (0);
     metHBox->set_spacing (2);
     Gtk::Label* metLabel = Gtk::manage (new Gtk::Label (M("TP_BWMIX_MET") + ":"));
     metHBox->pack_start (*metLabel, Gtk::PACK_SHRINK);
@@ -86,11 +85,9 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
     pack_start (*mixerFrame, Gtk::PACK_SHRINK, 0);
 
     mixerVBox = Gtk::manage (new Gtk::VBox ());
-    mixerVBox->set_border_width(4);
     mixerVBox->set_spacing(4);
 
     autoHBox = Gtk::manage (new Gtk::HBox ());
-    autoHBox->set_border_width (2);
 
     autoch = Gtk::manage (new Gtk::ToggleButton (M("TP_BWMIX_AUTOCH")));
     autoch->set_tooltip_markup (M("TP_BWMIX_AUTOCH_TIP"));
@@ -111,7 +108,6 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
     mixerVBox->pack_start (*Gtk::manage (new  Gtk::HSeparator()));
 
     settingHBox = Gtk::manage (new Gtk::HBox ());
-    settingHBox->set_border_width (0);
     settingHBox->set_spacing (2);
     settingHBox->set_tooltip_markup (M("TP_BWMIX_SETTING_TOOLTIP"));
     Gtk::Label *settingLabel = Gtk::manage (new Gtk::Label (M("TP_BWMIX_SETTING") + ":"));
@@ -163,7 +159,6 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
     mixerVBox->pack_start (*filterSep);
 
     filterHBox = Gtk::manage (new Gtk::HBox ());
-    filterHBox->set_border_width (0);
     filterHBox->set_spacing (2);
     filterHBox->set_tooltip_markup (M("TP_BWMIX_FILTER_TOOLTIP"));
     Gtk::Label *filterLabel = Gtk::manage (new Gtk::Label (M("TP_BWMIX_FILTER") + ":"));
@@ -226,7 +221,6 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
     mixerVBox->pack_start (*filterSep2);
 
     algoHBox = Gtk::manage (new Gtk::HBox ());
-    algoHBox->set_border_width (0);
     algoHBox->set_spacing (2);
     algoHBox->set_tooltip_markup (M("TP_BWMIX_ALGO_TOOLTIP"));
 
@@ -285,7 +279,6 @@ BlackWhite::BlackWhite (): FoldableToolPanel(this, "blackwhite", M("TP_BWMIX_LAB
 
     Gtk::VBox *gammaVBox = Gtk::manage (new Gtk::VBox());
     gammaVBox->set_spacing(4);
-    gammaVBox->set_border_width(4);
 
 
     gammaRed = Gtk::manage(new Adjuster (/*M("TP_BWMIX_GAM_RED")*/"", -100, 100, 1, 0, imgIcon[8]));
diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc
index 083755f79..528047a22 100644
--- a/rtgui/colorappearance.cc
+++ b/rtgui/colorappearance.cc
@@ -41,11 +41,9 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel(this, "colorappearance",
     Gtk::VBox *p1VBox;
 
     p1Frame = Gtk::manage (new Gtk::Frame(M("TP_COLORAPP_LABEL_SCENE")) );
-    p1Frame->set_border_width(0);
     p1Frame->set_label_align(0.025, 0.5);
 
     p1VBox = Gtk::manage ( new Gtk::VBox());
-    p1VBox->set_border_width(4);
     p1VBox->set_spacing(2);
 
     degree  = Gtk::manage (new Adjuster (M("TP_COLORAPP_CIECAT_DEGREE"),    0.,  100.,  1.,   100.));
@@ -64,7 +62,6 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel(this, "colorappearance",
     p1VBox->pack_start (*surrsource, Gtk::PACK_SHRINK);
 
     Gtk::HBox* wbmHBox = Gtk::manage (new Gtk::HBox ());
-    wbmHBox->set_border_width (0);
     wbmHBox->set_spacing (2);
     wbmHBox->set_tooltip_markup (M("TP_COLORAPP_MODEL_TOOLTIP"));
     Gtk::Label* wbmLab = Gtk::manage (new Gtk::Label (M("TP_COLORAPP_MODEL") + ":"));
@@ -100,15 +97,12 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel(this, "colorappearance",
     Gtk::VBox *p2VBox;
 
     p2Frame = Gtk::manage (new Gtk::Frame(M("TP_COLORAPP_LABEL_CAM02")) );
-    p2Frame->set_border_width(0);
     p2Frame->set_label_align(0.025, 0.5);
 
     p2VBox = Gtk::manage ( new Gtk::VBox());
-    p2VBox->set_border_width(4);
     p2VBox->set_spacing(2);
 
     Gtk::HBox* alHBox = Gtk::manage (new Gtk::HBox ());
-    alHBox->set_border_width (0);
     alHBox->set_spacing (2);
     alHBox->set_tooltip_markup (M("TP_COLORAPP_ALGO_TOOLTIP"));
     Gtk::Label* alLabel = Gtk::manage (new Gtk::Label (M("TP_COLORAPP_ALGO") + ":"));
@@ -344,11 +338,9 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel(this, "colorappearance",
     Gtk::VBox *p3VBox;
 
     p3Frame = Gtk::manage (new Gtk::Frame(M("TP_COLORAPP_LABEL_VIEWING")) ); // "Editing viewing conditions" ???
-    p3Frame->set_border_width(0);
     p3Frame->set_label_align(0.025, 0.5);
 
     p3VBox = Gtk::manage ( new Gtk::VBox());
-    p3VBox->set_border_width(4);
     p3VBox->set_spacing(2);
 
     adaplum = Gtk::manage (new Adjuster (M("TP_COLORAPP_ADAPTVIEWING"), 0.1,  1000., 0.1,   16.));
@@ -362,7 +354,6 @@ ColorAppearance::ColorAppearance () : FoldableToolPanel(this, "colorappearance",
     p3VBox->pack_start (*adaplum);
 
     Gtk::HBox* surrHBox = Gtk::manage (new Gtk::HBox ());
-    surrHBox->set_border_width (0);
     surrHBox->set_spacing (2);
     surrHBox->set_tooltip_markup(M("TP_COLORAPP_SURROUND_TOOLTIP"));
     Gtk::Label* surrLabel = Gtk::manage (new Gtk::Label (M("TP_COLORAPP_SURROUND") + ":"));
diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc
index 46d401fea..cab2ff1b4 100644
--- a/rtgui/colortoning.cc
+++ b/rtgui/colortoning.cc
@@ -187,11 +187,9 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
     // Vertical box container for the content of the Process 1 frame
     Gtk::VBox *p1VBox;
     p1Frame = Gtk::manage (new Gtk::Frame(M("TP_COLORTONING_SA")) );
-    p1Frame->set_border_width(0);
     p1Frame->set_label_align(0.025, 0.5);
 
     p1VBox = Gtk::manage ( new Gtk::VBox());
-    p1VBox->set_border_width(4);
     p1VBox->set_spacing(2);
 
     autosat = Gtk::manage (new Gtk::CheckButton (M("TP_COLORTONING_AUTOSAT")));
@@ -287,7 +285,6 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
 
     //--------------------- Reset sliders  ---------------------------
     neutrHBox = Gtk::manage (new Gtk::HBox ());
-    neutrHBox->set_border_width (2);
 
     neutral = Gtk::manage (new Gtk::Button (M("TP_COLORTONING_NEUTRAL")));
     neutral->set_tooltip_text (M("TP_COLORTONING_NEUTRAL_TIP"));
diff --git a/rtgui/curveeditorgroup.cc b/rtgui/curveeditorgroup.cc
index a3dc34cd1..89c66d6b8 100644
--- a/rtgui/curveeditorgroup.cc
+++ b/rtgui/curveeditorgroup.cc
@@ -125,7 +125,6 @@ void CurveEditorGroup::newLine()
             curve_reset = Gtk::manage (new Gtk::Button ());
             curve_reset->add (*Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png")));
             curve_reset->set_relief (Gtk::RELIEF_NONE);
-            curve_reset->set_border_width (0);
             curve_reset->set_tooltip_text (M("CURVEEDITOR_TOOLTIPLINEAR"));
             curve_reset->signal_clicked().connect( sigc::mem_fun(*this, &CurveEditorGroup::curveResetPressed) );
 
diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc
index aec5f4794..816fa1803 100644
--- a/rtgui/dirbrowser.cc
+++ b/rtgui/dirbrowser.cc
@@ -58,7 +58,6 @@ DirBrowser::DirBrowser () : dirTreeModel(),
     dirtree->set_reorderable(false);
     dirtree->set_enable_search(false);
     scrolledwindow4->set_can_focus(true);
-    scrolledwindow4->set_border_width(2);
     scrolledwindow4->set_shadow_type(Gtk::SHADOW_NONE);
     scrolledwindow4->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
     scrolledwindow4->property_window_placement().set_value(Gtk::CORNER_TOP_LEFT);
diff --git a/rtgui/dirpyrdenoise.cc b/rtgui/dirpyrdenoise.cc
index c5e57b543..5148dab28 100644
--- a/rtgui/dirpyrdenoise.cc
+++ b/rtgui/dirpyrdenoise.cc
@@ -42,11 +42,9 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
 
     Gtk::Frame* lumaFrame = Gtk::manage (new Gtk::Frame (M("TP_DIRPYRDENOISE_LUMAFR")) );
     lumaFrame->set_tooltip_text(M("TP_DIRPYRDENOISE_LUMAFR_TOOLTIP"));
-    lumaFrame->set_border_width(0);
     lumaFrame->set_label_align(0.025, 0.5);
 
     Gtk::VBox * lumaVBox = Gtk::manage ( new Gtk::VBox());
-    lumaVBox->set_border_width(4);
     lumaVBox->set_spacing(2);
 
 
@@ -83,12 +81,10 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
     NoiscurveEditorG->show();
 
     Gtk::Frame* chromaFrame = Gtk::manage (new Gtk::Frame (M("TP_DIRPYRDENOISE_CHROMAFR")) );
-    chromaFrame->set_border_width(0);
     chromaFrame->set_label_align(0.025, 0.5);
 
     Gtk::VBox *chromaVBox = Gtk::manage ( new Gtk::VBox());
     chromaVBox->set_spacing(2);
-    chromaVBox->set_border_width(4);
 
     autochroma = Gtk::manage (new Gtk::CheckButton (M("TP_DIRPYRDENOISE_AUTO")));
     autochroma->set_active (true);
@@ -191,12 +187,10 @@ DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP
     // ---- Median FIltering ----
 
     Gtk::Frame* medianFrame = Gtk::manage (new Gtk::Frame ());
-    medianFrame->set_border_width(0);
     medianFrame->set_label_align(0.025, 0.5);
 
     Gtk::VBox *medianVBox = Gtk::manage ( new Gtk::VBox());
     medianVBox->set_spacing(2);
-    medianVBox->set_border_width(4);
 
     median = Gtk::manage (new Gtk::CheckButton (M("TP_DIRPYRDENOISE_MED") + ":"));
     median->set_active (true);
diff --git a/rtgui/dirpyrequalizer.cc b/rtgui/dirpyrequalizer.cc
index f92b09431..d872c89ee 100644
--- a/rtgui/dirpyrequalizer.cc
+++ b/rtgui/dirpyrequalizer.cc
@@ -99,7 +99,6 @@ DirPyrEqualizer::DirPyrEqualizer () : FoldableToolPanel(this, "dirpyrequalizer",
     pack_start(*separator4, Gtk::PACK_SHRINK, 2);
     /*
         algoHBox = Gtk::manage (new Gtk::HBox ());
-        algoHBox->set_border_width (0);
         algoHBox->set_spacing (2);
         algoHBox->set_tooltip_markup (M("TP_DIRPYREQUALIZER_ALGO_TOOLTIP"));
     */
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index 7bf81da3d..7b29af12c 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -240,7 +240,6 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
 
     // build left side panel
     leftbox = new Gtk::VBox ();
-    leftbox->set_border_width (2);
     leftbox->set_size_request (230, 250);
 
     histogramPanel = NULL;
@@ -323,7 +322,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
     tpc->setEditProvider (iareapanel->imageArea);
 
     Gtk::HBox* toolBarPanel = Gtk::manage (new Gtk::HBox ());
-    toolBarPanel->get_style_context ()->add_class ("editorTopPanel");
+    toolBarPanel->set_name ("EditorTopPanel");
     toolBarPanel->pack_start (*hidehp, Gtk::PACK_SHRINK, 1);
     toolBarPanel->pack_start (*vseph, Gtk::PACK_SHRINK, 2);
     toolBarPanel->pack_start (*info, Gtk::PACK_SHRINK, 1);
@@ -358,7 +357,6 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
     vboxright = new Gtk::VBox (false, 0);
     vboxright->set_size_request (300, 250);
 
-    vboxright->set_border_width (2);
 
     vboxright->pack_start (*ppframe, Gtk::PACK_SHRINK, 2);
     // main notebook
diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc
index 54404d700..1ea4298ce 100644
--- a/rtgui/exifpanel.cc
+++ b/rtgui/exifpanel.cc
@@ -38,7 +38,6 @@ ExifPanel::ExifPanel () : idata(NULL)
     exifTree->set_reorderable(false);
     exifTree->set_enable_search(true);
     exifTree->get_selection()->set_mode (Gtk::SELECTION_MULTIPLE);
-    scrolledWindow->set_border_width(2);
     scrolledWindow->set_shadow_type(Gtk::SHADOW_NONE);
     scrolledWindow->set_policy(Gtk::POLICY_ALWAYS, Gtk::POLICY_ALWAYS);
     scrolledWindow->property_window_placement().set_value(Gtk::CORNER_TOP_LEFT);
diff --git a/rtgui/exportpanel.cc b/rtgui/exportpanel.cc
index abe078670..02265b260 100644
--- a/rtgui/exportpanel.cc
+++ b/rtgui/exportpanel.cc
@@ -28,8 +28,6 @@ using namespace rtengine::procparams;
 ExportPanel::ExportPanel () : listener (NULL)
 {
 
-    set_border_width (4);
-
     /*enabled = Gtk::manage ( new Gtk::CheckButton (M("EXPORT_ENABLE")) );
     pack_start(*enabled, Gtk::PACK_SHRINK, 4);
     pack_start (*Gtk::manage(new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 2);*/
diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index b3b53f8c0..6f7578f02 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -53,9 +53,11 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
 
     inTabMode = false;
 
+    set_name ("FileBrowser");
+    set_spacing (2);
+
     //  construct and initialize thumbnail browsers
     fileBrowser = Gtk::manage( new FileBrowser() );
-    fileBrowser->get_style_context()->add_class ("filebrowser");
     fileBrowser->setFileBrowserListener (this);
     fileBrowser->setArrangement (ThumbBrowserBase::TB_Vertical);
     fileBrowser->show ();
@@ -123,7 +125,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
 
     // setup button bar
     buttonBar = Gtk::manage( new Gtk::HBox () );
-    buttonBar->get_style_context()->add_class ("toolBarPanelFileBrowser");
+    buttonBar->set_name ("ToolBarPanelFileBrowser");
     pack_start (*buttonBar, Gtk::PACK_SHRINK);
 
     buttonBar->pack_start (*Gtk::manage(new Gtk::VSeparator), Gtk::PACK_SHRINK);
@@ -410,7 +412,7 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
     hBox = Gtk::manage( new Gtk::HBox () );
     hBox->show ();
     hBox->pack_end (*fileBrowser);
-    hBox->get_style_context()->add_class ("filmstripPanel");
+    hBox->set_name ("FilmstripPanel");
     fileBrowser->applyFilter (getFilter()); // warning: can call this only after all objects used in getFilter (e.g. Query) are instantiated
     //printf("FileCatalog::FileCatalog  fileBrowser->applyFilter (getFilter())\n");
     pack_start (*hBox);
diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc
index 5c93db0dc..af3a61c21 100644
--- a/rtgui/filepanel.cc
+++ b/rtgui/filepanel.cc
@@ -110,18 +110,18 @@ FilePanel::FilePanel () : parent(NULL)
     rightNotebook->set_tab_pos (Gtk::POS_LEFT);
 
     Gtk::Label* devLab = Gtk::manage ( new Gtk::Label (M("MAIN_TAB_DEVELOP")) );
-    devLab->get_style_context()->add_class ("labelRightNotebook");
+    devLab->set_name ("LabelRightNotebook");
     devLab->set_angle (90);
     Gtk::Label* inspectLab = Gtk::manage ( new Gtk::Label (M("MAIN_TAB_INSPECT")) );
-    inspectLab->get_style_context()->add_class ("labelRightNotebook");
+    inspectLab->set_name ("LabelRightNotebook");
     inspectLab->set_angle (90);
     Gtk::Label* filtLab = Gtk::manage ( new Gtk::Label (M("MAIN_TAB_FILTER")) );
-    filtLab->get_style_context()->add_class ("labelRightNotebook");
+    filtLab->set_name ("LabelRightNotebook");
     filtLab->set_angle (90);
     //Gtk::Label* tagLab = Gtk::manage ( new Gtk::Label (M("MAIN_TAB_TAGGING")) );
     //tagLab->set_angle (90);
     Gtk::Label* exportLab = Gtk::manage ( new Gtk::Label (M("MAIN_TAB_EXPORT")) );
-    exportLab->get_style_context()->add_class ("labelRightNotebook");
+    exportLab->set_name ("LabelRightNotebook");
     exportLab->set_angle (90);
 
     tpcPaned = Gtk::manage ( new Gtk::VPaned () );
@@ -133,7 +133,7 @@ FilePanel::FilePanel () : parent(NULL)
     rightNotebook->append_page (*sFilterPanel, *filtLab);
     //rightNotebook->append_page (*taggingBox, *tagLab); commented out: currently the tab is empty ...
     rightNotebook->append_page (*sExportPanel, *exportLab);
-    rightNotebook->get_style_context()->add_class ("rightNotebook");
+    rightNotebook->set_name ("RightNotebook");
 
     rightBox->pack_start (*rightNotebook);
 
diff --git a/rtgui/filterpanel.cc b/rtgui/filterpanel.cc
index 734e8d603..211a65d32 100644
--- a/rtgui/filterpanel.cc
+++ b/rtgui/filterpanel.cc
@@ -26,8 +26,6 @@ using namespace rtengine;
 FilterPanel::FilterPanel () : listener (NULL)
 {
 
-    set_border_width (4);
-
     enabled = Gtk::manage (new Gtk::CheckButton (M("EXIFFILTER_METADATAFILTER")));
     pack_start (*enabled, Gtk::PACK_SHRINK, 2);
     pack_start (*Gtk::manage(new Gtk::HSeparator ()), Gtk::PACK_SHRINK, 2);
diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc
index f2c510b5f..fe005663d 100644
--- a/rtgui/guiutils.cc
+++ b/rtgui/guiutils.cc
@@ -528,7 +528,6 @@ void ExpanderBox::setLevel(int level)
 
 void ExpanderBox::updateStyle()
 {
-    set_border_width(2);
 }
 
 void ExpanderBox::show_all()
@@ -561,13 +560,13 @@ MyExpander::MyExpander(bool useEnabled, Gtk::Widget* titleWidget) :
     child(NULL), headerWidget(NULL), statusImage(NULL),
     label(NULL), useEnabled(useEnabled)
 {
-    set_spacing(0);
     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());
@@ -690,9 +689,7 @@ bool MyExpander::on_enter_leave_enable (GdkEventCrossing* event)
 void MyExpander::updateStyle()
 {
     headerHBox->set_spacing(2);
-    headerHBox->set_border_width(1);
     set_spacing(0);
-    set_border_width(0);
 
     if (expBox) {
         expBox->updateStyle();
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index 1e3a479e1..a82df41f6 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -44,11 +44,9 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
 
 
     Gtk::Frame *iFrame = Gtk::manage (new Gtk::Frame(M("TP_ICM_INPUTPROFILE")) );
-    //iFrame->set_border_width(0);
     iFrame->set_label_align(0.025, 0.5);
 
     iVBox = Gtk::manage ( new Gtk::VBox());
-    //iVBox->set_border_width(4);
     iVBox->set_spacing(2);
 
     inone = Gtk::manage (new Gtk::RadioButton (M("TP_ICM_INPUTNONE")));
@@ -161,11 +159,9 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
 
 
     Gtk::Frame *wFrame = Gtk::manage (new Gtk::Frame(M("TP_ICM_WORKINGPROFILE")) );
-    //wFrame->set_border_width(0);
     wFrame->set_label_align(0.025, 0.5);
 
     Gtk::VBox *wVBox = Gtk::manage ( new Gtk::VBox());
-    //wVBox->set_border_width(4);
     wVBox->set_spacing(2);
 
     wnames = Gtk::manage (new MyComboBoxText ());
@@ -187,11 +183,9 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
 
 
     Gtk::Frame *oFrame = Gtk::manage (new Gtk::Frame(M("TP_ICM_OUTPUTPROFILE")) );
-    //oFrame->set_border_width(0);
     oFrame->set_label_align(0.025, 0.5);
 
     Gtk::VBox *oVBox = Gtk::manage ( new Gtk::VBox());
-    //oVBox->set_border_width(4);
     oVBox->set_spacing(2);
 
     onames = Gtk::manage (new MyComboBoxText ());
@@ -245,7 +239,6 @@ ICMPanel::ICMPanel () : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunch
 
     Gtk::VBox *fgVBox = Gtk::manage ( new Gtk::VBox());
     fgVBox->set_spacing(2);
-    //fgVBox->set_border_width(4);
 
     freegamma = Gtk::manage(new Gtk::CheckButton((M("TP_GAMMA_FREE"))));
     freegamma->set_active (false);
diff --git a/rtgui/imageareapanel.cc b/rtgui/imageareapanel.cc
index 9a351d66a..31648f190 100644
--- a/rtgui/imageareapanel.cc
+++ b/rtgui/imageareapanel.cc
@@ -21,8 +21,6 @@
 ImageAreaPanel::ImageAreaPanel () : before(NULL), after(NULL)
 {
 
-    set_border_width (2);
-
     imageArea = new ImageArea (this);
 
     Gtk::HBox*  hb1   = Gtk::manage (new Gtk::HBox ());
diff --git a/rtgui/iptcpanel.cc b/rtgui/iptcpanel.cc
index c3a2cf39f..447de9c7a 100644
--- a/rtgui/iptcpanel.cc
+++ b/rtgui/iptcpanel.cc
@@ -26,8 +26,6 @@ using namespace rtengine::procparams;
 IPTCPanel::IPTCPanel ()
 {
 
-    set_border_width (2);
-
     Gtk::Table* iptc = Gtk::manage( new Gtk::Table (27, 2) );
 
     int row = 0;
@@ -258,7 +256,6 @@ IPTCPanel::IPTCPanel ()
     row++;
 
     Gtk::ScrolledWindow* scrolledWindow = Gtk::manage( new Gtk::ScrolledWindow() );
-    scrolledWindow->set_border_width(2);
     scrolledWindow->set_shadow_type(Gtk::SHADOW_NONE);
     scrolledWindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_ALWAYS);
     scrolledWindow->property_window_placement().set_value(Gtk::CORNER_TOP_LEFT);
diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc
index 5ad5cc73f..edd0b8e4a 100644
--- a/rtgui/partialpastedlg.cc
+++ b/rtgui/partialpastedlg.cc
@@ -129,7 +129,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
 
     for (int i = 0; i < 8; i++) {
         vboxes[i] = Gtk::manage (new Gtk::VBox ());
-        vboxes[i]->set_border_width (6);
         hseps[i] = Gtk::manage (new Gtk::HSeparator ());
         hseps[i]->set_name("partialPasteHeaderSep");
     }
@@ -237,10 +236,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
     Gtk::VBox* vbCol2 = Gtk::manage (new Gtk::VBox ());
     Gtk::VBox* vbCol3 = Gtk::manage (new Gtk::VBox ());
 
-    vbCol1->set_border_width (8);
-    vbCol2->set_border_width (8);
-    vbCol3->set_border_width (8);
-
     for (int i = 0; i < 3; i++) {
         vbCol1->pack_start (*vboxes[i], Gtk::PACK_SHRINK, 2);
     }
@@ -255,7 +250,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
 
     Gtk::VBox* vbtop = Gtk::manage (new Gtk::VBox ());
     vbtop->pack_start (*everything, Gtk::PACK_SHRINK, 2);
-    vbtop->set_border_width (8);
 
     Gtk::Dialog::get_content_area()->pack_start (*vbtop, Gtk::PACK_SHRINK, 2); // TODO replace with get_content_area() with GTK upgrade
 
@@ -268,7 +262,6 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring& title, Gtk::Window* paren
 
     scrolledwindow = Gtk::manage ( new Gtk::ScrolledWindow() );
     scrolledwindow->set_can_focus(true);
-    scrolledwindow->set_border_width(2);
     scrolledwindow->set_shadow_type(Gtk::SHADOW_NONE);
     scrolledwindow->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
     scrolledwindow->property_window_placement().set_value(Gtk::CORNER_TOP_LEFT);
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 124cd37a5..b3d675397 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -54,14 +54,13 @@ Preferences::Preferences  (RTWindow *rtwindow)
      */
     set_size_request (650, -1);
     set_default_size (options.preferencesWidth, options.preferencesHeight);
-    set_border_width(4);
 
     Gtk::Box* mainBox = get_content_area ();
     mainBox->set_spacing(8);
     //set_has_separator (false);
 
     Gtk::Notebook* nb = Gtk::manage (new Gtk::Notebook ());
-    nb->get_style_context()->add_class ("prefNotebook");
+    nb->set_name ("PrefNotebook");
     mainBox->pack_start (*nb);
 
     Gtk::HBox* buttonpanel = Gtk::manage (new Gtk::HBox ());
@@ -111,11 +110,9 @@ Gtk::Widget* Preferences::getBatchProcPanel ()
 {
 
     Gtk::VBox* mvbpp = Gtk::manage (new Gtk::VBox ());
-    mvbpp->set_border_width(4);
 
     Gtk::ScrolledWindow* behscrollw = Gtk::manage (new Gtk::ScrolledWindow ());
     behscrollw->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-    behscrollw->set_border_width(8);
     behscrollw->set_size_request(-1, 60);
     Gtk::VBox* vbbeh = Gtk::manage( new Gtk::VBox () );
     vbbeh->pack_start (*behscrollw, Gtk::PACK_EXPAND_WIDGET);
@@ -415,7 +412,6 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
 
     Gtk::Frame* fpp = Gtk::manage (new Gtk::Frame (M("PREFERENCES_IMPROCPARAMS")));
     Gtk::VBox* vbpp = Gtk::manage (new Gtk::VBox ());
-    vbpp->set_border_width(4);
     Gtk::Label* drlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_FORRAW") + ":", Gtk::ALIGN_START));
     rprofiles = Gtk::manage (new ProfileStoreComboBox ());
     rprofiles->set_size_request(50, -1);
@@ -447,7 +443,6 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
     custProfBuilderLabelType->append (M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME"));
     custProfBuilderLabelType->append (M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_TID") + "_" + M("PREFERENCES_CUSTPROFBUILDKEYFORMAT_NAME"));
     Gtk::Table* cpbt = Gtk::manage (new Gtk::Table (2, 2));
-    cpbt->set_border_width(4);
     cpbt->attach (*cplab, 0, 1, 0, 1, Gtk::FILL, Gtk::SHRINK, 2, 2);
     cpbt->attach (*txtCustProfBuilderPath, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL | Gtk::SHRINK, Gtk::SHRINK, 2, 2);
     cpbt->attach (*cpltypelab, 0, 1, 1, 2, Gtk::FILL, Gtk::SHRINK, 2, 2);
@@ -457,7 +452,6 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
 
     Gtk::Frame* fdp = Gtk::manage (new Gtk::Frame (M("PREFERENCES_PROFILEHANDLING")));
     Gtk::VBox* vbdp = Gtk::manage (new Gtk::VBox ());
-    vbdp->set_border_width (4);
     saveParamsFile = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_PROFILESAVEINPUT")));
     vbdp->pack_start (*saveParamsFile, Gtk::PACK_SHRINK, 4);
     saveParamsCache = Gtk::manage (new Gtk::CheckButton (M("PREFERENCES_PROFILESAVECACHE")));
@@ -486,7 +480,6 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
     vbdf->pack_start( *dfLabel, Gtk::PACK_SHRINK, 4 );
     fdf->add( *vbdf );
     mvbpp->pack_start ( *fdf , Gtk::PACK_SHRINK, 4);
-    mvbpp->set_border_width (4);
 
     //dfconn = darkFrameDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::darkFrameChanged), true);
     dfconn = darkFrameDir->signal_current_folder_changed().connect ( sigc::mem_fun(*this, &Preferences::darkFrameChanged), true);
@@ -504,7 +497,6 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
     vbff->pack_start( *ffLabel, Gtk::PACK_SHRINK, 4 );
     fff->add( *vbff );
     mvbpp->pack_start ( *fff , Gtk::PACK_SHRINK, 4);
-    mvbpp->set_border_width (4);
 
     //ffconn = flatFieldDir->signal_file_set().connect ( sigc::mem_fun(*this, &Preferences::flatFieldChanged), true);
     ffconn = flatFieldDir->signal_current_folder_changed().connect ( sigc::mem_fun(*this, &Preferences::flatFieldChanged), true);
@@ -518,7 +510,6 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
     clutsDirBox->pack_start( *clutsDirLabel, Gtk::PACK_SHRINK, 4 );
     clutsDirBox->pack_start( *clutsDir );
     clutsDirBox->pack_start( *clutsRestartNeeded, Gtk::PACK_SHRINK, 4 );
-    clutsDirBox->set_border_width( 4 );
     clutsDirFrame->add( *clutsDirBox );
     mvbpp->pack_start( *clutsDirFrame, Gtk::PACK_SHRINK, 4 );
 
@@ -535,7 +526,6 @@ Gtk::Widget* Preferences::getProcParamsPanel ()
 Gtk::Widget* Preferences::getPerformancePanel ()
 {
     Gtk::VBox* mainContainer = Gtk::manage( new Gtk::VBox () );
-    mainContainer->set_border_width (4);
     mainContainer->set_spacing(4);
 
     Gtk::Frame* fprevdemo = Gtk::manage (new Gtk::Frame (M("PREFERENCES_PREVDEMO")));
@@ -548,7 +538,6 @@ Gtk::Widget* Preferences::getPerformancePanel ()
     hbprevdemo->pack_start (*lprevdemo, Gtk::PACK_SHRINK);
     hbprevdemo->pack_start (*cprevdemo);
     fprevdemo->add (*hbprevdemo);
-    hbprevdemo->set_border_width(4);
     mainContainer->pack_start (*fprevdemo, Gtk::PACK_SHRINK, 4);
 
     Gtk::Frame* ftiffserialize = Gtk::manage (new Gtk::Frame (M("PREFERENCES_SERIALIZE_TIFF_READ")));
@@ -557,12 +546,10 @@ Gtk::Widget* Preferences::getPerformancePanel ()
     ctiffserialize->set_tooltip_text(M("PREFERENCES_SERIALIZE_TIFF_READ_TOOLTIP"));
     htiffserialize->pack_start (*ctiffserialize);
     ftiffserialize->add (*htiffserialize);
-    htiffserialize->set_border_width(4);
     mainContainer->pack_start (*ftiffserialize, Gtk::PACK_SHRINK, 4);
 
     Gtk::Frame* fclut = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CLUTSCACHE")) );
     Gtk::HBox* clutCacheSizeHB = Gtk::manage( new Gtk::HBox () );
-    clutCacheSizeHB->set_border_width(4);
     clutCacheSizeHB->set_spacing(4);
     Gtk::Label* CLUTLl = Gtk::manage( new Gtk::Label (M("PREFERENCES_CLUTSCACHE_LABEL") + ":", Gtk::ALIGN_START));
     clutCacheSizeSB = Gtk::manage( new Gtk::SpinButton () );
@@ -581,7 +568,6 @@ Gtk::Widget* Preferences::getPerformancePanel ()
 
     Gtk::Frame* finspect = Gtk::manage(  new Gtk::Frame (M("PREFERENCES_INSPECT_LABEL")) );
     Gtk::HBox* maxIBuffersHB = Gtk::manage( new Gtk::HBox () );
-    maxIBuffersHB->set_border_width(4);
     maxIBuffersHB->set_spacing(4);
     maxIBuffersHB->set_tooltip_text(M("PREFERENCES_INSPECT_MAXBUFFERS_TOOLTIP"));
     Gtk::Label* maxIBufferLbl = Gtk::manage( new Gtk::Label (M("PREFERENCES_INSPECT_MAXBUFFERS_LABEL") + ":", Gtk::ALIGN_START));
@@ -597,7 +583,6 @@ Gtk::Widget* Preferences::getPerformancePanel ()
 
     Gtk::Frame* fdenoise = Gtk::manage( new Gtk::Frame (M("PREFERENCES_NOISE")) );
     Gtk::VBox* vbdenoise = Gtk::manage( new Gtk::VBox (Gtk::PACK_SHRINK, 4) );
-    vbdenoise->set_border_width (4);
 
     Gtk::Label* lreloadneeded2 = Gtk::manage (new Gtk::Label (M("PREFERENCES_IMG_RELOAD_NEEDED"), Gtk::ALIGN_START));
     Gtk::HBox* threadLimitHB = Gtk::manage (new Gtk::HBox (Gtk::PACK_SHRINK, 4));
@@ -682,7 +667,6 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
 {
 
     Gtk::VBox* mvbcm = Gtk::manage (new Gtk::VBox ());
-    mvbcm->set_border_width (4);
 
     iccDir = Gtk::manage (new Gtk::FileChooserButton (M("PREFERENCES_ICCDIR"), Gtk::FILE_CHOOSER_ACTION_SELECT_FOLDER));
     Gtk::Label* pdlabel = Gtk::manage (new Gtk::Label (M("PREFERENCES_ICCDIR") + ":", Gtk::ALIGN_START));
@@ -735,7 +719,6 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
 #endif
 
     Gtk::VBox* vbdp = Gtk::manage (new Gtk::VBox ());
-    vbdp->set_border_width (4);
     Gtk::Label* viewlab = Gtk::manage (new Gtk::Label (M("PREFERENCES_VIEW") + ":", Gtk::ALIGN_START));
 
     view = Gtk::manage (new Gtk::ComboBoxText ());
@@ -765,7 +748,6 @@ Gtk::Widget* Preferences::getColorManagementPanel ()
 
     Gtk::Frame* fcielab = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CIEART_FRAME")) );
     Gtk::VBox* vbcielab = Gtk::manage( new Gtk::VBox () );
-    vbcielab->set_border_width (4);
 
     Gtk::Label* lreloadneeded1 = Gtk::manage (new Gtk::Label (M("PREFERENCES_IMG_RELOAD_NEEDED"), Gtk::ALIGN_START));
     Gtk::Table* colo = Gtk::manage (new Gtk::Table (4, 2));
@@ -795,7 +777,6 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     mvbsd->set_row_spacing(4);
 
     Gtk::Frame* fworklflow = Gtk::manage (new Gtk::Frame (M("PREFERENCES_WORKFLOW")));
-    fworklflow->set_border_width(4);
     setExpandAlignProperties(fworklflow, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
     Gtk::Grid* workflowGrid = Gtk::manage (new Gtk::Grid());
     workflowGrid->set_column_spacing(4);
@@ -865,7 +846,6 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     // ---------------------------------------------
 
     Gtk::Frame* flang = Gtk::manage( new Gtk::Frame (M("PREFERENCES_DEFAULTLANG")) );
-    flang->set_border_width(4);
     setExpandAlignProperties(flang, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
     Gtk::Grid* langGrid = Gtk::manage( new Gtk::Grid() );
     langGrid->set_column_spacing(4);
@@ -901,7 +881,6 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     // ---------------------------------------------
 
     Gtk::Frame* ftheme = Gtk::manage( new Gtk::Frame (M("PREFERENCES_DEFAULTTHEME")) );
-    ftheme->set_border_width(4);
     setExpandAlignProperties(ftheme, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_START);
     Gtk::Grid* themeGrid = Gtk::manage( new Gtk::Grid() );
     themeGrid->set_column_spacing(4);
@@ -968,7 +947,6 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     // ---------------------------------------------
 
     Gtk::Frame* fclip = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CLIPPINGIND")));
-    fclip->set_border_width(4);
     setExpandAlignProperties(fclip, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
     Gtk::Grid* clipGrid = Gtk::manage( new Gtk::Grid() );
     clipGrid->set_column_spacing(4);
@@ -1002,7 +980,6 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     // ---------------------------------------------
 
     Gtk::Frame* fnav = Gtk::manage( new Gtk::Frame (M("PREFERENCES_NAVIGATIONFRAME")) );
-    fnav->set_border_width(4);
     setExpandAlignProperties(fclip, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
     Gtk::Grid* navigationGrid = Gtk::manage( new Gtk::Grid() );
     navigationGrid->set_column_spacing(4);
@@ -1031,7 +1008,6 @@ Gtk::Widget* Preferences::getGeneralPanel ()
     // ---------------------------------------------
 
     Gtk::Frame* fdg = Gtk::manage( new Gtk::Frame (M("PREFERENCES_EXTERNALEDITOR")) );
-    fdg->set_border_width(4);
     setExpandAlignProperties(fdg, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_FILL);
     Gtk::Grid* externaleditorGrid = Gtk::manage( new Gtk::Grid() );
     externaleditorGrid->set_column_spacing(4);
@@ -1104,7 +1080,6 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
 {
 
     Gtk::VBox* mvbfb = Gtk::manage( new Gtk::VBox () );
-    mvbfb->set_border_width (4);
 
     Gtk::Frame* fsd = Gtk::manage( new Gtk::Frame (M("PREFERENCES_STARTUPIMDIR")) );
 
@@ -1131,7 +1106,6 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
     otherbox->pack_start (*startupdir);
     otherbox->pack_end (*sdselect, Gtk::PACK_SHRINK, 4);
     vbsd->pack_start (*otherbox, Gtk::PACK_SHRINK, 0);
-    vbsd->set_border_width (4);
 
     fsd->add (*vbsd);
     mvbfb->pack_start (*fsd, Gtk::PACK_SHRINK, 4);
@@ -1154,7 +1128,6 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
     sameThumbSize->set_tooltip_text(M("PREFERENCES_FSTRIP_SAME_THUMB_HEIGHT_HINT"));
     ckbInternalThumbIfUntouched = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_INTERNALTHUMBIFUNTOUCHED")));
 
-    vbro->set_border_width (4);
     vbro->pack_start (*showDateTime, Gtk::PACK_SHRINK, 0);
     Gtk::Label* dflab = Gtk::manage( new Gtk::Label (M("PREFERENCES_DATEFORMAT") + ":", Gtk::ALIGN_START));
     dateformat = Gtk::manage( new Gtk::Entry () );
@@ -1193,7 +1166,6 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
     ckbmenuGroupExtProg = Gtk::manage( new Gtk::CheckButton (M("PREFERENCES_MENUGROUPEXTPROGS")) );
     Gtk::VBox* vbmnu = Gtk::manage( new Gtk::VBox () );
 
-    vbmnu->set_border_width (4);
     vbmnu->pack_start (*ckbmenuGroupRank, Gtk::PACK_SHRINK, 0);
     vbmnu->pack_start (*ckbmenuGroupLabel, Gtk::PACK_SHRINK, 0);
     vbmnu->pack_start (*ckbmenuGroupFileOperations, Gtk::PACK_SHRINK, 0);
@@ -1205,7 +1177,6 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
 
     Gtk::Frame* fre = Gtk::manage( new Gtk::Frame (M("PREFERENCES_PARSEDEXT")) );
     Gtk::VBox* vbre = Gtk::manage( new Gtk::VBox () );
-    vbre->set_border_width (4);
     Gtk::HBox* hb0 = Gtk::manage( new Gtk::HBox () );
     Gtk::Label* elab = Gtk::manage( new Gtk::Label (M("PREFERENCES_PARSEDEXTADD") + ":") );
     hb0->pack_start (*elab, Gtk::PACK_SHRINK, 4);
@@ -1250,7 +1221,6 @@ Gtk::Widget* Preferences::getFileBrowserPanel ()
     Gtk::Frame* frc = Gtk::manage( new Gtk::Frame (M("PREFERENCES_CACHEOPTS")) );
     Gtk::VBox* vbc = Gtk::manage( new Gtk::VBox () );
     frc->add (*vbc);
-    vbc->set_border_width (4);
 
     Gtk::HBox* hb3 = Gtk::manage( new Gtk::HBox () );
     Gtk::Label* chlab = Gtk::manage( new Gtk::Label (M("PREFERENCES_CACHETHUMBHEIGHT") + ":") );
@@ -1356,8 +1326,6 @@ Gtk::Widget* Preferences::getSoundPanel ()
 
     pSnd->pack_start (*pSndLngEditProcDone, Gtk::PACK_SHRINK, 4);
 
-    pSnd->set_border_width (4);
-
     sndEnableToggled();
 
     return pSnd;
diff --git a/rtgui/previewmodepanel.cc b/rtgui/previewmodepanel.cc
index 63989809d..ca15fedf7 100644
--- a/rtgui/previewmodepanel.cc
+++ b/rtgui/previewmodepanel.cc
@@ -93,7 +93,6 @@ PreviewModePanel::PreviewModePanel (ImageArea* ia) : imageArea(ia)
     backColor2->set_active (options.bgcolor == 2 ? true : false);
 
     vbbackColor = Gtk::manage (new Gtk::VBox ());
-    vbbackColor->set_border_width (0);
     vbbackColor->pack_start (*backColor0, Gtk::PACK_SHRINK, 0);
     vbbackColor->pack_start (*backColor1, Gtk::PACK_SHRINK, 0);
     vbbackColor->pack_start (*backColor2, Gtk::PACK_SHRINK, 0);
diff --git a/rtgui/prsharpening.cc b/rtgui/prsharpening.cc
index 061f41431..8746f7e96 100644
--- a/rtgui/prsharpening.cc
+++ b/rtgui/prsharpening.cc
@@ -33,7 +33,6 @@ PrSharpening::PrSharpening () : FoldableToolPanel(this, "prsharpening", M("TP_PR
     //setEnabledTooltipMarkup(M("TP_PRSHARPENING_TOOLTIP"));
 
     Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
-    hb->set_border_width (4);
     hb->show ();
     Gtk::Label* ml = Gtk::manage (new Gtk::Label (M("TP_SHARPENING_METHOD") + ":"));
     ml->show ();
diff --git a/rtgui/rawprocess.cc b/rtgui/rawprocess.cc
index 0ca4350cc..4b37ed816 100644
--- a/rtgui/rawprocess.cc
+++ b/rtgui/rawprocess.cc
@@ -39,7 +39,6 @@ RawProcess::RawProcess () : FoldableToolPanel(this)
     pack_start( *hb1, Gtk::PACK_SHRINK, 4);
 
     dcbOptions = Gtk::manage (new Gtk::VBox ());
-    dcbOptions->set_border_width(4);
 
     dcbIterations = Gtk::manage (new Adjuster (M("TP_RAW_DCBITERATIONS"), 0, 5, 1, 2));
     dcbIterations->setAdjusterListener (this);
@@ -55,7 +54,6 @@ RawProcess::RawProcess () : FoldableToolPanel(this)
     pack_start( *dcbOptions, Gtk::PACK_SHRINK, 4);
 
     lmmseOptions = Gtk::manage (new Gtk::VBox ());
-    lmmseOptions->set_border_width(4);
 
     lmmseIterations = Gtk::manage (new Adjuster (M("TP_RAW_LMMSEITERATIONS"), 0, 6, 1, 2));
     lmmseIterations->setAdjusterListener (this);
@@ -82,7 +80,6 @@ RawProcess::RawProcess () : FoldableToolPanel(this)
 
     //pack_start( *Gtk::manage( new Gtk::HSeparator()), Gtk::PACK_SHRINK, 0 );
     //allOptions = Gtk::manage (new Gtk::VBox ());
-    //allOptions->set_border_width(2);
     //allEnhance = Gtk::manage (new Gtk::CheckButton(M("TP_RAW_ALLENHANCE")));
     //allOptions->pack_start(*allEnhance);
     //pack_start( *allOptions, Gtk::PACK_SHRINK, 4);
diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc
index e1b3a11a6..b517daad6 100644
--- a/rtgui/retinex.cc
+++ b/rtgui/retinex.cc
@@ -22,11 +22,9 @@ Retinex::Retinex () : FoldableToolPanel (this, "retinex", M ("TP_RETINEX_LABEL")
     nextmaxT = 0.;
 
     Gtk::VBox * retinexVBox = Gtk::manage ( new Gtk::VBox());
-    retinexVBox->set_border_width (4);
     retinexVBox->set_spacing (2);
 
     Gtk::VBox * settingsVBox = Gtk::manage ( new Gtk::VBox());
-    settingsVBox->set_border_width (4);
     settingsVBox->set_spacing (2);
 
     dhbox = Gtk::manage (new Gtk::HBox ());
@@ -177,12 +175,10 @@ Retinex::Retinex () : FoldableToolPanel (this, "retinex", M ("TP_RETINEX_LABEL")
 
     Gtk::Frame *p1Frame;
     p1Frame = Gtk::manage (new Gtk::Frame (M ("TP_RETINEX_LABEL_MASK")) );
-    p1Frame->set_border_width (0);
     p1Frame->set_label_align (0.025, 0.5);
 
     Gtk::VBox *p1VBox;
     p1VBox = Gtk::manage ( new Gtk::VBox());
-    p1VBox->set_border_width (4);
     p1VBox->set_spacing (2);
 
     mapbox = Gtk::manage (new Gtk::HBox ());
@@ -343,7 +339,6 @@ Retinex::Retinex () : FoldableToolPanel (this, "retinex", M ("TP_RETINEX_LABEL")
     expsettings->setLevel (2);
 
     neutrHBox = Gtk::manage (new Gtk::HBox ());
-    neutrHBox->set_border_width (2);
 
     neutral = Gtk::manage (new Gtk::Button (M ("TP_RETINEX_NEUTRAL")));
     RTImage *resetImg = Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"));
diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc
index dc9a92055..44a18a21a 100644
--- a/rtgui/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -159,7 +159,7 @@ RTWindow::RTWindow ()
         }
     } else {
         mainNB = Gtk::manage (new Gtk::Notebook ());
-        mainNB->get_style_context()->add_class ("mainNotebook");
+        mainNB->set_name ("MainNotebook");
         mainNB->set_scrollable (true);
         mainNB->signal_switch_page().connect_notify( sigc::mem_fun(*this, &RTWindow::on_mainNB_switch_page) );
 
diff --git a/rtgui/saveasdlg.cc b/rtgui/saveasdlg.cc
index 3ecb18d54..726b86eaa 100644
--- a/rtgui/saveasdlg.cc
+++ b/rtgui/saveasdlg.cc
@@ -130,7 +130,6 @@ SaveAsDialog::SaveAsDialog (const Glib::ustring& initialDir, Gtk::Window* parent
     get_action_area()->pack_end (*ok, Gtk::PACK_SHRINK, 4);
     get_action_area()->pack_end (*cancel, Gtk::PACK_SHRINK, 4);
 
-    set_border_width (4);
     show_all_children ();
 
     formatOpts->init (options.saveFormat);
diff --git a/rtgui/sharpening.cc b/rtgui/sharpening.cc
index 869df28a0..c803d46ef 100644
--- a/rtgui/sharpening.cc
+++ b/rtgui/sharpening.cc
@@ -28,7 +28,6 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
     setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
 
     Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
-    hb->set_border_width (4);
     hb->show ();
     Gtk::Label* ml = Gtk::manage (new Gtk::Label (M("TP_SHARPENING_METHOD") + ":"));
     ml->show ();
diff --git a/rtgui/splash.cc b/rtgui/splash.cc
index 35a80e6d6..02fcc7cfc 100644
--- a/rtgui/splash.cc
+++ b/rtgui/splash.cc
@@ -77,8 +77,6 @@ bool SplashImage::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
 Splash::Splash (Gtk::Window& parent) : Gtk::Dialog(M("GENERAL_ABOUT"), parent, true)
 {
 
-    set_border_width (4);
-
     releaseNotesSW = NULL;
 
     nb = Gtk::manage (new Gtk::Notebook ());
diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc
index 3ea81a443..190c924c5 100644
--- a/rtgui/thresholdadjuster.cc
+++ b/rtgui/thresholdadjuster.cc
@@ -98,7 +98,6 @@ void ThresholdAdjuster::initObject (Glib::ustring label, bool editedcb)
     reset = Gtk::manage (new Gtk::Button ());
     reset->add (*Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png")));
     reset->set_relief (Gtk::RELIEF_NONE);
-    reset->set_border_width (0);
     reset->set_tooltip_text (M("ADJUSTER_RESET_TO_DEFAULT"));
 
     hbox->pack_end (*reset, Gtk::PACK_SHRINK, 0);
diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc
index c162ad3e3..ba1a7c887 100644
--- a/rtgui/thumbbrowserbase.cc
+++ b/rtgui/thumbbrowserbase.cc
@@ -33,11 +33,7 @@ ThumbBrowserBase::ThumbBrowserBase ()
 
     Gtk::HBox* hb1 = Gtk::manage( new Gtk::HBox () );
     Gtk::HBox* hb2 = Gtk::manage( new Gtk::HBox () );
-    Gtk::Frame* frame = Gtk::manage( new Gtk::Frame () );
-    frame->get_style_context()->add_class ("filebrowserFrame");
-    frame->add (internal);
-    frame->set_shadow_type (Gtk::SHADOW_IN );
-    hb1->pack_start (*frame);
+    hb1->pack_start (internal);
     hb1->pack_end (vscroll, Gtk::PACK_SHRINK, 0);
 
     pack_start (*hb1);
@@ -879,6 +875,7 @@ bool ThumbBrowserBase::Internal::on_draw(const ::Cairo::RefPtr< Cairo::Context>
             }
         }
     }
+    style->render_frame(cr, 0., 0., w, h);
 
     return true;
 }
diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc
index b2d61dc57..74647c846 100644
--- a/rtgui/tonecurve.cc
+++ b/rtgui/tonecurve.cc
@@ -37,7 +37,6 @@ ToneCurve::ToneCurve () : FoldableToolPanel(this, "tonecurve", M("TP_EXPOSURE_LA
 
 //----------- Auto Levels ----------------------------------
     abox = Gtk::manage (new Gtk::HBox ());
-    abox->set_border_width (2);
     abox->set_spacing (10);
 
     autolevels = Gtk::manage (new Gtk::ToggleButton (M("TP_EXPOSURE_AUTOLEVELS")));
diff --git a/rtgui/toolpanel.cc b/rtgui/toolpanel.cc
index e37f13c7d..2a5c89109 100644
--- a/rtgui/toolpanel.cc
+++ b/rtgui/toolpanel.cc
@@ -31,7 +31,6 @@ ToolVBox::ToolVBox()
 void ToolVBox::updateStyle()
 {
     set_spacing(1);       // Vertical space between tools
-    set_border_width(1);  // Space separating the tab's frame and the tools
 }
 
 void ToolVBox::on_style_updated ()
@@ -47,7 +46,6 @@ ToolParamBlock::ToolParamBlock()
 void ToolParamBlock::updateStyle()
 {
     set_spacing(2);       // Vertical space between parameters in a single tool
-    set_border_width(6);  // Space separating the parameters of a tool and its surrounding frame
 }
 
 void ToolParamBlock::on_style_updated ()
@@ -61,7 +59,6 @@ FoldableToolPanel::FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName,
         return;
     }
 
-//  exp->set_border_width (5);
 //  exp->set_use_markup (true);
     if (need11) {
         Gtk::HBox *titleHBox = Gtk::manage(new Gtk::HBox());
diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc
index 6198e4662..fa57256ce 100644
--- a/rtgui/toolpanelcoord.cc
+++ b/rtgui/toolpanelcoord.cc
@@ -198,9 +198,9 @@ ToolPanelCoordinator::ToolPanelCoordinator () : ipc(NULL)
     toolPanels.push_back (iptcpanel);
 
     metadataPanel = Gtk::manage (new Gtk::Notebook ());
-    metadataPanel->get_style_context()->add_class ("metaPanelNotebook");
+    metadataPanel->set_name ("MetaPanelNotebook");
     toolPanelNotebook = new Gtk::Notebook ();
-    toolPanelNotebook->get_style_context()->add_class ("toolPanelNotebook");
+    toolPanelNotebook->set_name ("ToolPanelNotebook");
 
     metadataPanel->append_page (*exifpanel, M("MAIN_TAB_EXIF"));
     metadataPanel->append_page (*iptcpanel, M("MAIN_TAB_IPTC"));
diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc
index 2b98c2101..4aa171821 100644
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@@ -107,7 +107,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
 // Wavelet Settings
     settingsVBox = Gtk::manage (new Gtk::VBox());
-    settingsVBox->set_border_width(4);
     settingsVBox->set_spacing(2);
 
     strength  = Gtk::manage (new Adjuster (M("TP_WAVELET_STRENGTH"), 0, 100, 1, 100));
@@ -201,7 +200,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
 // Contrast
     Gtk::VBox * levBox = Gtk::manage (new Gtk::VBox());
-    levBox->set_border_width(4);
     levBox->set_spacing(2);
 
 
@@ -252,7 +250,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
     contrastSHFrame = Gtk::manage (new Gtk::Frame (M("TP_WAVELET_APPLYTO")));
     contrastSHVBox = Gtk::manage (new Gtk::VBox);
-    contrastSHVBox->set_border_width(4);
     contrastSHVBox->set_spacing(2);
 
     HSmethod = Gtk::manage (new MyComboBoxText ());
@@ -286,7 +283,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
 // Chromaticity
     Gtk::VBox * chBox = Gtk::manage (new Gtk::VBox());
-    chBox->set_border_width(4);
     chBox->set_spacing(2);
 
     ctboxch = Gtk::manage (new Gtk::HBox ());
@@ -367,7 +363,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
 // Toning
     Gtk::VBox * tonBox = Gtk::manage (new Gtk::VBox());
-    tonBox->set_border_width(4);
     tonBox->set_spacing(2);
 
     opaCurveEditorG = new CurveEditorGroup (options.lastWaveletCurvesDir, M("TP_WAVELET_COLORT"));
@@ -398,7 +393,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
 // Denoise and Refine
     Gtk::VBox * noiseBox = Gtk::manage (new Gtk::VBox());
-    noiseBox->set_border_width(4);
     noiseBox->set_spacing(2);
 
     linkedg = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_LINKEDG")));
@@ -429,7 +423,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
 // Edge Sharpness
     Gtk::VBox * edgBox = Gtk::manage (new Gtk::VBox());
-    edgBox->set_border_width(4);
     edgBox->set_spacing(2);
 
     edgval = Gtk::manage ( new Adjuster (M("TP_WAVELET_EDVAL"), 0, 100, 1, 0) );
@@ -551,7 +544,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
     Gtk::VBox * ctboxES = Gtk::manage (new Gtk::VBox());
 
-    ctboxES->set_border_width(4);
     ctboxES->set_spacing(2);
 
     ctboxNP = Gtk::manage (new Gtk::HBox());
@@ -573,7 +565,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
 // Gamut
     Gtk::VBox * conBox = Gtk::manage (new Gtk::VBox());
-    conBox->set_border_width(4);
     conBox->set_spacing(2);
 
     median = Gtk::manage (new Gtk::CheckButton (M("TP_WAVELET_MEDI")));
@@ -611,7 +602,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
 // Residual Image
     Gtk::VBox * resBox = Gtk::manage (new Gtk::VBox());
-    resBox->set_border_width(4);
     resBox->set_spacing(2);
 
     rescon  = Gtk::manage (new Adjuster (M("TP_WAVELET_RESCON"), -100, 100, 1, 0));
@@ -768,7 +758,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 
     // Reset sliders
     neutrHBox = Gtk::manage (new Gtk::HBox ());
-    neutrHBox->set_border_width (2);
 
     neutral = Gtk::manage (new Gtk::Button (M("TP_COLORTONING_NEUTRAL")));
     //RTImage *resetImg = Gtk::manage (new RTImage ("gtk-undo-ltr-small.png", "gtk-undo-rtl-small.png"));
@@ -783,7 +772,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
 // Final Touchup
     Gtk::VBox * ctboxBA = Gtk::manage (new Gtk::VBox());
 
-    ctboxBA->set_border_width(4);
     ctboxBA->set_spacing(2);
 
     //Gtk::HSeparator *separatorfin = Gtk::manage (new  Gtk::HSeparator());
@@ -862,7 +850,6 @@ Wavelet::Wavelet () : FoldableToolPanel(this, "wavelet", M("TP_WAVELET_LABEL"),
     tmrConn = tmr->signal_toggled().connect( sigc::mem_fun(*this, &Wavelet::tmrToggled) );
 
     Gtk::VBox * finalBox = Gtk::manage (new Gtk::VBox());
-    finalBox->set_border_width(4);
     finalBox->set_spacing(2);
 
     finalBox->pack_start (*ctboxBA);
diff --git a/rtgui/zoompanel.cc b/rtgui/zoompanel.cc
index 05f613031..84910d805 100644
--- a/rtgui/zoompanel.cc
+++ b/rtgui/zoompanel.cc
@@ -23,9 +23,7 @@
 
 ZoomPanel::ZoomPanel (ImageArea* iarea) : iarea(iarea)
 {
-    get_style_context()->add_class ("editorZoomPanel");
-
-    set_border_width (0);
+    set_name ("EditorZoomPanel");
 
     Gtk::Image* imageOut = Gtk::manage (new RTImage ("gtk-zoom-out.png"));
     imageOut->set_padding(0, 0);