diff --git a/bookwyrm/templates/author/sync_modal.html b/bookwyrm/templates/author/sync_modal.html
index 5d2ff347..f171e965 100644
--- a/bookwyrm/templates/author/sync_modal.html
+++ b/bookwyrm/templates/author/sync_modal.html
@@ -19,13 +19,8 @@
 {% endblock %}
 
 {% block modal-footer %}
-<button class="button is-primary" type="submit">
-    <span>{% trans "Confirm" %}</span>
-</button>
-
-<button type="button" class="button" data-modal-close>
-    {% trans "Cancel" %}
-</button>
+<button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
+<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
 {% endblock %}
 
 {% block modal-form-close %}</form>{% endblock %}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 4903da87..b05963dc 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -63,7 +63,11 @@
         <div class="column is-one-fifth">
             {% if not book.cover %}
                 {% if user_authenticated %}
-                    <button type="button" data-controls="add_cover_{{ book.id }}" data-focus-target="modal_title_add_cover_{{ book.id }}" aria-pressed="false" class="cover-container no-cover is-h-m-mobile">
+                    <button
+                        type="button"
+                        class="cover-container no-cover is-h-m-mobile"
+                        data-modal-open="add_cover_{{ book.id }}"
+                    >
                         <img
                             class="book-cover"
                             src="{% static "images/no_cover.jpg" %}"
@@ -78,7 +82,8 @@
                             {% trans "Click to add cover" %}
                         </span>
                     </button>
-                    {% include 'book/cover_add_modal.html' with book=book controls_text="add_cover" controls_uid=book.id %}
+                    {% join "add_cover" book.id as modal_id %}
+                    {% include 'book/cover_add_modal.html' with id=modal_id %}
                     {% if request.GET.cover_error %}
                     <p class="help is-danger">{% trans "Failed to load cover" %}</p>
                     {% endif %}
diff --git a/bookwyrm/templates/book/cover_add_modal.html b/bookwyrm/templates/book/cover_add_modal.html
index f09b4495..855e52f4 100644
--- a/bookwyrm/templates/book/cover_add_modal.html
+++ b/bookwyrm/templates/book/cover_add_modal.html
@@ -1,4 +1,4 @@
-{% extends 'components/modal.html' %}
+{% extends 'components/new_modal.html' %}
 {% load i18n %}
 
 {% block modal-title %}
@@ -29,8 +29,7 @@
 
 {% block modal-footer %}
 <button class="button is-primary" type="submit">{% trans "Add" %}</button>
-{% trans "Cancel" as button_text %}
-{% include 'snippets/toggle/toggle_button.html' with text=button_text %}
+<button type="button" class="button" data-modal-close>{% trans "Cancel" %}</button>
 {% endblock %}
-{% block modal-form-close %}</form>{% endblock %}
 
+{% block modal-form-close %}</form>{% endblock %}
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index 2246fab1..00fa4035 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -17,6 +17,12 @@ def get_uuid(identifier):
     return f"{identifier}{uuid4()}"
 
 
+@register.simple_tag(takes_context=False)
+def join(*args):
+    """concatenate an arbitary set of values"""
+    return "_".join(str(a) for a in args)
+
+
 @register.filter(name="username")
 def get_user_identifier(user):
     """use localname for local users, username for remote"""