diff --git a/src/public/app/widgets/switch.js b/src/public/app/widgets/switch.js
index 7d8b61b80..9dd3c4fbd 100644
--- a/src/public/app/widgets/switch.js
+++ b/src/public/app/widgets/switch.js
@@ -113,7 +113,7 @@ const TPL = `
             </div>
         </label>
 
-        <button class="switch-help-button bx bx-help-circle" type="button" data-help-page="" title="${t("open-help-page")}" style="display: none;"></button>
+        <button class="switch-help-button icon-action bx bx-help-circle" type="button" data-help-page="" title="${t("open-help-page")}" style="display: none;"></button>
     </div>
 
 </div>`;
diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css
index 34c0bb820..9e3c7e2b5 100644
--- a/src/public/stylesheets/theme-next/forms.css
+++ b/src/public/stylesheets/theme-next/forms.css
@@ -445,6 +445,12 @@ optgroup {
 
 }
 
+/* Switches */
+
+.switch-widget.component {
+    --icon-button-size: 28px;
+}
+
 /* Links */
 
 body a.tn-link,