diff --git a/js&css/extension/www.youtube.com/styles.css b/js&css/extension/www.youtube.com/styles.css
index 2a0164339..5de1d5eba 100644
--- a/js&css/extension/www.youtube.com/styles.css
+++ b/js&css/extension/www.youtube.com/styles.css
@@ -707,10 +707,11 @@ html[dark] .improvedtube-player-button svg path {
 	padding: 8px;
 	content: attr(data-tooltip);
 	transform: translateX(-50%);
+	white-space: nowrap;
 	color: var(--paper-tooltip-text-color, white);
 	border-radius: 2px;
 	background-color: var(--paper-tooltip-background, #616161);
-	z-index: 1002;
+	z-index: 999999;
 }
 
 /*------------------------------------------------------------------------------
diff --git a/menu/satus.css b/menu/satus.css
index afbb3eddf..3a44c6e4b 100644
--- a/menu/satus.css
+++ b/menu/satus.css
@@ -4,6 +4,12 @@
 *[data-value][data-value="false"] {margin-bottom: 0; margin-top: 0; transition: margin 0.14s linear !important;}  
 *[data-value][data-value="true"] {margin-bottom: -4.5px !important; margin-top: -3.5px; transition: margin 0.2s linear !important;}
 
+/* Prevent toggle switches from being shrunk by the universal data-value rule */
+.satus-switch[data-value] {
+    margin-bottom: 0 !important;
+    margin-top: 0 !important;
+}
+
 .satus-button--general, .satus-button--appearance, .satus-button--player {
 	margin-left: 9px !important;
 	margin-right: -18px !important;