diff --git a/plinth/modules/first_boot/templates/firstboot_navbar.html b/plinth/modules/first_boot/templates/firstboot_navbar.html
new file mode 100644
index 000000000..dfb3f58ed
--- /dev/null
+++ b/plinth/modules/first_boot/templates/firstboot_navbar.html
@@ -0,0 +1,26 @@
+{% comment %}
+#
+# This file is part of Plinth.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+{% endcomment %}
+
+<ul class="nav navbar-nav navbar-right">
+  <li>
+    <a href="{% url 'help:index' %}">
+      <span class="glyphicon-question-sign glyphicon nav-icon"></span>
+    </a>
+  </li>
+</ul>
diff --git a/plinth/modules/first_boot/templates/firstboot_state0.html b/plinth/modules/first_boot/templates/firstboot_state0.html
index f011c5211..5e9d52696 100644
--- a/plinth/modules/first_boot/templates/firstboot_state0.html
+++ b/plinth/modules/first_boot/templates/firstboot_state0.html
@@ -31,13 +31,7 @@
 {% endblock %}
 
 {% block add_nav_and_login %}
-  <ul class="nav navbar-nav navbar-right">
-    <li>
-      <a href="{% url 'help:index' %}">
-        <span class="glyphicon-question-sign glyphicon nav-icon"></span>
-      </a>
-    </li>
-  </ul>
+  {% include "firstboot_navbar.html" %}
 {% endblock %}
 
 {% block content_row %}
diff --git a/plinth/modules/first_boot/templates/firstboot_state1.html b/plinth/modules/first_boot/templates/firstboot_state1.html
index 8fe94b965..993634158 100644
--- a/plinth/modules/first_boot/templates/firstboot_state1.html
+++ b/plinth/modules/first_boot/templates/firstboot_state1.html
@@ -22,14 +22,16 @@
 {% load i18n %}
 {% load static %}
 
+{% block page_head %}
+  <style type="text/css">
+   .navbar-brand .glyphicon {
+       display: none;
+   }
+  </style>
+{% endblock %}
+
 {% block add_nav_and_login %}
-  <ul class="nav navbar-nav navbar-right">
-    <li>
-      <a href="{% url 'help:index' %}">
-        <span class="glyphicon-question-sign glyphicon nav-icon"></span>
-      </a>
-    </li>
-  </ul>
+  {% include "firstboot_navbar.html" %}
 {% endblock %}
 
 {% block content_row %}