diff --git a/data/resources/style.css b/data/resources/style.css
index 6b53cd798510417ed321f37c0cf73eb06db72494..078d08e21f1ea5fb8a9aa54fb688555c6a85b0e6 100644
--- a/data/resources/style.css
+++ b/data/resources/style.css
@@ -1,7 +1,7 @@
-window,
-headerbar,
-popover arrow,
-popover contents {
+window.main-window ,
+.main-window headerbar,
+.main-window popover arrow,
+.main-window popover contents {
   background:  @background_color;
   color: @foreground_color;
 }
@@ -12,17 +12,12 @@ headerbar {
 .main-window .main-container {
   background: @background_color;
 }
-entry {
-  background-color: white;
-  color: black;
-}
+
 entry selection{
   color: @background_color;
   background-color: @foreground_color;
 }
-entry image {
-  color: black;
-}
+
 .fg-entry image.left{
   color: @foreground_color;
 }
diff --git a/data/resources/ui/window.ui b/data/resources/ui/window.ui
index 0b97fc993464f835c2f957176f7c6bcb0e95a13c..7ec90f610756e4baa2aa8fdc948d97c30c42ba80 100644
--- a/data/resources/ui/window.ui
+++ b/data/resources/ui/window.ui
@@ -39,9 +39,6 @@
                     <property name="valign">center</property>
                     <property name="tooltip-text" translatable="yes">Reverse Colours</property>
                     <property name="action-name">win.reverse-colors</property>
-                    <style>
-                      <class name="flat"/>
-                    </style>
                   </object>
                 </child>
                 <child>
@@ -61,7 +58,7 @@
                 <property name="menu-model">menu</property>
                 <property name="icon-name">open-menu-symbolic</property>
                 <style>
-                  <class name="flat"/>
+                  <class name="circular"/>
                 </style>
               </object>
             </child>