diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
index f38a66c3..762e457a 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
@@ -15,13 +15,13 @@
         <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
         @if (PageState.EditMode)
         {
-            <button type="submit" class="btn @ButtonClass active" aria-pressed="true" autocomplete="off">
+            <button type="submit" class="app-editmode btn @ButtonClass active" aria-pressed="true" autocomplete="off">
                 <span class="oi oi-pencil"></span>
             </button>
         }
         else
         {
-            <button type="submit" class="btn @ButtonClass" aria-pressed="false" autocomplete="off">
+            <button type="submit" class="app-editmode btn @ButtonClass" aria-pressed="false" autocomplete="off">
                 <span class="oi oi-pencil"></span>
             </button>
         }
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
index 10ce97ed..b702ad8d 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
@@ -16,7 +16,7 @@
 @inject IStringLocalizer<ControlPanelInteractive> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<button type="button" class="btn @ButtonClass ms-1" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel" @onclick="ClearMessage">
+<button type="button" class="app-controlpanel btn @ButtonClass ms-1" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel" @onclick="ClearMessage">
     <span class="oi oi-cog"></span>
 </button>
 
diff --git a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
index eaf3f48c..03cdcbaa 100644
--- a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
@@ -8,7 +8,7 @@
 
 @if (_supportedCultures?.Count() > 1)
 {
-    <div class="btn-group pe-1" role="group">
+    <div class="app-languages btn-group pe-1" role="group">
         <button id="btnCultures" type="button" class="btn @ButtonClass dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <span class="oi oi-globe"></span>
         </button>