diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index 9f719434..3fde65e2 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -365,7 +365,7 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons
             . '<label><input type="checkbox" name="' . $name . '[]" value="' . $i['id'] . '" '
             . (in_array($i['id'], $selected) ? ' checked="checked"' : '')
             . ' > ' . $i['name'] . '</label>'
-            . (!isset($i['enabled']) || $i['enabled'] ? '' : icon('lock'))
+            . (!isset($i['enabled']) || $i['enabled'] ? '' : icon('book'))
             . '</div>';
     }
     $html .= '<div id="selection_' . $name . '" class="selection ' . $name . '">' . "\n";
diff --git a/includes/sys_template.php b/includes/sys_template.php
index c5eb3835..9468355f 100644
--- a/includes/sys_template.php
+++ b/includes/sys_template.php
@@ -222,8 +222,8 @@ function toolbar_dropdown_item_divider(): string
 function toolbar_dropdown($icon, $label, $submenu, $class = ''): string
 {
     $template =<<<EOT
-<li class="nav-item dropdown {class}">
-    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+<li class="nav-item dropdown">
+    <a class="nav-link dropdown-toggle {class}" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
         {icon} {label}
     </a>
     <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
diff --git a/includes/view/Rooms_view.php b/includes/view/Rooms_view.php
index ee36a541..a2430729 100644
--- a/includes/view/Rooms_view.php
+++ b/includes/view/Rooms_view.php
@@ -53,7 +53,6 @@ function Room_view(Room $room, ShiftsFilterRenderer $shiftsFilterRenderer, Shift
 
     return page_with_title(icon('geo-alt') . $room->name, [
         $assignNotice,
-        $description,
         auth()->can('admin_rooms') ? buttons([
             button(
                 page_link_to('admin_rooms', ['show' => 'edit', 'id' => $room->id]),
@@ -66,6 +65,7 @@ function Room_view(Room $room, ShiftsFilterRenderer $shiftsFilterRenderer, Shift
                 'btn'
             )
         ]) : '',
+        $description,
         tabs($tabs, $selected_tab),
     ], true);
 }
diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php
index 391ebe62..43465a97 100644
--- a/includes/view/ShiftCalendarShiftRenderer.php
+++ b/includes/view/ShiftCalendarShiftRenderer.php
@@ -82,7 +82,7 @@ class ShiftCalendarShiftRenderer
             case ShiftSignupState::NOT_ARRIVED:
             case ShiftSignupState::NOT_YET:
             case ShiftSignupState::SHIFT_ENDED:
-                return 'light';
+                return 'secondary';
 
             case ShiftSignupState::ANGELTYPE:
             case ShiftSignupState::COLLIDES:
@@ -91,7 +91,7 @@ class ShiftCalendarShiftRenderer
             case ShiftSignupState::FREE:
                 return 'danger';
             default:
-                return 'secondary';
+                return 'light';
         }
     }
 
@@ -282,12 +282,12 @@ class ShiftCalendarShiftRenderer
                     button(
                         page_link_to('user_shifts', ['edit_shift' => $shift['SID']]),
                         icon('pencil'),
-                        "btn-$class btn-sm border-light"
+                        "btn-$class btn-sm border-light text-white"
                     ),
                     button(
                         page_link_to('user_shifts', ['delete_shift' => $shift['SID']]),
                         icon('trash'),
-                        "btn-$class btn-sm border-light"
+                        "btn-$class btn-sm border-light text-white"
                     )
                 ]) . '</div>';
         }
diff --git a/includes/view/UserDriverLicenses_view.php b/includes/view/UserDriverLicenses_view.php
index d43b6b03..46653d3a 100644
--- a/includes/view/UserDriverLicenses_view.php
+++ b/includes/view/UserDriverLicenses_view.php
@@ -69,5 +69,5 @@ function UserDriverLicense_edit_view($user_source, $wants_to_drive, $user_driver
             });
         </script>
         '
