diff --git a/templates/zerver/navbar.html b/templates/zerver/navbar.html
index 2f994ccba6..30ff758c7c 100644
--- a/templates/zerver/navbar.html
+++ b/templates/zerver/navbar.html
@@ -1,172 +1,172 @@
 <div id="panels">
-  <div id="desktop-notifications-panel" class="alert alert-info">
-    <span class="close" data-dismiss="alert" aria-label="{{ _('Close') }}">&times;</span>
-    <div data-step="1">
-        {% trans %}Zulip needs your permission to
-        <a class="request-desktop-notifications alert-link">enable desktop notifications.</a>
-        {% endtrans %}
+    <div id="desktop-notifications-panel" class="alert alert-info">
+        <span class="close" data-dismiss="alert" aria-label="{{ _('Close') }}">&times;</span>
+        <div data-step="1">
+            {% trans %}Zulip needs your permission to
+            <a class="request-desktop-notifications alert-link">enable desktop notifications.</a>
+            {% endtrans %}
+        </div>
+        <div data-step="2" style="display: none">
+            {{ _('We strongly recommend enabling desktop notifications. They help Zulip keep your team connected.') }}
+            <span class="buttons">
+                <a class="alert-link request-desktop-notifications">{{ _('Enable notifications') }}</a>
+                &bull;
+                <a class="alert-link exit">{{ _('Ask me later') }}</a>
+                &bull;
+                <a class="alert-link reject-notifications">{{ _('Never ask on this computer') }}</a>
+            </span>
+        </div>
     </div>
-    <div data-step="2" style="display: none">
-      {{ _('We strongly recommend enabling desktop notifications. They help Zulip keep your team connected.') }}
-      <span class="buttons">
-        <a class="alert-link request-desktop-notifications">{{ _('Enable notifications') }}</a>
-        &bull;
-        <a class="alert-link exit">{{ _('Ask me later') }}</a>
-        &bull;
-        <a class="alert-link reject-notifications">{{ _('Never ask on this computer') }}</a>
-      </span>
-    </div>
-  </div>
 </div>
 <div class="header">
-<nav class="header-main rightside-userlist" id="top_navbar">
-  <div class="column-left">
-      <a class="brand no-style" href="#">
-          <img src="/static/images/logo/zulip-icon-128x128.png" class="nav-logo no-drag" alt=""/>
-          <div class="company-name">
-              zulip
-          </div>
-      </a>
-  </div>
-  <div class="column-middle" id="navbar-middle">
-    <div class="column-middle-inner">
-          <div id="streamlist-toggle" {%if embedded %} style="visibility: hidden"{% endif %}>
-            <a href="#" id="streamlist-toggle-button" role="button"><i class="icon-vector-reorder"></i>
-              <span id="streamlist-toggle-unreadcount">0</span>
+    <nav class="header-main rightside-userlist" id="top_navbar">
+        <div class="column-left">
+            <a class="brand no-style" href="#">
+                <img src="/static/images/logo/zulip-icon-128x128.png" class="nav-logo no-drag" alt=""/>
+                <div class="company-name">
+                    zulip
+                </div>
             </a>
