diff --git a/ubl-settings-manager.css b/ubl-settings-manager.css
index 82d7eba..902e51f 100644
--- a/ubl-settings-manager.css
+++ b/ubl-settings-manager.css
@@ -6,15 +6,12 @@ background-color: #404040;
 #GnomeIcon{
 	border-style:solid;
 	border-bottom-width: 1px;
-	border-image: linear-gradient(90deg, #aaaaaa 0%, rgba(170,170,170,0) 80%);
+	border-image: linear-gradient(90deg, alpha(@theme_text_color,0.4) 55%, alpha(@theme_bg_color, 0) 100%);
 	border-image-slice: 1;
 }
 
 #SepIcon{
-	border-style:solid;
-	border-bottom-width: 2px;
-	border-image: linear-gradient(90deg, #aaaaaa 0%, rgba(170,170,170,0) 100%);
-	border-image-slice: 1;
+	background-color: alpha(@theme_text_color, 0.6);
 }
 
 #iconlabel {
@@ -30,31 +27,26 @@ background-color: #404040;
 .noborder {
 	border: none;
 }
+.menu:hover {	
+  	border-color:alpha(@theme_text_color, 0.3);
+}
+.menu {	
+  	border-color:alpha(@theme_text_color, 0.3);
+}
+.menu:hover >* {
+	border-color:alpha(@theme_text_color, 0.3);
+}
 .menuitembottom{
-	margin-top:0px;
-	margin-bottom:0px;
-	border-color:alpha(@theme_text_color, 0.4);
-	border-style:solid;
-	border-left-width:1px;
-	border-bottom-width:1px;
-	border-right-width:1px;
+  margin-top:0px;
+  margin-bottom:3px;
 }
 .menuitemmiddle{
-	margin-top:0px;
-	margin-bottom:0px;
-	border-color:alpha(@theme_text_color, 0.4);
-	border-style:solid;
-	border-left-width:1px;
-	border-right-width:1px;
+  margin-top:0px;
+  margin-bottom:0px;
 }
 
 .menuitemtop{
-	margin-bottom:0px;
-	border-color:alpha(@theme_text_color, 0.4);
-	border-style:solid;
-	border-left-width:1px;
-	border-top-width:1px;
-	border-right-width:1px;
+  margin-bottom:0px;
 }
 .menuitemtop *{
 	margin:2px 2px 0 2px;
@@ -70,41 +62,45 @@ background-color: #404040;
 }
 .menuitemtop:hover {
 	background:@theme_bg_color;
+  	border-color:transparent;
 }
 .menuitemmiddle:hover {
 	background:@theme_bg_color;
+  border:none;
 }
 .menuitembottom:hover {
 	background:@theme_bg_color;
+  border:none;
 	
 }
 .menuitemtop:hover* {
 	margin:2px 2px 0 2px;
 	padding: 5px 10px 3px 5px;
 	background:@theme_selected_bg_color;
-	border-color:transparent;
 	border-radius: 2px;
+  border:none;
 }
 .menuitemmiddle:hover* {
 	margin:0 2px 0 2px;
 	padding: 3px 10px 3px 5px;
 	background:@theme_selected_bg_color;
-	border-color:transparent;
 	border-radius: 2px;
 }
 .menuitembottom:hover* {
 	margin:0 2px 2px 2px;
 	padding: 3px 10px 5px 5px;
 	background:@theme_selected_bg_color;
-	border-color:transparent;
 	border-radius: 2px;
 }
-.menu {
-	border:none;
-}
-.workingbg {
+
+.workingbg, #workingbg {
 	background-color:@theme_base_color;
 }
 .workingbg.view.cell:selected{
 	background-color:@theme_selected_bg_color;
 }
+.bkim {
+background: rgba(122,122,122,0.3);
+}
+
+
diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade
index 548449c..574a58f 100644
--- a/ubl-settings-manager.glade
+++ b/ubl-settings-manager.glade
@@ -196,6 +196,7 @@
                       <object class="GtkViewport">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
+                        <property name="resize-mode">immediate</property>
                         <child>
                           <object class="GtkBox" id="Gnomeicvpack">
                             <property name="visible">True</property>
@@ -206,16 +207,10 @@
                             <child>
                               <placeholder/>
                             </child>
-                            <style>
-                              <class name="workingbg"/>
-                            </style>
                           </object>
                         </child>
                       </object>
                     </child>
-                    <style>
-                      <class name="workingbg"/>
-                    </style>
                   </object>
                   <packing>
                     <property name="resize">False</property>
@@ -984,7 +979,7 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
-    <property name="stock">gtk-go-back</property>
+    <property name="icon-name">go-first-symbolic</property>
   </object>
   <object class="GtkWindow" id="MainWindow">
     <property name="can-focus">False</property>
@@ -1010,6 +1005,7 @@
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="halign">center</property>
+                    <property name="stock">gtk-missing-image</property>
                     <property name="icon_size">3</property>
                     <style>
                       <class name="noborder"/>
@@ -1239,10 +1235,6 @@
             <property name="margin-end">10</property>
             <property name="image">image1</property>
             <signal name="clicked" handler="on_backToSettingsButton_clicked" swapped="no"/>
-            <style>
-              <class name="button"/>
-              <class name="darkborder"/>
-            </style>
           </object>
           <packing>
             <property name="position">1</property>
@@ -1603,31 +1595,29 @@
       <column type="gfloat"/>
       <!-- column-name gfloat2 -->
       <column type="gfloat"/>
+      <!-- column-name gint1 -->
+      <column type="gint"/>
     </columns>
   </object>
   <object class="GtkIconView" id="iconTemplate">
     <property name="visible">True</property>
     <property name="can-focus">True</property>
-    <property name="margin">6</property>
+    <property name="margin">0</property>
     <property name="item-orientation">horizontal</property>
     <property name="model">liststoreTemplate</property>
-    <property name="item-padding">10</property>
+    <property name="item-width">135</property>
+    <property name="row-spacing">0</property>
+    <property name="column-spacing">0</property>
+    <property name="item-padding">0</property>
     <child>
       <object class="GtkCellRendererPixbuf" id="iconPic"/>
       <attributes>
+        <attribute name="height">4</attribute>
         <attribute name="xalign">2</attribute>
         <attribute name="yalign">3</attribute>
         <attribute name="pixbuf">0</attribute>
       </attributes>
     </child>
-    <child>
-      <object class="GtkCellRendererText" id="iconText"/>
-      <attributes>
-        <attribute name="xalign">2</attribute>
-        <attribute name="yalign">3</attribute>
-        <attribute name="text">1</attribute>
-      </attributes>
-    </child>
     <style>
       <class name="workingbg"/>
     </style>
@@ -1636,6 +1626,10 @@
     <property name="visible">True</property>
     <property name="can-focus">False</property>
   </object>
+  <object class="GtkMenu" id="menu3">
+    <property name="visible">True</property>
+    <property name="can-focus">False</property>
+  </object>
   <object class="GtkListStore" id="settingsModelCombobox">
     <columns>
       <!-- column-name gchararray1 -->