diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index 0cb64ca5bc..1d7b983e10 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -1345,6 +1345,18 @@ label[for] {
   margin: 10px 0;
 }
 
+.cta.arrow {
+  height: auto;
+  &::after {
+    content: " →" / "";
+  }
+  &:dir(rtl) {
+    &::after {
+      content: " ←" / "";
+    }
+  }
+}
+
 .callout-right {
     @include respond-min(768px) {
         float: right;
diff --git a/djangoproject/templates/contact/coc.html b/djangoproject/templates/contact/coc.html
deleted file mode 100644
index db307a7f8a..0000000000
--- a/djangoproject/templates/contact/coc.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "base_3col.html" %}
-{% load i18n %}
-
-{% block title %}{% translate "Django Code of Conduct Feedback" %}{% endblock %}
-
-{% block content %}
-    <h1>{% translate "Django Code of Conduct Feedback" %}</h1>
-    {% include "contact/coc_form.html" %}
-{% endblock %}
diff --git a/djangoproject/templates/contact/coc_form.html b/djangoproject/templates/contact/coc_form.html
deleted file mode 100644
index 05d1aa4c1e..0000000000
--- a/djangoproject/templates/contact/coc_form.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% load i18n %}
-<form action="{% url "contact_coc" %}" method="post" accept-charset="utf-8" class="wide">
-  {% csrf_token %}
-
-{# hardcoding inputs because they'll be included on the CoC page itself #}
-  <p>
-    <label for="id_name">{% translate "Your name (optional):" %}</label>
-    {% if form.name.errors %}<p class="errors">{{ form.name.errors.as_text }}</p>{% endif %}
-    <input id="id_name" class="required" type="text" name="name">
-  </p>
-  <p>
-    <label for="id_email">{% translate "Your email address (optional):" %}</label>
-    {% if form.email.errors %}<p class="errors">{{ form.email.errors.as_text }}</p>{% endif %}
-    <input id="id_email" class="required" type="text" name="email">
-  </p>
-  <p>
-    <label for="id_body">{% translate "Your message:" %}</label>
-    {% if form.body.errors %}<p class="errors">{{ form.body.errors.as_text }}</p>{% endif %}
-    <textarea id="id_body" class="required" rows="10" name="body" cols="40"></textarea>
-  </p>
-  <p class="submit"><input type="submit" value="{% translate "Send &rarr;" %}"></p>
-
-</form>
diff --git a/djangoproject/templates/contact/foundation.html b/djangoproject/templates/contact/foundation.html
index 2dc3e5ddef..ea5374122f 100644
--- a/djangoproject/templates/contact/foundation.html
+++ b/djangoproject/templates/contact/foundation.html
@@ -29,7 +29,7 @@ <h1>{% translate "Contact the Django Software Foundation" %}</h1>
       <a href="https://forum.djangoproject.com">Django Forum</a>.
     {% endblocktranslate %}
   </p>
-  <form action="." method="post" accept-charset="utf-8" class="form-input">
+  <form action="." method="post" accept-charset="utf-8">
     {% csrf_token %}
     <div>
       {{ form.name.as_field_group }}
@@ -44,6 +44,8 @@ <h1>{% translate "Contact the Django Software Foundation" %}</h1>
       {{ form.body.as_field_group }}
     </div>
     {{ form.captcha }}
-    <p class="submit"><input type="submit" class="cta" value="{% translate "Send &rarr;" %}"></p>
+    <div class="submit">
+      <button type="submit" class="cta arrow">{% translate "Send" %}</button>
+    </div>
   </form>
 {% endblock %}
diff --git a/djangoproject/templates/fundraising/manage-donations.html b/djangoproject/templates/fundraising/manage-donations.html
index 340bc6550e..8812087b87 100644
--- a/djangoproject/templates/fundraising/manage-donations.html
+++ b/djangoproject/templates/fundraising/manage-donations.html
@@ -7,7 +7,7 @@
     {% for message in messages %}
       <p>{{ message }}</p>
     {% endfor %}
-    <hr>
+    <hr aria-hidden="true" />
   {% endif %}
 
 {% endblock %}
@@ -23,20 +23,20 @@ <h1>{% translate "Manage your donations to the Django Software Foundation" %}</h
     {% endblocktranslate %}
   </p>
 
-  <form enctype="multipart/form-data" action="" method="post" class="form-input django-hero-form"
+  <form enctype="multipart/form-data" action="" method="post" class="django-hero-form"
         data-stripe-key="{{ stripe_publishable_key }}" data-stripe-icon="{% static 'img/dj-stripe-icon.jpg' %}"
         data-update-card-url="{% url 'fundraising:update-card' %}">
     <h2>{% translate "Manage your participation in the fundraising campaigns" %}</h2>
     <p>{% translate "Information entered below will be visible on all of your donations to the Django Project." %}</p>
     {% csrf_token %}
     {% include 'fundraising/includes/_form.html' with form=hero_form %}
-    <p class="submit">
-      <input type="submit" class="cta" value="{% translate "Save &rarr;" context "Save personal details about donation" %}">
-    </p>
+    <div class="submit">
+      <button type="submit" class="cta arrow">{% translate "Save" context "Save personal details about donation" %}</button>
+    </div>
   {# Always include to avoid "Management form has been tampered with" if no recurring donations exist #}
     {{ modify_donations_formset.management_form }}
     {% if recurring_donations %}
-      <hr />
+      <hr aria-hidden="true" />
       <h2>{% translate "Modify your recurring donations" %}</h2>
       <p>{% translate "Update the time interval or amount of your recurring donation here:" %}</p>
       {% for form in modify_donations_formset %}
@@ -47,11 +47,11 @@ <h2>{% translate "Modify your recurring donations" %}</h2>
           <span class="change-card-result"></span>
         </div>
       {% endfor %}
-      <p class="submit">
-        <input type="submit" class="cta" value="{% translate "Save &rarr;" context "Save personal details about donation" %}">
-      </p>
+      <div class="submit">
+        <button type="submit" class="cta arrow">{% translate "Save" context "Save personal details about donation" %}</button>
+      </div>
       </form>
-      <hr />
+      <hr aria-hidden="true" />
       <h2>{% translate "Cancel your recurring donations" %}</h2>
       <p>{% translate "You can cancel your recurring donation to the Django Software Foundation anytime." %}</p>
       <ul>
@@ -72,7 +72,7 @@ <h2>{% translate "Cancel your recurring donations" %}</h2>
       </form>
     {% endif %}
     {% if past_payments %}
-      <hr />
+      <hr aria-hidden="true" />
       <h2>{% translate "Your past donations" %}</h2>
       <ul>
         {% for payment in past_payments %}