diff --git a/data/themes/default-min.css b/data/themes/default-min.css
index eec89e09..37aa0fd7 100644
--- a/data/themes/default-min.css
+++ b/data/themes/default-min.css
@@ -6,6 +6,12 @@
  * @date 2016-05-24
  */
 
+/* Header bar {{{1 */
+
+.sui-nocsd-header-bar {
+    padding: 2px;
+}
+
 /* Side bar {{{1 */
 .sui-side-bar-item > * {
     margin-bottom: 6px
diff --git a/data/ui/window.glade b/data/ui/window.glade
index 74d05d51..fda1b050 100644
--- a/data/ui/window.glade
+++ b/data/ui/window.glade
@@ -75,13 +75,43 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <child>
-                  <object class="GtkButton" id="connect_button">
+                  <object class="GtkButtonBox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Connect</property>
-                    <property name="image">connect_image</property>
+                    <property name="layout_style">expand</property>
+                    <child>
+                      <object class="GtkButton" id="connect_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Connect</property>
+                        <property name="image">connect_image</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="join_button">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="focus_on_click">False</property>
+                        <property name="receives_default">True</property>
+                        <property name="tooltip_text" translatable="yes">Join</property>
+                        <property name="image">join_image</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <style>
+                      <class name="linked"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -89,21 +119,6 @@
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkButton" id="join_button">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes">Join</property>
-                    <property name="image">join_image</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="pack_type">end</property>
@@ -210,6 +225,9 @@
                     <child>
                       <placeholder/>
                     </child>
+                    <style>
+                      <class name="sui-nocsd-header-bar"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="resize">False</property>
@@ -229,6 +247,9 @@
                     <child>
                       <placeholder/>
                     </child>
+                    <style>
+                      <class name="sui-nocsd-header-bar"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="resize">True</property>
diff --git a/src/sui/sui_window.c b/src/sui/sui_window.c
index 0d99bde5..79d66909 100644
--- a/src/sui/sui_window.c
+++ b/src/sui/sui_window.c
@@ -57,8 +57,8 @@ struct _SuiWindow {
     GtkPaned *title_paned;
     GtkBox *window_box;
     GtkSeparator *header_separator;
-    GtkStack *header_box;
-    GtkStack *header_paned;
+    GtkBox *header_box;
+    GtkPaned *header_paned;
     GtkStack *window_stack;
 
     /* Side header */
@@ -266,6 +266,8 @@ static void sui_window_constructed(GObject *object){
 
     self = SUI_WINDOW(object);
     if (!self->cfg->csd){
+        gtk_widget_show(GTK_WIDGET(self->header_box));
+
         /* Move side header widgets from side_header_bar to side_header_box */
         gtk_container_remove(GTK_CONTAINER(self->side_header_bar),
                 GTK_WIDGET(self->side_left_header_box));
@@ -294,6 +296,8 @@ static void sui_window_constructed(GObject *object){
         // Show the seperator
         gtk_widget_show(GTK_WIDGET(self->header_separator));
     } else {
+        gtk_widget_hide(GTK_WIDGET(self->header_box));
+
         // Use appliaction icon instead of standard icon when CSD enabled
         gtk_image_set_from_icon_name(self->start_image, PACKAGE,
                 GTK_ICON_SIZE_BUTTON);