-          </div>
-          <div id="searchbox" class="searchbox-rightmargin">
-            <div id="tab_bar" class="notdisplayed">
+        </div>
+        <div class="column-middle" id="navbar-middle">
+            <div class="column-middle-inner">
+                <div id="streamlist-toggle" {%if embedded %} style="visibility: hidden"{% endif %}>
+                    <a href="#" id="streamlist-toggle-button" role="button"><i class="icon-vector-reorder"></i>
+                        <span id="streamlist-toggle-unreadcount">0</span>
+                    </a>
+                </div>
+                <div id="searchbox" class="searchbox-rightmargin">
+                    <div id="tab_bar" class="notdisplayed">
+                    </div>
+                    <form id="searchbox_form" class="form-search navbar-search">
+                        <div id="search_arrows" class="input-append">
+                            <input class="search-query input-block-level" id="search_query" type="text" placeholder="{{ _('Search') }}"
+                                   autocomplete="off" aria-label="{{ _('Search') }}" title="{{ _('Search') }} (/)"/>
+                            {# Start the button off disabled since there is no active search #}
+                            <button class="btn search_button" type="button" id="search_exit" disabled="disabled" aria-label="{{ _('Exit search') }}"><i class="icon-vector-remove"></i></button>
+                            <a class="search_icon" href="#search-operators" data-overlay-trigger="search-operators" title="{{ _('Search help') }}"><i class="icon-vector-search"></i></a>
+                        </div>
+                    </form>
+                </div>{# /searchbox #}
             </div>
-            <form id="searchbox_form" class="form-search navbar-search">
-              <div id="search_arrows" class="input-append">
-                <input class="search-query input-block-level" id="search_query" type="text" placeholder="{{ _('Search') }}"
-                       autocomplete="off" aria-label="{{ _('Search') }}" title="{{ _('Search') }} (/)"/>
-                {# Start the button off disabled since there is no active search #}
-                <button class="btn search_button" type="button" id="search_exit" disabled="disabled" aria-label="{{ _('Exit search') }}"><i class="icon-vector-remove"></i></button>
-                <a class="search_icon" href="#search-operators" data-overlay-trigger="search-operators" title="{{ _('Search help') }}"><i class="icon-vector-search"></i></a>
-              </div>
-            </form>
-          </div>{# /searchbox #}
-    </div>
-  </div>
-  <div class="column-right">
-        <div id="userlist-toggle">
-            <a href="#" id="userlist-toggle-button" role="button"><i class="icon-vector-group"></i>
-              <span id="userlist-toggle-unreadcount">0</span>
-            </a>
         </div>
-        <div id="navbar-buttons" {%if embedded %} style="visibility: hidden"{% endif %}>
-            <ul class="nav" role="navigation">
-              <li class="dropdown actual-dropdown-menu" id="gear-menu">
-                <a id="settings-dropdown" href="#" role="button" class="dropdown-toggle" data-target="nada" data-toggle="dropdown" title="{{ _('Menu') }} (g)">
-                  <i class="icon-vector-cog"></i><i class="icon-vector-caret-down settings-dropdown-caret"></i>
+        <div class="column-right">
+            <div id="userlist-toggle">
+                <a href="#" id="userlist-toggle-button" role="button"><i class="icon-vector-group"></i>
+                    <span id="userlist-toggle-unreadcount">0</span>
                 </a>
-                <ul class="dropdown-menu" role="menu" aria-labelledby="settings-dropdown">
-                  {#
-                  It is quite ingrained in our frontend code that your Home
-                  view is a Bootstrap Nav tab, even though we don't show the tab
-                  anymore
-                  #}
-                  <li class="invisible" style="display:none;" role="presentation"><a href="#home" data-toggle="tab"></a></li>
-                  <li role="presentation">
-                    <a href="#streams" role="menuitem">
-                      <i class="icon-vector-exchange"></i> {{ _('Manage streams') }}
-                    </a>
-                  </li>
-                  <li role="presentation">
-                    <a href="#settings" role="menuitem">
-                      <i class="icon-vector-wrench"></i> {{ _('Settings') }}
-                    </a>
-                  </li>
-                  <li class="admin-menu-item" role="presentation">
-                    <a href="#organization" role="menuitem">
-                      <i class="icon-vector-bolt"></i>
-                      <span>{{ _('Manage organization') }}</span>
-                    </a>
-                  </li>
-                  <li class="divider"></li>
-                  <li role="presentation">
-                    <a href="/help" target="_blank" role="menuitem">
-                      <i class="icon-vector-question-sign"></i> {{ _('User documentation') }}
-                    </a>
-                  </li>
-                  <li role="presentation">
-                    <a tabindex="0" role="menuitem" data-overlay-trigger="keyboard-shortcuts">
-                      <i class="icon-vector-keyboard"></i> {{ _('Keyboard shortcuts') }} (?)
-                    </a>
-                  </li>
-                  <li role="presentation">
-                    <a tabindex="0" role="menuitem" data-overlay-trigger="markdown-help">
-                      <i class="icon-vector-pencil"></i> {{ _('Message formatting') }}
-                    </a>
-                  </li>
-                  <li role="presentation">
-                    <a tabindex="0" role="menuitem" data-overlay-trigger="search-operators">
-                      <i class="icon-vector-search"></i> {{ _('Search operators') }}
-                    </a>
-                  </li>
-                  <li class="divider" role="presentation"></li>
-                  <li role="presentation">
-                    <a href="{{ apps_page_url }}" target="_blank" role="menuitem">
-                      <i class="icon-vector-desktop"></i> {{ _('Desktop & mobile apps') }}
-                    </a>
-                  </li>
-                  <li role="presentation">
-                    <a href="/integrations" target="_blank" role="menuitem">
-                      <i class="icon-vector-github"></i> {{ _('Integrations') }}
-                    </a>
-                  </li>
-                  <li role="presentation">
-                    <a href="/api" target="_blank" role="menuitem">
-                      <i class="icon-vector-sitemap"></i> {{ _('API documentation') }}
-                    </a>
-                  </li>
-                  <li role="presentation">
-                    <a href="/stats" target="_blank" role="menuitem">
-                      <i class="icon-vector-bar-chart"></i>
-                      <span>{{ _('Statistics') }}</span>
-                    </a>
-                  </li>
-                  <li class="divider" role="presentation"></li>
-                  {% if enable_feedback %}
-                  <li role="presentation">
-                    <a href="#feedback" class="feedback" role="menuitem">
-                      <i class="icon-vector-comment"></i> {{ _('Feedback') }}
-                    </a>
-                  </li>
-                  {% endif %}
-                  {% if show_invites %}
-                  <li role="presentation">
-                    <a href="#invite" role="menuitem">
-                      <i class="icon-vector-plus-sign"></i> {{ _('Invite users') }}
-                    </a>
-                  </li>
-                  <li class="divider" role="presentation"></li>
-                  {% endif %}
-                  {% if show_webathena %}
-                  <li title="{% trans %}Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via Webathena{% endtrans %}" id="webathena_login_menu" role="presentation">
-                    <a href="#webathena" class="webathena_login" role="menuitem">
-                      <i class="icon-vector-bolt"></i>{{ _('Link with Webathena') }}
-                    </a>
-                  </li>
-                  {% endif %}
-                  <li role="presentation">
-                    <a href="#logout" class="logout_button" role="menuitem">
-                      <i class="icon-vector-off"></i> {{ _('Log out') }}
-                    </a>
-                  </li>
-                  {% if show_debug %}
-                  <li role="presentation">
-                    <a href="#debug" data-toggle="tab" role="menuitem">
-                      <i class="icon-vector-barcode"></i> {{ _('Debug') }}
-                    </a>
-                  </li>
-                  {% endif %}
+            </div>
+            <div id="navbar-buttons" {%if embedded %} style="visibility: hidden"{% endif %}>
+                <ul class="nav" role="navigation">
+                    <li class="dropdown actual-dropdown-menu" id="gear-menu">
+                        <a id="settings-dropdown" href="#" role="button" class="dropdown-toggle" data-target="nada" data-toggle="dropdown" title="{{ _('Menu') }} (g)">
+                            <i class="icon-vector-cog"></i><i class="icon-vector-caret-down settings-dropdown-caret"></i>
+                        </a>
+                        <ul class="dropdown-menu" role="menu" aria-labelledby="settings-dropdown">
+                            {#
+                            It is quite ingrained in our frontend code that your Home
+                            view is a Bootstrap Nav tab, even though we don't show the tab
+                            anymore
+                            #}
+                            <li class="invisible" style="display:none;" role="presentation"><a href="#home" data-toggle="tab"></a></li>
+                            <li role="presentation">
+                                <a href="#streams" role="menuitem">
+                                    <i class="icon-vector-exchange"></i> {{ _('Manage streams') }}
+                                </a>
+                            </li>
+                            <li role="presentation">
+                                <a href="#settings" role="menuitem">
+                                    <i class="icon-vector-wrench"></i> {{ _('Settings') }}
+                                </a>
+                            </li>
+                            <li class="admin-menu-item" role="presentation">
+                                <a href="#organization" role="menuitem">
+                                    <i class="icon-vector-bolt"></i>
+                                    <span>{{ _('Manage organization') }}</span>
+                                </a>
+                            </li>
+                            <li class="divider"></li>
+                            <li role="presentation">
+                                <a href="/help" target="_blank" role="menuitem">
+                                    <i class="icon-vector-question-sign"></i> {{ _('User documentation') }}
+                                </a>
+                            </li>
+                            <li role="presentation">
+                                <a tabindex="0" role="menuitem" data-overlay-trigger="keyboard-shortcuts">
+                                    <i class="icon-vector-keyboard"></i> {{ _('Keyboard shortcuts') }} (?)
+                                </a>
+                            </li>
+                            <li role="presentation">
+                                <a tabindex="0" role="menuitem" data-overlay-trigger="markdown-help">
+                                    <i class="icon-vector-pencil"></i> {{ _('Message formatting') }}
+                                </a>
+                            </li>
+                            <li role="presentation">
+                                <a tabindex="0" role="menuitem" data-overlay-trigger="search-operators">
+                                    <i class="icon-vector-search"></i> {{ _('Search operators') }}
+                                </a>
+                            </li>
+                            <li class="divider" role="presentation"></li>
+                            <li role="presentation">
+                                <a href="{{ apps_page_url }}" target="_blank" role="menuitem">
+                                    <i class="icon-vector-desktop"></i> {{ _('Desktop & mobile apps') }}
+                                </a>
+                            </li>
+                            <li role="presentation">
+                                <a href="/integrations" target="_blank" role="menuitem">
+                                    <i class="icon-vector-github"></i> {{ _('Integrations') }}
+                                </a>
+                            </li>
+                            <li role="presentation">
+                                <a href="/api" target="_blank" role="menuitem">
+                                    <i class="icon-vector-sitemap"></i> {{ _('API documentation') }}
+                                </a>
+                            </li>
+                            <li role="presentation">
+                                <a href="/stats" target="_blank" role="menuitem">
+                                    <i class="icon-vector-bar-chart"></i>
+                                    <span>{{ _('Statistics') }}</span>
+                                </a>
+                            </li>
+                            <li class="divider" role="presentation"></li>
+                            {% if enable_feedback %}
+                            <li role="presentation">
+                                <a href="#feedback" class="feedback" role="menuitem">
+                                    <i class="icon-vector-comment"></i> {{ _('Feedback') }}
+                                </a>
+                            </li>
+                            {% endif %}
+                            {% if show_invites %}
+                            <li role="presentation">
+                                <a href="#invite" role="menuitem">
+                                    <i class="icon-vector-plus-sign"></i> {{ _('Invite users') }}
+                                </a>
+                            </li>
+                            <li class="divider" role="presentation"></li>
+                            {% endif %}
+                            {% if show_webathena %}
+                            <li title="{% trans %}Grant Zulip the Kerberos tickets needed to run your Zephyr mirror via Webathena{% endtrans %}" id="webathena_login_menu" role="presentation">
+                                <a href="#webathena" class="webathena_login" role="menuitem">
+                                    <i class="icon-vector-bolt"></i>{{ _('Link with Webathena') }}
+                                </a>
+                            </li>
+                            {% endif %}
+                            <li role="presentation">
+                                <a href="#logout" class="logout_button" role="menuitem">
+                                    <i class="icon-vector-off"></i> {{ _('Log out') }}
+                                </a>
+                            </li>
+                            {% if show_debug %}
+                            <li role="presentation">
+                                <a href="#debug" data-toggle="tab" role="menuitem">
+                                    <i class="icon-vector-barcode"></i> {{ _('Debug') }}
+                                </a>
+                            </li>
+                            {% endif %}
+                        </ul>
+                    </li>
                 </ul>
-              </li>
-            </ul>
+            </div>
         </div>
-  </div>
-</nav>
+    </nav>
 </div>
diff --git a/tools/check-templates b/tools/check-templates
index 855c521dab..f9cce5a6ce 100755
--- a/tools/check-templates
+++ b/tools/check-templates
@@ -108,7 +108,6 @@ def check_html_templates(templates, all_dups):
     IGNORE_FILES = [
         # Temporarily Avoiding cleaning these to avoid merge conflicts for now.
         'templates/zerver/keyboard_shortcuts.html',
-        'templates/zerver/navbar.html',
         # zephyr-mirror.html has some whitespace-dependent formatting
         # for code blocks that prevent cleaning it.  Might make sense
         # to convert it to a /help/ markdown article.