diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index 89c1e7b30..b38a3e28c 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -526,25 +526,12 @@ a.menu_link_active {
 .header-bar .app-toggle-container, .header-bar h2 {
     margin: auto 0;
 }
-.toolbar, .panel-heading {
-    border: none;
+
+.btn-toolbar {
+    margin-top: 10px;
+    margin-bottom: 10px;
 }
 
-.toolbar-heading {
-    padding: 10px 0;
-}
-
-.toolbar-title > :not(:first-child) {
-    margin-left: 10px;
-}
-
-.toolbar-body {
-    min-height: 0;
-    padding: 0;
-    margin: 0;
-    overflow: auto;
-}
-
-.toolbar-body #clients.table {
-    margin-bottom: 0;
+.btn-toolbar .button-extra-actions {
+    float: right;
 }