diff --git a/app/views/rails_admin/main/_submit_buttons.html.erb b/app/views/rails_admin/main/_submit_buttons.html.erb
new file mode 100644
index 000000000..241624c4e
--- /dev/null
+++ b/app/views/rails_admin/main/_submit_buttons.html.erb
@@ -0,0 +1,25 @@
+<div class="form-actions row justify-content-end my-3">
+  <div class="col-sm-10">
+    <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>">
+    <button class="govuk-button" data-disable-with="<%= t("admin.form.save") %>" name="_save" type="submit"<%= " disabled" unless @action.enabled? %>>
+      <i class="fas fa-check"></i>
+      <%= t("admin.form.save") %>
+    </button>
+    <span class="extra_buttons">
+      <% if @action.enabled? && authorized?(:new, @abstract_model) %>
+        <button class="govuk-button govuk-button--secondary" data-disable-with="<%= t("admin.form.save_and_add_another") %>" name="_add_another" type="submit">
+          <%= t("admin.form.save_and_add_another") %>
+        </button>
+      <% end %>
+      <% if @action.enabled? && authorized?(:edit, @abstract_model) %>
+        <button class="govuk-button govuk-button--secondary" data-disable-with="<%= t("admin.form.save_and_edit") %>" name="_add_edit" type="submit"<%= " disabled" unless @action.enabled? %>>
+          <%= t("admin.form.save_and_edit") %>
+        </button>
+      <% end %>
+      <button class="govuk-button govuk-button--secondary" data-disable-with="<%= t("admin.form.cancel") %>" formnovalidate="<%= true %>" name="_continue" type="submit">
+        <i class="fas fa-times"></i>
+        <%= t("admin.form.cancel") %>
+      </button>
+    </span>
+  </div>
+</div>
diff --git a/app/views/rails_admin/main/delete.html.erb b/app/views/rails_admin/main/delete.html.erb
new file mode 100644
index 000000000..59a01a377
--- /dev/null
+++ b/app/views/rails_admin/main/delete.html.erb
@@ -0,0 +1,21 @@
+<h4>
+  <%= t("admin.form.are_you_sure_you_want_to_delete_the_object", model_name: @abstract_model.pretty_name.downcase) %>
+  <q><strong><%= @model_config.with(object: @object).object_label %></strong></q>
+  <%= t("admin.form.all_of_the_following_related_items_will_be_deleted") %>
+</h4>
+<ul>
+  <%= render partial: "delete_notice", object: @object %>
+</ul>
+<%= form_for(@object, url: delete_path(model_name: @abstract_model.to_param, id: @object.id), html: { method: "delete" }) do %>
+  <input name="return_to" type="<%= :hidden %>" value="<%= (params[:return_to].presence || request.referer) %>">
+  <div class="form-actions">
+    <button class="govuk-button govuk-button--warning" data-disable-with="<%= t("admin.form.confirmation") %>" type="submit">
+      <i class="fas fa-check"></i>
+      <%= t("admin.form.confirmation") %>
+    </button>
+    <button class="govuk-button" data-disable-with="<%= t("admin.form.cancel") %>" name="_continue" type="submit">
+      <i class="fas fa-times"></i>
+      <%= t("admin.form.cancel") %>
+    </button>
+  </div>
+<% end %>
diff --git a/app/views/rails_admin/main/index.html.erb b/app/views/rails_admin/main/index.html.erb
index 98716a070..52cd63157 100644
--- a/app/views/rails_admin/main/index.html.erb
+++ b/app/views/rails_admin/main/index.html.erb
@@ -54,24 +54,28 @@
       <div class="row rails-admin-filters-box" data-options="<%= ordered_filter_options.to_json %>" id="filters_box"></div>
       <hr class="filters_box" style="display:<%= ordered_filters.empty? ? "none" : "block" %>">
       <div class="row">
-        <div class="col-sm-6">
+        <div class="col-sm-8">
           <div class="input-group">
-            <input class="form-control" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>" autocomplete="off">
-            <button class="btn btn-primary" data-disable-with="<%= "<i class=\"fas fa-sync\"></i>#{t('admin.misc.refresh')}" %>" type="submit">
+            <input class="govuk-input govuk-input--width-20" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>" autocomplete="off">
+            <div class="govuk-!-margin-left-2">
+              <button class="govuk-button govuk-!-margin-bottom-0" data-disable-with="<%= "<i class=\"fas fa-sync\"></i>#{t('admin.misc.refresh')}" %>" type="submit">
               <i class="fas fa-sync"></i>
               <%= t("admin.misc.refresh") %>
-            </button>
-            <button class="btn btn-info" id="remove_filter" title="<%= t("admin.misc.reset_filters") %>">
-              <i class="fas fa-times"></i>
-            </button>
+              </button>
+            </div>
+            <div id="remove_filter" title="<%= t("admin.misc.reset_filters") %>">
+              <button class="govuk-button govuk-button--secondary govuk-!-margin-bottom-0">
+                <i class="fas fa-times"></i>
+              </button>
+            </div>
           </div>
           <% if @model_config.list.search_help.present? %>
             <div class="form-text"><%= @model_config.list.search_help %></div>
           <% end %>
         </div>
-        <div class="col-sm-6 text-end">
+        <div class="col-sm-4 text-end">
           <% if export_action %>
-            <%= govuk_link_to wording_for(:link, export_action), export_path(params.except("page")), class: "btn btn-info" %>
+            <%= govuk_button_link_to wording_for(:link, export_action), export_path(params.except("page")), class: "govuk-!-margin-bottom-0" %>
           <% end %>
         </div>
       </div>
@@ -168,7 +172,7 @@
       </div>
       <div class="row">
         <div class="col-md-6">
-          <%= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-light clearfix") unless total_count > 100 || total_count <= @objects.to_a.size %>
+          <%= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "govuk-button govuk-button--secondary") unless total_count > 100 || total_count <= @objects.to_a.size %>
         </div>
       </div>
       <div class="clearfix total-count">