diff --git a/app/main/forms.py b/app/main/forms.py
index 84b1585e5..ac46ec725 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1525,9 +1525,9 @@ class ServiceContactDetailsForm(StripWhitespaceForm):
         ],
     )
 
-    url = StringField("URL")
-    email_address = EmailField("Email address")
-    phone_number = StringField("Phone number")
+    url = GovukTextInputField("URL")
+    email_address = GovukEmailField("Email address")
+    phone_number = GovukTextInputField("Phone number")
 
     def validate(self):
 
diff --git a/app/templates/views/service-settings/send-files-by-email.html b/app/templates/views/service-settings/send-files-by-email.html
index b2f8fd1f1..c80ab100d 100644
--- a/app/templates/views/service-settings/send-files-by-email.html
+++ b/app/templates/views/service-settings/send-files-by-email.html
@@ -1,5 +1,4 @@
 {% extends "withnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/radios.html" import radio %}
@@ -35,7 +34,7 @@
 
             {{ radio(option, data_target=data_target) }}
             <div class="panel panel-border-narrow js-hidden" id={{data_target}}>
-              {{ textbox(form|attr(option.data), label=' ', width='1-1') }}
+              {{ form|attr(option.data)(param_extensions={"classes": "govuk-!-width-full", "label": {"text": " "}}) }}
             </div>
           {% endfor %}
         {% endcall %}
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index 5a53d9293..d55424e9e 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -4186,7 +4186,7 @@ def test_send_files_by_email_contact_details_does_not_update_invalid_contact_det
         _follow_redirects=True
     )
 
-    assert normalize_spaces(page.find('span', class_='error-message').text) == error
+    assert error in page.find('span', class_='govuk-error-message').text
     assert normalize_spaces(page.h1.text) == "Send files by email"