diff --git a/combo/apps/search/templates/combo/search-cell.html b/combo/apps/search/templates/combo/search-cell.html
index 0f71f4fc..43ef9e96 100644
--- a/combo/apps/search/templates/combo/search-cell.html
+++ b/combo/apps/search/templates/combo/search-cell.html
@@ -4,7 +4,7 @@
 {% block search-form %}
 <form id="combo-search-form-{{ cell.pk }}" class="combo-search-form">
   <input type="search" name="q" autocomplete="off" id="combo-search-input-{{ cell.pk }}" class="combo-search-input" {% if cell.autofocus %}autofocus {% endif %}/>
-  <button class="submit-button">{% trans "Search" %}</button>
+  <button class="submit-button" aria-label="{% trans 'Search' %}">{% block submit-content %}{% trans 'Search' %}{% endblock %}</button>
 </form>
 {% endblock %}
 
diff --git a/combo/apps/wcs/templates/combo/wcs/tracking_code_input.html b/combo/apps/wcs/templates/combo/wcs/tracking_code_input.html
index 3a7e1887..7896d523 100644
--- a/combo/apps/wcs/templates/combo/wcs/tracking_code_input.html
+++ b/combo/apps/wcs/templates/combo/wcs/tracking_code_input.html
@@ -24,7 +24,7 @@
     {% trans "The tracking code could not been found." %}
   </div>
   <input aria-label="{% trans "Tracking Code" %}" required id="tracking-code" name="code" placeholder="{% trans 'ex: CNPHNTFB' %}"/>
-  <button>{% trans 'Submit' %}</button>
+  <button aria-label="{% trans 'Submit' %}">{% block submit-content %}{% trans 'Submit' %}{% endblock %}</button>
   <script>
   $(function() {
     $('#_cell_url_{{ cell.id }}').val(window.location);