diff --git a/app/assets/stylesheets/components/page-footer.scss b/app/assets/stylesheets/components/page-footer.scss
index d39ee4579..14ecdc901 100644
--- a/app/assets/stylesheets/components/page-footer.scss
+++ b/app/assets/stylesheets/components/page-footer.scss
@@ -76,20 +76,18 @@
 
 }
 
-.align-button-with-textbox {
+.search-form__button {
+  @include media(desktop) {
+    position: relative;
+    top: 32px;
+    left: -30px;
+    width: 100%;
+    margin-right: -30px;
+    padding-top: 7px;
+    box-sizing: content-box;
 
-  .button {
-
-    @include media(desktop) {
-      position: relative;
+    &:active {
       top: 32px;
-      left: -30px;
-      width: 100%;
-      margin-right: -30px;
-      padding-top: 8px;
-      box-sizing: content-box;
     }
-
   }
-
 }
diff --git a/app/templates/views/find-services/find-services-by-name.html b/app/templates/views/find-services/find-services-by-name.html
index 415c3ebb1..04ef957bf 100644
--- a/app/templates/views/find-services/find-services-by-name.html
+++ b/app/templates/views/find-services/find-services-by-name.html
@@ -1,6 +1,7 @@
 {% extends "views/platform-admin/_base_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/button/macro.njk" import govukButton %}
 
 {% block per_page_title %}
   Find services by name
@@ -24,9 +25,12 @@
         label='Find services by name, or by partial name'
       ) }}
     </div>
-    <div class="column-one-quarter align-button-with-textbox">
+    <div class="column-one-quarter">
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-      <button type="submit" class="button">Search</button>
+      {{ govukButton({
+        "text": "Search",
+        "classes": "search-form__button"
+      }) }}
     </div>
   {% endcall %}
 
diff --git a/app/templates/views/find-users/find-users-by-email.html b/app/templates/views/find-users/find-users-by-email.html
index c4b09dc94..fc9380456 100644
--- a/app/templates/views/find-users/find-users-by-email.html
+++ b/app/templates/views/find-users/find-users-by-email.html
@@ -1,6 +1,7 @@
 {% extends "views/platform-admin/_base_template.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/button/macro.njk" import govukButton %}
 
 {% block per_page_title %}
   Find users by email
@@ -24,9 +25,12 @@
         label='Find users by email, or by partial email'
       ) }}
     </div>
-    <div class="column-one-quarter align-button-with-textbox">
+    <div class="column-one-quarter">
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-      <button type="submit" class="button">Search</button>
+      {{ govukButton({
+        "text": "Search",
+        "classes": "search-form__button"
+      }) }}
     </div>
   {% endcall %}
 
diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html
index 27563124a..7b25238d4 100644
--- a/app/templates/views/notifications.html
+++ b/app/templates/views/notifications.html
@@ -4,6 +4,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/button/macro.njk" import govukButton %}
 
 {% set title_status = (
   'Failed '
@@ -50,9 +51,12 @@
           )
         ) }}
       </div>
-      <div class="column-one-quarter align-button-with-textbox">
+      <div class="column-one-quarter">
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-        <button type="submit" class="button">Search</button>
+        {{ govukButton({
+          "text": "Search",
+          "classes": "search-form__button"
+        }) }}
       </div>
     {% endcall %}