diff --git a/plinth/templates/first_setup.html b/plinth/templates/first_setup.html
index 32bb90b75..d30655b88 100644
--- a/plinth/templates/first_setup.html
+++ b/plinth/templates/first_setup.html
@@ -19,12 +19,9 @@ no-brand
   </div>
 
   {% if is_first_setup_running %}
-    <div class="alert alert-warning" role="alert">
-      {% blocktrans trimmed %}
-        Please wait for {{ box_name }} to finish installation.
-        You can start using your {{ box_name }} once it is done.
-      {% endblocktrans %}
-    </div>
+    <p class="firstboot-spinner">
+      <span class="fa fa-refresh fa-spin fa-4x fa-pull-left processing"></span>
+    </p>
   {% endif %}
 
 {% endblock %}
diff --git a/static/themes/default/css/main.css b/static/themes/default/css/main.css
index b8aecfe08..a20a20398 100644
--- a/static/themes/default/css/main.css
+++ b/static/themes/default/css/main.css
@@ -636,6 +636,19 @@ a.menu_link_active {
     width: 50%;
 }
 
+
+/*
+ * First setup pages
+ */
+.firstboot-spinner {
+    text-align: center;
+}
+
+.firstboot-spinner span.fa {
+    float: none;
+    margin: auto;
+}
+
 .next-steps {
     list-style: none;
     margin-top: 1.5rem;