diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index f77836d..ab58a79 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -389,7 +389,6 @@ textview.view,
 textview.view:disabled,
 iconview.view, iconview.view:disabled,
 treeview.view, treeview.view:disabled,
-widget.view, widget.view:disabled,
 GtkHTML
 { /* For Evolution (not enough; see entries section below) */
 	background-color: @view_color;
@@ -402,6 +401,11 @@ textview {
 	color: @theme_text_color;
 }
 
+widget.view, widget.view:disabled {
+	background-color: @theme_bg_color;
+	color: @theme_text_color;
+}
+
 /* Exceptional views */
 calendar.view,
 iconview.view, iconview,
@@ -1474,13 +1478,13 @@ button.flat:not(:hover):not(:active):not(:checked)
  {
 	background-color: transparent;
 	background-image: none;
-	border: none;
+	/*border: none;*/
 	border-radius: 0px;
 	border-color: transparent;
 	border-width: 3px;
-	border-style: none;
+	border-style: solid;
 	border-image-source: none;
-	margin: 3px;
+	/*margin: 3px;*/
 	}
 
 /****************************
@@ -2934,6 +2938,10 @@ label {
 	color: @theme_fg_color;
 }
 
+:disabled label, label:disabled {
+	color: @insensitive_fg_color;
+}
+
 /* however...*/
 
 row:selected label {