diff --git a/resources/assets/sass/bootstrap-customizations/_navbar.scss b/resources/assets/sass/bootstrap-customizations/_navbar.scss
index f096883..3039630 100644
--- a/resources/assets/sass/bootstrap-customizations/_navbar.scss
+++ b/resources/assets/sass/bootstrap-customizations/_navbar.scss
@@ -23,17 +23,17 @@
 }
 
 @if $theme == 'dark' {
-    .dropdown-menu .dark-mode-switch-on {
+    .page-navbar .dark-mode-switch-on {
         display: block;
     }
-    .dropdown-menu .dark-mode-switch-off {
+    .page-navbar .dark-mode-switch-off {
         display: none;
     }
 } @else {
-    .dropdown-menu .dark-mode-switch-on {
+    .page-navbar .dark-mode-switch-on {
         display: none;
     }
-    .dropdown-menu .dark-mode-switch-off {
+    .page-navbar .dark-mode-switch-off {
         display: block;
     }
 }
diff --git a/resources/views/layouts/nav-buttons.blade.php b/resources/views/layouts/nav-buttons.blade.php
index e41022e..5cecf29 100644
--- a/resources/views/layouts/nav-buttons.blade.php
+++ b/resources/views/layouts/nav-buttons.blade.php
@@ -19,7 +19,7 @@ $aclass = $dropdown ? 'dropdown-item' : 'nav-link';
 {!! $li !!}
   <form method="POST" action="{{ route('toggle-dark-mode') }}" aria-hidden="true">
     @csrf
-    <button id="toggle-dark-mode-btn" class="{{ $aclass }}" type="submit" onclick="event.preventDefault(); toggleDarkMode();">
+    <button id="toggle-dark-mode-btn" class="btn-link border-0 {{ $aclass }}" type="submit" onclick="event.preventDefault(); toggleDarkMode();">
         <div class="dark-mode-switch-on">
             <i class="fa-sun-o fa-pr"></i>{{ __('Light Mode') }}
         </div>