diff --git a/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg b/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg
index c045b0b..aa858f9 100644
--- a/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg
+++ b/com.ublinux.libublsettingsui-gtk3.cancel-symbolic.svg
@@ -44,7 +44,6 @@
        d="m 77.21183,104.22131 c -0.8763,0 -1.5875,0.7112 -1.5875,1.5875 0,0.8763 0.7112,1.5875 1.5875,1.5875 0.8763,0 1.5875,-0.7112 1.5875,-1.5875 0,-0.8763 -0.7112,-1.5875 -1.5875,-1.5875 z m 0,0.56696 c 0.563335,0 1.020535,0.4572 1.020535,1.02054 0,0.15224 -0.03405,0.2963 -0.0939,0.42611 l -1.353627,-1.35275 c 0.129997,-0.0601 0.274468,-0.0939 0.426995,-0.0939 z m -0.91423,0.56874 1.366915,1.36603 c -0.136513,0.0678 -0.290022,0.1063 -0.452685,0.1063 -0.563336,0 -1.020536,-0.4572 -1.020536,-1.02053 0,-0.16238 0.03874,-0.31547 0.106306,-0.4518 z"
        id="Symbol"
        inkscape:label="#path2424"
-       class="error"
        inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/libublsettingsui-gtk3-documentation.glade b/libublsettingsui-gtk3-documentation.glade
index 8fdfcc9..359151c 100644
--- a/libublsettingsui-gtk3-documentation.glade
+++ b/libublsettingsui-gtk3-documentation.glade
@@ -2,6 +2,16 @@
 <!-- Generated with glade 3.38.2 -->
 <interface domain="libublsettingsui-gtk3">
   <requires lib="gtk+" version="3.24"/>
+  <object class="GtkImage" id="image8">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">process-stop-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image9">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">emblem-ok-symbolic</property>
+  </object>
   <object class="GtkApplicationWindow" id="helpConfirmationWindow">
     <property name="can-focus">False</property>
     <property name="resizable">False</property>
@@ -128,60 +138,12 @@ translated and supported by community.</property>
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="spacing">30</property>
-            <property name="homogeneous">True</property>
-            <child>
-              <object class="GtkButton" id="CancelHelpButton">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="image">image8</property>
-                <style>
-                  <class name="button"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="ReadHelpButton">
-                <property name="label" translatable="yes">Open documentation</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="image">image9</property>
-                <style>
-                  <class name="button"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
       </object>
     </child>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="SettingsBar">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="show-close-button">True</property>
         <child type="title">
           <object class="GtkLabel" id="webHeaderNameLabel">
             <property name="visible">True</property>
@@ -192,17 +154,37 @@ translated and supported by community.</property>
             </attributes>
           </object>
         </child>
+        <child>
+          <object class="GtkButton" id="CancelHelpButton">
+            <property name="label" translatable="yes">Cancel</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="image">image8</property>
+            <style>
+              <class name="button"/>
+              <class name="marginright"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="ReadHelpButton">
+            <property name="label" translatable="yes">Open documentation</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="image">image9</property>
+            <style>
+              <class name="button"/>
+              <class name="marginright"/>
+            </style>
+          </object>
+          <packing>
+            <property name="pack-type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="image8">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">process-stop-symbolic</property>
-  </object>
-  <object class="GtkImage" id="image9">
-    <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="icon-name">emblem-ok-symbolic</property>
-  </object>
 </interface>
diff --git a/libublsettingsui-gtk3-saving.glade b/libublsettingsui-gtk3-saving.glade
index 50ff9d6..44df800 100644
--- a/libublsettingsui-gtk3-saving.glade
+++ b/libublsettingsui-gtk3-saving.glade
@@ -14,11 +14,17 @@
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <property name="icon-name">com.ublinux.libublsettingsui-gtk3.cancel-symbolic</property>
+    <style>
+      <class name="marginright"/>
+    </style>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <property name="icon-name">com.ublinux.libublsettingsui-gtk3.accept-symbolic</property>
+    <style>
+      <class name="marginright"/>
+    </style>
   </object>
   <object class="GtkListStore" id="liststore1">
     <columns>
@@ -47,6 +53,7 @@
     <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox">
+        <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="margin-bottom">5</property>
         <property name="orientation">vertical</property>
@@ -56,32 +63,10 @@
             <property name="can-focus">False</property>
             <property name="layout-style">end</property>
             <child>
-              <object class="GtkButton" id="CancelButton">
-                <property name="label" translatable="yes">Cancel</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="image">image1</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
-              <object class="GtkButton" id="SaveButton">
-                <property name="label" translatable="yes">Save</property>
-                <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="image">image2</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
+              <placeholder/>
             </child>
           </object>
           <packing>
@@ -192,7 +177,6 @@
       <object class="GtkHeaderBar">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
-        <property name="show-close-button">True</property>
         <child type="title">
           <object class="GtkLabel" id="HeaderTopic">
             <property name="visible">True</property>
@@ -211,6 +195,37 @@
             <property name="icon-name">com.ublinux.libublsettingsui-gtk3</property>
           </object>
         </child>
+        <child>
+          <object class="GtkButton" id="CancelButton">
+            <property name="label" translatable="yes">Cancel</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="image">image1</property>
+            <style>
+              <class name="marginright"/>
+            </style>
+          </object>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="SaveButton">
+            <property name="label" translatable="yes">Save</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="image">image2</property>
+            <style>
+              <class name="marginright"/>
+            </style>
+          </object>
+          <packing>
+            <property name="pack-type">end</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
         <style>
           <class name="toolbar"/>
         </style>
diff --git a/libublsettingsui-gtk3.css b/libublsettingsui-gtk3.css
index a08bca0..a706226 100644
--- a/libublsettingsui-gtk3.css
+++ b/libublsettingsui-gtk3.css
@@ -126,4 +126,8 @@ background:transparent;
 	border-width: 2px;
 	border-color: #f3f0ac;
 	border-style:solid;
+}
+
+.marginright image{
+	margin-right: 2px;
 }
\ No newline at end of file