-    ]);
+    ], true);
 }
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 74e0aa17..54329db9 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -615,7 +615,7 @@ function User_view(
         . (config('enable_user_name') ? ' <small>' . $user_name . '</small>' : ''),
         [
             msg(),
-            div('row m-3', [
+            div('row', [
                 div('col-md-12', [
                     buttons([
                         $admin_user_privilege ? button(
diff --git a/resources/views/admin/schedule/index.twig b/resources/views/admin/schedule/index.twig
index d2c8425e..2d6b00cd 100644
--- a/resources/views/admin/schedule/index.twig
+++ b/resources/views/admin/schedule/index.twig
@@ -40,12 +40,12 @@
                                         <div class="btn-group">
                                             <a
                                                 href="{{ url('/admin/schedule/load/' ~ schedule.id) }}"
-                                                class="btn btn-sm btn-primary">
+                                                class="btn btn-sm btn-secondary">
                                                 {{ __('form.import') }}
                                             </a>
                                             <a
                                                 href="{{ url('/admin/schedule/edit/' ~ schedule.id) }}"
-                                                class="btn btn-sm btn-primary">
+                                                class="btn btn-sm btn-secondary">
                                                 {{ __('form.edit') }}
                                             </a>
                                         </div>
diff --git a/resources/views/macros/form.twig b/resources/views/macros/form.twig
index cc9c7b45..9fed02b5 100644
--- a/resources/views/macros/form.twig
+++ b/resources/views/macros/form.twig
@@ -68,7 +68,7 @@
 {% macro button(label, opt) %}
     <button
         class="btn btn-{{ opt.btn_type|default('secondary') }}
-            {%- if 'btn_size' in opt %} btn-{{ opt.btn_size }}{% endif %}"
+        {%- if opt.size is defined %} btn-{{ opt.size }}{% endif %}"
         {%- if opt.type is defined %} type="{{ opt.type }}"{% endif %}
         {%- if opt.name is defined %} name="{{ opt.name }}"{% endif %}
         {%- if opt.title is defined %} title="{{ opt.title }}"{% endif %}
diff --git a/resources/views/pages/news/news.twig b/resources/views/pages/news/news.twig
index 8c38863c..3829b879 100644
--- a/resources/views/pages/news/news.twig
+++ b/resources/views/pages/news/news.twig
@@ -25,12 +25,12 @@
                     {{ m.user(comment.user) }}
 
                     {% if comment.user.id == user.id or has_permission_to('admin_news') or has_permission_to('comment.delete') %}
-                        <div class="pull-right">
+                        <div class="ms-auto">
                             <form
                                 action="{{ url('/news/comment/' ~ comment.id) }}" enctype="multipart/form-data"
                                 method="post">
                                 {{ csrf() }}
-                                {{ f.submit(m.glyphicon('trash'), {'name': 'delete', 'btn_type': 'danger', 'btn_size': 'xs', 'title': __('form.delete')}) }}
+                                {{ f.submit(m.icon('trash'), {'name': 'delete', 'btn_type': 'danger', 'size': 'sm', 'title': __('form.delete')}) }}
                             </form>
                         </div>
                     {% endif %}
diff --git a/resources/views/pages/questions/overview.twig b/resources/views/pages/questions/overview.twig
index 3b8f545f..49ce170e 100644
--- a/resources/views/pages/questions/overview.twig
+++ b/resources/views/pages/questions/overview.twig
@@ -51,7 +51,7 @@
                                                 >
                                                     {{ csrf() }}
                                                     {{ f.hidden('id', question.id) }}
-                                                    {{ f.submit(m.icon('trash'), {'name': 'delete', 'btn_type': 'danger', 'btn_size': 'sm', 'title': __('form.delete')}) }}
+                                                    {{ f.submit(m.icon('trash'), {'name': 'delete', 'btn_type': 'danger', 'size': 'sm', 'title': __('form.delete')}) }}
                                                 </form>
                                             {% endif %}
 
diff --git a/resources/views/pages/settings/oauth.twig b/resources/views/pages/settings/oauth.twig
index b2518554..a2c68532 100644
--- a/resources/views/pages/settings/oauth.twig
+++ b/resources/views/pages/settings/oauth.twig
@@ -35,13 +35,13 @@
                     <form method="POST" action="{{ url('/oauth/' ~ name ~ '/connect') }}">
                         {{ csrf() }}
 
-                        {{ f.submit(__('form.connect'), {'btn_size' : 'sm'}) }}
+                        {{ f.submit(__('form.connect'), {'size' : 'sm'}) }}
                     </form>
                 {% else %}
                     <form method="POST" action="{{ url('/oauth/' ~ name ~ '/disconnect') }}">
                         {{ csrf() }}
 
-                        {{ f.submit(__('form.disconnect'), {'btn_type': 'danger', 'btn_size' : 'sm'}) }}
+                        {{ f.submit(__('form.disconnect'), {'btn_type': 'danger', 'size' : 'sm'}) }}
                     </form>
                 {% endif %}
             </td>