diff --git a/tutorindigo/templates/indigo/lms/templates/header/navbar-authenticated.html b/tutorindigo/templates/indigo/lms/templates/header/navbar-authenticated.html
index 88023d6db..83347ad91 100644
--- a/tutorindigo/templates/indigo/lms/templates/header/navbar-authenticated.html
+++ b/tutorindigo/templates/indigo/lms/templates/header/navbar-authenticated.html
@@ -53,8 +53,8 @@
       </div>
     % endif
   </div>
-  {% if INDIGO_THEME_COOKIE_NAME %}
-    <div class="secondary d-flex align-items-center">
+  <div class="secondary d-flex align-items-center">
+    {% if INDIGO_THEME_COOKIE_NAME %}
       <div class="theme-toggle-button mr-4">
         <span id="toggle-theme" role="button" tabindex="0">
           <div class="darkmode_icon">
@@ -69,7 +69,6 @@
           </div>
         </span>
       </div>
-    </div>
     {% endif %}
     <%include file="user_dropdown.html"/>
   </div>
diff --git a/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html b/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html
index 91c2a5b81..01a91d141 100644
--- a/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html
+++ b/tutorindigo/templates/indigo/lms/templates/header/navbar-not-authenticated.html
@@ -42,22 +42,21 @@
     %endif
   % endif
   </div>
-  {% if INDIGO_THEME_COOKIE_NAME %}
-    <div class="secondary d-flex align-items-center">
-      <div class="theme-toggle-button mr-4">
-        <span id="toggle-theme" role="button" tabindex="0">
-          <div class="darkmode_icon">
-            <span class="ray"></span>
-            <span class="ray"></span>
-            <span class="ray"></span>
-            <span class="ray"></span>
-            <span class="ray"></span>
-            <span class="ray"></span>
-            <span class="ray"></span>
-            <span class="ray"></span>
-          </div>
-        </span>
-      </div>
+  <div class="secondary d-flex align-items-center">
+    {% if INDIGO_THEME_COOKIE_NAME %}
+    <div class="theme-toggle-button mr-4">
+      <span id="toggle-theme" role="button" tabindex="0">
+        <div class="darkmode_icon">
+          <span class="ray"></span>
+          <span class="ray"></span>
+          <span class="ray"></span>
+          <span class="ray"></span>
+          <span class="ray"></span>
+          <span class="ray"></span>
+          <span class="ray"></span>
+          <span class="ray"></span>
+        </div>
+      </span>
     </div>
     {% endif %}
     <div class="btn-holder">