diff --git a/plinth/templates/toolbar.html b/plinth/templates/toolbar.html
index de5cc556e..b2152535b 100644
--- a/plinth/templates/toolbar.html
+++ b/plinth/templates/toolbar.html
@@ -81,7 +81,16 @@
 
           {% block diagnostics %}
             {% if diagnostics_module_name %}
-              {% include "diagnostics_button.html" with module=diagnostics_module_name enabled=is_enabled %}
+            <!-- Single button -->
+              <div class="btn-group">
+                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <span class="glyphicon glyphicon glyphicon-cog" aria-hidden="true"></span> <span class="caret"></span>
+                </button>
+                <div class="dropdown-menu">
+                  {% include "diagnostics_button.html" with module=diagnostics_module_name enabled=is_enabled %}
+                </div>
+              </div>
+              
             {% endif %}
           {% endblock %}
     
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index c5e8bc166..542d0b93d 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -142,7 +142,13 @@ body {
 }
 
 .form-diagnostics-button {
-    display: inline-block;
+    display: block;
+}
+
+.form-diagnostics-button .btn {
+    width: 100%;
+    border-radius: 0;
+    border: none;
 }
 
 /* Hide log out button if user dropdown is available */