2 files changed, 12 insertions, 6 deletions
diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index 5ff191fc..d10eb9b3 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -1474,6 +1474,11 @@ button:focus{
 	outline-width: 0px;
 }
 
+/*Borders don't always work here*/
+button.flat:focus{
+	outline-width: 2px;
+}
+
 button.flat:hover {
     border-radius: 3px;
 }
diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
index bfd3ecf5..1b86aad1 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
@@ -24,6 +24,12 @@
 	                                  shade(@less_dark_color, 1.3),
 	                                  shade(@less_dark_color, 0.4));
 }
+/*don't overrride focus borders*/
+.caja-navigation-window paned>box>box>button:focus,
+.caja-navigation-window paned>box>box>button.flat:focus {
+	border-image: url("assets/button-default-border-dark.svg") 3 / 3px stretch;
+	outline-width: 0px; /*works here but NOT in the general case */
+}
 
 .caja-navigation-window paned>box>box>button:hover {
 	background-image: -gtk-gradient (radial,
@@ -647,15 +653,10 @@ pluma-print-preview.vertical toolbar.horizontal button.flat.text-button {
     background-color: @less_dark_color;
 }
 
-#MyControlCenter.background frame scrolledwindow button.flat {
+#MyControlCenter.background frame scrolledwindow button.flat:not(:hover):not(:focus) {
     border-image: none;
 }
 
-/* button hover of applications */
-#MyControlCenter.background frame scrolledwindow button.flat:hover {
-    border-radius: 8px;
-}
-
 /*******
  * Eom *
  *******/