diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index c1eff2f8..93ac2f09 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -120,7 +120,7 @@ function admin_user()
 
         $html .= '</td></tr>' . "\n";
         $html .= '</table>' . "\n" . '<br />' . "\n";
-        $html .= '<input type="submit" value="' . __('form.save') . '" class="btn btn-primary">';
+        $html .= '<button type="submit" class="btn btn-primary">' . __('form.save') . '</button>' . "\n";
         $html .= '</form>';
 
         $html .= '<hr />';
@@ -136,7 +136,7 @@ function admin_user()
         $html .= '  <tr><td>' . __('Confirm password') . '</td><td>' . '<input type="password" size="40" name="new_pw2" value="" class="form-control" autocomplete="new-password"></td></tr>' . "\n";
 
         $html .= '</table>' . "\n" . '<br />' . "\n";
-        $html .= '<input type="submit" value="' . __('form.save') . '" class="btn btn-primary">' . "\n";
+        $html .= '<button type="submit" class="btn btn-primary">' . __('form.save') . '</button>' . "\n";
         $html .= '</form>';
 
         $html .= '<hr />';
@@ -172,7 +172,7 @@ function admin_user()
 
             $html .= '</div><br>';
 
-            $html .= '<input type="submit" value="' . __('form.save') . '" class="btn btn-primary">' . "\n";
+            $html .= '<button type="submit" class="btn btn-primary">' . __('form.save') . '</button>' . "\n";
             $html .= '</form>';
 
             $html .= '<hr />';
diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php
index a9b4797b..8da72751 100644
--- a/includes/view/AngelTypes_view.php
+++ b/includes/view/AngelTypes_view.php
@@ -188,15 +188,13 @@ function AngelType_view_buttons(
     if ($admin_angeltypes || $supporter) {
         $buttons[] = button(
             page_link_to('angeltypes', ['action' => 'edit', 'angeltype_id' => $angeltype->id]),
-            icon('pencil') . __('edit'),
-            'edit'
+            icon('pencil') . __('edit')
         );
     }
     if ($admin_angeltypes) {
         $buttons[] = button(
             page_link_to('angeltypes', ['action' => 'delete', 'angeltype_id' => $angeltype->id]),
-            icon('trash') . __('delete'),
-            'delete'
+            icon('trash') . __('delete')
         );
     }
 
diff --git a/includes/view/Rooms_view.php b/includes/view/Rooms_view.php
index 7832a854..f1ba4c4c 100644
--- a/includes/view/Rooms_view.php
+++ b/includes/view/Rooms_view.php
@@ -62,8 +62,7 @@ function Room_view(Room $room, ShiftsFilterRenderer $shiftsFilterRenderer, Shift
         auth()->can('admin_rooms') ? buttons([
             button(
                 page_link_to('admin/rooms/edit/' . $room->id),
-                icon('pencil') . __('edit'),
-                'btn'
+                icon('pencil') . __('edit')
             ),
         ]) : '',
         $dect,
diff --git a/includes/view/ShiftTypes_view.php b/includes/view/ShiftTypes_view.php
index 4b7beee5..4f2a7b07 100644
--- a/includes/view/ShiftTypes_view.php
+++ b/includes/view/ShiftTypes_view.php
@@ -73,13 +73,11 @@ function ShiftType_view(ShiftType $shifttype)
             button(page_link_to('shifttypes'), shifttypes_title(), 'back'),
             button(
                 page_link_to('shifttypes', ['action' => 'edit', 'shifttype_id' => $shifttype->id]),
-                icon('pencil') . __('edit'),
-                'edit'
+                icon('pencil') . __('edit')
             ),
             button(
                 page_link_to('shifttypes', ['action' => 'delete', 'shifttype_id' => $shifttype->id]),
                 icon('trash') . __('delete'),
-                'delete'
             ),
         ]),
         heading(__('Description'), 2),
diff --git a/resources/views/pages/user-shifts.html b/resources/views/pages/user-shifts.html
index e1936efb..75cf148a 100644
--- a/resources/views/pages/user-shifts.html
+++ b/resources/views/pages/user-shifts.html
@@ -52,7 +52,7 @@
             </div>
             <div class="row d-print-none">
                 <div class="col-md-12">
-                    <input class="btn btn-primary" type="submit" style="width:100%; margin: 1em 0" value="%filter%">
+                    <button class="btn btn-primary" type="submit" style="width:100%; margin: 1em 0">%filter%</button>
                 </div>
             </div>
         </div>