diff --git a/bookwyrm/templates/snippets/status.html b/bookwyrm/templates/snippets/status.html
index 45c12dce..1af27ee4 100644
--- a/bookwyrm/templates/snippets/status.html
+++ b/bookwyrm/templates/snippets/status.html
@@ -119,7 +119,7 @@
                     <form name="delete-{{status.id}}" action="/delete-status" method="post">
                         {% csrf_token %}
                         <input type="hidden" name="status" value="{{ status.id }}">
-                        <button type="submit" class="button">
+                        <button class="button is-danger" type="submit">
                             Delete post
                         </button>
                     </form>
diff --git a/bookwyrm/templates/snippets/tag.html b/bookwyrm/templates/snippets/tag.html
index 38d2cd34..e62167f9 100644
--- a/bookwyrm/templates/snippets/tag.html
+++ b/bookwyrm/templates/snippets/tag.html
@@ -1,24 +1,22 @@
 <div class="control">
-    <div class="tags has-addons">
-        <a class="tag is-link" href="/tag/{{ tag.identifier|urlencode }}">
-            {{ tag.name }}
-        </a>
-        <div class="tag">
+    <form name="tag" action="/{% if tag.identifier in user_tags %}untag{% else %}tag{% endif %}/" method="post">
+        {% csrf_token %}
+        <input type="hidden" name="book" value="{{ book.id }}">
+        <input type="hidden" name="name" value="{{ tag.name }}">
+
+        <div class="tags has-addons">
+            <a class="tag" href="/tag/{{ tag.identifier|urlencode }}">
+                {{ tag.name }}
+            </a>
             {% if tag.identifier in user_tags %}
-            <form name="tag" action="/untag/" method="post">
-                {% csrf_token %}
-                <input type="hidden" name="book" value="{{ book.id }}">
-                <input type="hidden" name="name" value="{{ tag.name }}">
-                <button type="submit">x<span class="is-sr-only"> remove tag</span></button>
-            </form>
+            <button class="tag is-delete" type="submit">
+                <span class="is-sr-only">remove tag</span>
+            </button>
             {% else %}
-            <form name="tag" action="/tag/" method="post">
-                {% csrf_token %}
-                <input type="hidden" name="book" value="{{ book.id }}">
-                <input type="hidden" name="name" value="{{ tag.name }}">
-                <button type="submit">+<span class="is-sr-only"> add tag</span></button>
-            </form>
+            <button class="tag" type="submit">+
+                <span class="is-sr-only">add tag</span>
+            </button>
             {% endif %}
         </div>
-    </div>
+    </form>
 </div>