diff --git a/assets/theme.css b/assets/theme.css
index 7b817da..59d4768 100644
--- a/assets/theme.css
+++ b/assets/theme.css
@@ -225,6 +225,7 @@ tooltip {
   border-radius: 6px;
 }
 
+/* dialog button */
 .dialogButton {
   background-color: rgb(72,70,61);
   border: 1px solid black;
@@ -278,7 +279,10 @@ tooltip {
 }
 
 /* Submenus without separators */
-.menu item > popover > contents > stack > box > box > modelbutton {
+.menu item > popover > contents > stack > box > box > modelbutton,
+/* Submenus with separators */
+.menu item > popover > contents > stack > box > box > box > box > modelbutton
+ {
   background-color: rgb(41, 40, 40);
   color: rgb(72,70,61);
   border-top: 0px;
@@ -286,14 +290,6 @@ tooltip {
   padding: 2px 10px 6px 10px;
 }
 
-/* Submenus with separators */
-.menu item > popover > contents > stack > box > box > box > box > modelbutton {
-  background-color: rgb(41, 40, 40);
-  color: rgb(72,70,61);
-  border-top: 0px;
-  border-left: 2px solid rgb(41, 40, 40);
-  padding: 2px 10px 6px 10px;
-}
 
 .menu item > popover > contents > stack > box > box > box > separator,
 .menu item > popover > contents > stack > box > box > box > separator :hover {
@@ -302,7 +298,6 @@ tooltip {
 }
 
 
-
 .accelLabel {
   padding: 2px 8px 2px 0px;
 }
diff --git a/src/app/MetaBrush/Action.hs b/src/app/MetaBrush/Action.hs
index eeda55b..960be47 100644
--- a/src/app/MetaBrush/Action.hs
+++ b/src/app/MetaBrush/Action.hs
@@ -243,8 +243,8 @@ warningDialog window filePath errMess = do
   GTK.setWindowDecorated dialog False
   GTK.windowSetTransientFor dialog ( Just window )
   GTK.windowSetModal dialog True
-  widgetAddClasses dialog [ "bg", "plain", "text", "dialog" ]
-  closeButton  <- GTK.dialogAddButton dialog "OK" 1
+  widgetAddClasses dialog [ "metabrush", "bg", "plain", "text", "dialog" ]
+  closeButton <- GTK.dialogAddButton dialog "OK" 1
   widgetAddClass closeButton "dialogButton"
   GTK.widgetShow dialog
   void $ GTK.afterDialogResponse dialog \ _ -> do
@@ -396,12 +396,13 @@ instance HandleAction Close where
             GTK.setWindowDecorated dialog False
             GTK.windowSetTransientFor dialog ( Just window )
             GTK.windowSetModal dialog True
-            widgetAddClasses dialog [ "bg", "plain", "text", "dialog" ]
+            widgetAddClasses dialog [ "metabrush", "bg", "plain", "text", "dialog" ]
             closeButton  <- GTK.dialogAddButton dialog "Close"          JustClose
             saveButton   <- GTK.dialogAddButton dialog "Save and close" SaveAndClose
             cancelButton <- GTK.dialogAddButton dialog "Cancel"         CancelClose
-            GTK.dialogSetDefaultResponse dialog 1
-            for_ [ closeButton, saveButton, cancelButton ] \ button -> widgetAddClass button "dialogButton"
+            GTK.dialogSetDefaultResponse dialog JustClose
+            for_ [ closeButton, saveButton, cancelButton ]
+              ( `widgetAddClass` "dialogButton" )
             GTK.widgetShow dialog
             void $ GTK.onDialogResponse dialog \ choice -> do
               case choice of