diff --git a/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html b/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html
index e0f3dca7a1..82af6632de 100644
--- a/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html
+++ b/src/openforms/authentication/templates/of_authentication/registrator_subject_info.html
@@ -37,8 +37,8 @@ <h1 class="title">
                 {% include "includes/forms/field_wrapper.html" with field=form.bsn type='bsn' only %}
 
                 <div class="openforms-toolbar openforms-toolbar--reverse">
-                    <button class="openforms-button openforms-button--primary" type="submit">
-                        <span class="openforms-button__label">{% trans "Continue" %}</span>
+                    <button class="utrecht-button utrecht-button--primary-action" type="submit">
+                        {% trans "Continue" %}
                     </button>
                 </div>
             </div>
@@ -47,16 +47,16 @@ <h1 class="title">
                 {% include "includes/forms/field_wrapper.html" with field=form.kvk only %}
 
                 <div class="openforms-toolbar openforms-toolbar--reverse">
-                    <button class="openforms-button openforms-button--primary" type="submit">
-                        <span class="openforms-button__label">{% trans "Continue" %}</span>
+                    <button class="utrecht-button utrecht-button--primary-action" type="submit">
+                        {% trans "Continue" %}
                     </button>
                 </div>
             </div>
 
             <div class="auth-mode auth-mode--employee">
                 <div class="openforms-toolbar openforms-toolbar--reverse">
-                    <button class="openforms-button openforms-button--primary" type="submit" name="skip_subject" value="on">
-                        <span class="openforms-button__label">{{ form.skip_subject.label }}</span>
+                    <button class="utrecht-button utrecht-button--primary-action" type="submit" name="skip_subject" value="on">
+                        {{ form.skip_subject.label }}
                     </button>
                 </div>
             </div>
diff --git a/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html b/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html
index ddb0b7f0a0..f3925c672b 100644
--- a/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html
+++ b/src/openforms/submissions/templates/submissions/find_submission_for_cosign.html
@@ -23,15 +23,15 @@ <h1 class="title">
                         {% include "includes/forms/field_wrapper.html" with field=form.code type='text' only %}
 
                         <div class="openforms-toolbar openforms-toolbar--reverse openforms-toolbar--bottom">
-                            <button class="openforms-button openforms-button--primary" type="submit">
-                                <span class="openforms-button__label">{% trans "Submit" %}</span>
+                            <button class="utrecht-button utrecht-button--primary-action" type="submit">
+                                {% trans "Submit" %}
                             </button>
                         </div>
                     </form>
                     <form method="post" action="{% url "authentication:logout" %}">{% csrf_token %}
                         <div class="openforms-toolbar openforms-toolbar--reverse openforms-toolbar--bottom">
-                            <button class="openforms-button openforms-button--danger" type="submit">
-                                <span class="openforms-button__label">{% trans "Log out" %}</span>
+                            <button class="utrecht-button utrecht-button--primary-action utrecht-button--danger" type="submit">
+                                {% trans "Log out" %}
                             </button>
                         </div>
                     </form>
diff --git a/src/openforms/templates/includes/cookie-notice.html b/src/openforms/templates/includes/cookie-notice.html
index 8b9b32d354..e07a12ce74 100644
--- a/src/openforms/templates/includes/cookie-notice.html
+++ b/src/openforms/templates/includes/cookie-notice.html
@@ -23,13 +23,13 @@
                     <li class="openforms-toolbar__list-item">
                         <button
                             type="submit"
-                            class="utrecht-button utrecht-button--primary-action openforms-button openforms-button--primary cookie-notice__accept"
+                            class="utrecht-button utrecht-button--primary-action cookie-notice__accept"
                         >{% trans "Accept all" %}</button>
                     </li>
                     <li class="openforms-toolbar__list-item">
                         <button
                             type="submit"
-                            class="utrecht-button utrecht-button--primary-action openforms-button openforms-button--primary cookie-notice__decline"
+                            class="utrecht-button utrecht-button--primary-action cookie-notice__decline"
                         >{% trans "Decline all" %}</button>
                     </li>
                 </ul>