diff --git a/bookwyrm/templates/snippets/create_status/content_warning_field.html b/bookwyrm/templates/snippets/create_status/content_warning_field.html
index 2a2161f71..2c34136ce 100644
--- a/bookwyrm/templates/snippets/create_status/content_warning_field.html
+++ b/bookwyrm/templates/snippets/create_status/content_warning_field.html
@@ -8,14 +8,14 @@
             <span>
                 {% trans "Include spoiler alert" %}
             </span>
-            <span class="details-close icon icon-plus" aria-hidden="true"></span>
+            <span class="details-close icon icon-x" aria-hidden="true"></span>
         </summary>
 
         <label
             class="label"
             for="id_content_warning_{{ uuid }}{{ local_uuid }}"
         >
-            {% trans "Content warning:" %}
+            {% trans "Spoilers/content warnings:" %}
         </label>
         <div class="control">
             <input
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 5dc8e8fa0..af15064fd 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -85,9 +85,7 @@ class CreateStatus(View):
         if hasattr(status, "quote"):
             status.raw_quote = status.quote
 
-        if not status.sensitive and status.content_warning:
-            # the cw text field remains populated when you click "remove"
-            status.content_warning = None
+        status.sensitive = status.content_warning not in [None, ""]
         status.save(broadcast=False)
 
         # inspect the text for user tags