diff --git a/resources/themes/Night Mapping/style.qss b/resources/themes/Night Mapping/style.qss
index 920d0abb6dad..e920f24b4353 100644
--- a/resources/themes/Night Mapping/style.qss	
+++ b/resources/themes/Night Mapping/style.qss	
@@ -303,17 +303,6 @@ QComboBox::indicator {
     selection-color:transparent;
 }
 
-QLineEdit:focus
-{
-    border: 1px solid @focus;
-}
-
-
-QTextEdit:focus
-{
-    border: 1px solid @focus;
-}
-
 /* ==================================================================================== */
 /* SCROLL BAR                                                                           */
 /* ==================================================================================== */
@@ -732,6 +721,27 @@ QHeaderView::section {
     padding: 0 0 0.1em 0.2em;
 }
 
+QToolButton[autoRaise=true]:focus:!pressed {
+    border:1px solid @focusdark;
+}
+
+QToolButton[autoRaise=false]:focus:!pressed {
+    border:1px solid @focusdark;
+}
+
+/* ==================================================================================== */
+/* FOCUS                                                                                */
+/* ==================================================================================== */
+
+QToolButton:focus, QPushButton:focus, QCheckBox:focus, QRadioButton:focus, QGroupBox:focus {
+    outline:1px solid @focusdark;
+    outline-radius: 0.2em;
+}
+
+QComboBox:focus, QAbstractSpinBox:focus, QLineEdit:focus, QPlainTextEdit:focus, QTextEdit:focus {
+    border:1px solid @focusdark;
+}
+
 /* ==================================================================================== */
 /* QGIS-SPECIFIC TWEAKS                                                                 */
 /* ==================================================================================== */
@@ -746,6 +756,10 @@ QgsColorButton:hover, QgsColorRampButton:hover, QgsSymbolButton:hover, QgsFontBu
     color:@itembackground;
 }
 
+QgsColorButton:focus, QgsColorRampButton:focus, QgsSymbolButton:focus, QgsFontButton:focus {
+    border:1px solid @focusdark;
+}
+
 QgsMessageBar QLabel, QgsMessageBar QTextEdit, QMessageBar QToolButton, QMessageBar QToolButton::menu-button {
     background: transparent;
     border: none;
@@ -788,10 +802,17 @@ QgsMessageBar QScrollBar::down-arrow:vertical {
     image: url(@theme_path/icons/arrow-down.svg);
 }
 
-QgsPropertyOverrideButton {
+QgsPropertyOverrideButton, QgsPropertyOverrideButton:hover, QgsPropertyOverrideButton:pressed {
+    background: none;
+    border: 1px solid rgba(0, 0, 0, 0%);
     padding: 0px;
 }
 
+QgsPropertyOverrideButton:focus {
+    border:1px solid @focusdark;
+    border-radius: 0.2em;
+}
+
 QListWidget#mOptionsListWidget {
     background-color: @itembackground;
     color: @text;
diff --git a/resources/themes/Night Mapping/variables.qss b/resources/themes/Night Mapping/variables.qss
index a2af4daabf95..678feeab4e0a 100644
--- a/resources/themes/Night Mapping/variables.qss	
+++ b/resources/themes/Night Mapping/variables.qss	
@@ -10,4 +10,5 @@
 @toggleoff: #535353
 @toggleon: #0f6e00
 @selection: #0f6e00
+@focusdark: rgba(215,128,26,100)
 @focus: #d7801a