diff --git a/rtdata/themes/RawTherapee.css b/rtdata/themes/RawTherapee.css
index 569cb4748..6b321ed36 100644
--- a/rtdata/themes/RawTherapee.css
+++ b/rtdata/themes/RawTherapee.css
@@ -21,10 +21,11 @@
     color: #AAAAAA;
 }
 
+/* The Places and Dir browser panels */
 .view {
     background-color: #262626;
 }
-
+/* The headers of these panels */
 .view .button {
     background-color: #363636;
     padding: 2px;
@@ -34,23 +35,29 @@
     background-color: #404040;
 }
 
-.notebook {
+GtkNotebook {
     background-color: #404040;
 }
 
-/* Tool (sub)frame */
+/* Affects all frames except in the toolbox */
 .frame {
     border-color: #303030;
     border-radius: 4px;
-    padding: 4px 4px 0px 4px;
+    padding: 4px 4px 4px 4px;
 }
 
-/* Non-tool frames */
+/* Frames in the toolbox. Not MyExpander frames. */
 GtkEventBox .frame {
     border-color: #565656;
 }
 
-/* Slider label */
+/*.editorTopPanel .button, .toolBarPanelFileBrowser .button, .editorZoomPanel .button {*/
+.button {
+     padding: 1px;
+     margin: 1px;
+}
+
+/* Adjusters */
 .text-button {
     padding: 0px;
 }
@@ -60,11 +67,7 @@ GtkEventBox .frame {
     padding: 4px;
 }
 
-/* Tab button */
-GtkNotebook tab {
-    outline-offset: -2px;
-    border-color: #303030;
-}
+
 
 .separator {
     color: #363636;
@@ -75,10 +78,6 @@ GtkProgressBar {
     -GtkProgressBar-min-horizontal-bar-height: 10;
 }
 
-GtkNotebook GtkViewport {
-    padding-right: 2px;
-}
-
 GtkDrawingArea {
     border-radius: 0;
     padding: 0;
@@ -135,7 +134,6 @@ GtkButton.Right {
 
 GtkEntry, GtkSpinButton {
     padding: 1px 4px 0 1px;
-    margin: 1px;
     background-color: #262626;
 }
 
@@ -150,19 +148,17 @@ GtkMenu {
     padding: 2px;
 }
 
+/* Tool background */
 #ExpanderBox {
     background-color: #363636;
-    border-color: #252525;
-    border-style: solid;
-    border-width: 1px;
+    border: 1px solid #252525;
     border-radius: 4px;
 }
 
+/* Sub-tool (MyExpander) background */
 #ExpanderBox2 {
     background-color: #3B3B3B;
-    border-color: #505050;
-    border-style: solid;
-    border-width: 1px;
+    border: 1px solid #505050;
     border-radius: 4px;
 }
 
@@ -183,52 +179,44 @@ GtkMenu {
     color: #292929;
 }
 
-.toolBarPanelEditor .button, .toolBarPanelFileBrowser .button {
-     padding: 1px;
-     margin: 1px;
-}
-
 /* Editor tab button */
 .mainNotebook > GtkGrid GtkLabel, .mainNotebook > GtkGrid GtkImage  {
-    padding: 3px;
+    padding: 1px;
 }
 
 /* File Browser right side tabs - Toolbox, Inspector, Fast Export, Filter */
-.rightNotebook tab, .mainNotebook tab, .prefNotebook tab, .toolPanelNotebook tab, .metaPanelNotebook tab {
+GtkNotebook tab {
     background-color: #404040;
     border: 1px solid #505050;
     border-radius: 4px;
     padding: 5px;
 }
 
-.rightNotebook tab:hover, .mainNotebook tab:hover, .prefNotebook tab:hover, .toolPanelNotebook tab:hover, .metaPanelNotebook tab:hover {
+GtkNotebook tab:hover {
     background-color: #505050;
 }
 
-.rightNotebook tab:active, .mainNotebook tab:active, .prefNotebook tab:active, .toolPanelNotebook tab:active, .metaPanelNotebook tab:active {
+GtkNotebook tab:active {
     background-color: #262626;
 }
 
 /* Get rid of shitty notebook header shadow */
-.rightNotebook.header.top, .mainNotebook.header.top, .prefNotebook.header.top, .toolPanelNotebook.header.top, .metaPanelNotebook.header.top,
-.rightNotebook.header.right, .mainNotebook.header.right, .prefNotebook.header.right, .toolPanelNotebook.header.right, .metaPanelNotebook.header.right,
-.rightNotebook.header.bottom, .mainNotebook.header.bottom, .prefNotebook.header.bottom, .toolPanelNotebook.header.bottom, .metaPanelNotebook.header.bottom,
-.rightNotebook.header.left, .mainNotebook.header.left, .prefNotebook.header.left, .toolPanelNotebook.header.left, .metaPanelNotebook.header.left {
+GtkNotebook.header.top, GtkNotebook.header.right, GtkNotebook.header.bottom, GtkNotebook.header.left {
     box-shadow: none;
 }
 
 /* Get rid of notebook header border - too many borders */
-.rightNotebook.header, .mainNotebook.header, .prefNotebook.header, .toolPanelNotebook.header, .metaPanelNotebook.header {
+GtkNotebook.header {
     border: 0px;
 }
 
 /* Get rid of notebook frame border - too many borders */
-.rightNotebook.frame, .mainNotebook.frame, .prefNotebook.frame, .toolPanelNotebook.frame, .metaPanelNotebook.frame {
+GtkNotebook.frame {
     border: 0px;
 }
 
 /* Pad notebooks, makes the other borders look nicer */
-.rightNotebook, .mainNotebook, .prefNotebook, .toolPanelNotebook, .metaPanelNotebook {
+GtkNotebook {
     padding: 2px;
 }
 
@@ -253,3 +241,4 @@ GtkMenu {
     padding: 5px;
     margin: 5px;
 }
+
diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index 1a8194b5c..437c285c3 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -137,7 +137,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
     tpc->setEditProvider(iareapanel->imageArea);
 
     Gtk::HBox* toolBarPanel = Gtk::manage (new Gtk::HBox ());
-    toolBarPanel->get_style_context()->add_class ("toolBarPanelEditor");
+    toolBarPanel->get_style_context()->add_class ("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);
@@ -181,6 +181,8 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
     // Save buttons
     Gtk::HBox* iops = Gtk::manage (new Gtk::HBox ());
 
+    Gtk::HBox *exportButtonsHBox = Gtk::manage (new Gtk::HBox ());
+
     Gtk::Image *saveButtonImage =  Gtk::manage (new RTImage ("gtk-save-large.png"));
     saveimgas = Gtk::manage (new Gtk::Button ());
     saveimgas->add(*saveButtonImage);
@@ -196,13 +198,16 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
     sendtogimp->add(*sendToEditorButtonImage);
     sendtogimp->set_tooltip_markup(M("MAIN_BUTTON_SENDTOEDITOR_TOOLTIP"));
 
-    iops->pack_start (*saveimgas, Gtk::PACK_SHRINK);
+    exportButtonsHBox->pack_start (*saveimgas, Gtk::PACK_SHRINK);
 
     if(!simpleEditor) {
-        iops->pack_start (*queueimg, Gtk::PACK_SHRINK);
+        exportButtonsHBox->pack_start (*queueimg, Gtk::PACK_SHRINK);
     }
 
-    iops->pack_start (*sendtogimp, Gtk::PACK_SHRINK);
+    exportButtonsHBox->pack_start (*sendtogimp, Gtk::PACK_SHRINK);
+
+    iops->pack_start (*exportButtonsHBox, Gtk::PACK_SHRINK);
+    iops->pack_start (*Gtk::manage(new Gtk::VSeparator()), Gtk::PACK_SHRINK, 1);
 
     // Status box
     statusBox = Gtk::manage (new Gtk::HBox ());
@@ -212,12 +217,14 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
     setExpandAlignProperties(progressLabel, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER);
     progressLabel->set_fraction(0.0);
 
+    // TODO is this needed? What for?
     if (cssProvider) {
         progressLabel->get_style_context()->add_provider (cssProvider, GTK_STYLE_PROVIDER_PRIORITY_USER);    // Can't find the gtkmm version of the enum!
     }
 
     statusBox->pack_start (*progressLabel);
-    iops->pack_start(*statusBox, Gtk::PACK_SHRINK, 2);
+    iops->pack_start (*statusBox, Gtk::PACK_EXPAND_PADDING, 2);
+    iops->pack_start (*Gtk::manage(new Gtk::VSeparator()), Gtk::PACK_SHRINK, 1);
 
     // tbRightPanel_1
     iops->pack_end (*tbRightPanel_1, Gtk::PACK_SHRINK, 0);
@@ -262,7 +269,6 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
         navSync->set_relief(Gtk::RELIEF_NONE);
         navSync->set_tooltip_markup(M("MAIN_BUTTON_NAVSYNC_TOOLTIP"));
 
-        iops->pack_end (*Gtk::manage(new Gtk::VSeparator()), Gtk::PACK_SHRINK, 0);
         iops->pack_end (*navNext, Gtk::PACK_SHRINK, 0);
         iops->pack_end (*navSync, Gtk::PACK_SHRINK, 0);
         iops->pack_end (*navPrev, Gtk::PACK_SHRINK, 0);
diff --git a/rtgui/zoompanel.cc b/rtgui/zoompanel.cc
index 8f5101282..f7cbe7470 100644
--- a/rtgui/zoompanel.cc
+++ b/rtgui/zoompanel.cc
@@ -23,6 +23,7 @@
 
 ZoomPanel::ZoomPanel (ImageArea* iarea) : iarea(iarea)
 {
+    get_style_context()->add_class ("editorZoomPanel");
 
     set_border_width (0);