diff --git a/src/olympia/amo/tests/__init__.py b/src/olympia/amo/tests/__init__.py
index 9fdc1fe61905..9532e614858b 100644
--- a/src/olympia/amo/tests/__init__.py
+++ b/src/olympia/amo/tests/__init__.py
@@ -989,13 +989,13 @@ def version_factory(file_kw=None, **kw):
     return ver
 
 
-def block_factory(*, version_ids=None, **kwargs):
+def block_factory(*, version_ids=None, soft=False, **kwargs):
     block = Block.objects.create(**kwargs)
     if version_ids is None and block.addon:
         version_ids = list(block.addon.versions.values_list('id', flat=True))
     if version_ids is not None:
         BlockVersion.objects.bulk_create(
-            BlockVersion(block=block, version_id=version_id)
+            BlockVersion(block=block, version_id=version_id, soft=soft)
             for version_id in version_ids
         )
     return block
diff --git a/src/olympia/blocklist/admin.py b/src/olympia/blocklist/admin.py
index 2abfeda4502c..60bf8bef0db1 100644
--- a/src/olympia/blocklist/admin.py
+++ b/src/olympia/blocklist/admin.py
@@ -148,6 +148,7 @@ class BlocklistSubmissionAdmin(AMOModelAdmin):
         'blocks_count',
         'action',
         'state',
+        'block_type',
         'delayed_until',
         'updated_by',
         'modified',
@@ -276,6 +277,7 @@ def get_fieldsets(self, request, obj):
             {
                 'fields': (
                     changed_version_ids_field,
+                    'block_type',
                     'disable_addon',
                     'update_url_value',
                     'url',
@@ -334,7 +336,7 @@ def get_readonly_fields(self, request, obj=None):
                     self.get_fieldsets(request, obj)
                 )
         if obj or not self.is_add_change_submission(request, obj):
-            ro_fields.append('delay_days')
+            ro_fields += ['block_type', 'delay_days']
 
         return ro_fields
 
@@ -407,7 +409,6 @@ def add_view(self, request, **kwargs):
             'errors': admin.helpers.AdminErrorList(form, []),
             'preserved_filters': self.get_preserved_filters(request),
             # extra context we use in our custom template
-            'is_delete': is_delete,
             'block_history': self.block_history(self.model(input_guids=guids_data)),
             'submission_published': False,
         }
diff --git a/src/olympia/blocklist/forms.py b/src/olympia/blocklist/forms.py
index 3e1072638f41..4bd1e1fd18bb 100644
--- a/src/olympia/blocklist/forms.py
+++ b/src/olympia/blocklist/forms.py
@@ -88,6 +88,7 @@ def get_context(self, name, value, attrs):
             },
             'blocks': self.blocks,
             'total_adu': sum(block.current_adu for block in self.blocks),
+            'is_add_change': self.is_add_change,
         }
 
 
@@ -192,6 +193,7 @@ def setup_changed_version_ids_field(self, field, data):
             self.changed_version_ids_choices = self.instance.changed_version_ids
         field.widget.choices = self.changed_version_ids_choices
         field.widget.blocks = self.blocks
+        field.widget.is_add_change = self.is_add_change
 
     def get_value(self, field_name, default):
         return (
diff --git a/src/olympia/blocklist/migrations/0036_blocklistsubmission_block_type_and_more.py b/src/olympia/blocklist/migrations/0036_blocklistsubmission_block_type_and_more.py
new file mode 100644
index 000000000000..ac9b76557876
--- /dev/null
+++ b/src/olympia/blocklist/migrations/0036_blocklistsubmission_block_type_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.16 on 2024-10-29 17:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blocklist', '0035_alter_blockversion_soft'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='blocklistsubmission',
+            name='block_type',
+            field=models.IntegerField(choices=[(0, '🛑 Hard-Block'), (1, '⚠️ Soft-Block')], default=0),
+        ),
+        migrations.AlterField(
+            model_name='blockversion',
+            name='soft',
+            field=models.BooleanField(choices=[(0, '🛑 Hard-Blocked'), (1, '⚠️ Soft-Blocked')], default=False),
+        ),
+    ]
diff --git a/src/olympia/blocklist/models.py b/src/olympia/blocklist/models.py
index 28f5e34e1517..e41a6be89735 100644
--- a/src/olympia/blocklist/models.py
+++ b/src/olympia/blocklist/models.py
@@ -159,8 +159,8 @@ def get_blocks_from_guids(cls, guids):
 
 class BlockVersion(ModelBase):
     BLOCK_TYPE_CHOICES = Choices(
-        ('BLOCKED', 0, 'Blocked'),
-        ('SOFT_BLOCKED', 1, 'Soft-Blocked'),
+        ('BLOCKED', 0, '🛑 Hard-Blocked'),
+        ('SOFT_BLOCKED', 1, '⚠️ Soft-Blocked'),
     )
     version = models.OneToOneField(Version, on_delete=models.CASCADE)
     block = models.ForeignKey(Block, on_delete=models.CASCADE)
@@ -216,6 +216,18 @@ class BlocklistSubmission(ModelBase):
         ACTION_ADDCHANGE: 'Add/Change',
         ACTION_DELETE: 'Delete',
     }
+    BLOCK_TYPE_CHOICES = Choices(
+        (
+            BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED.constant,
+            BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED.value,
+            '🛑 Hard-Block',
+        ),
+        (
+            BlockVersion.BLOCK_TYPE_CHOICES.SOFT_BLOCKED.constant,
+            BlockVersion.BLOCK_TYPE_CHOICES.SOFT_BLOCKED.value,
+            '⚠️ Soft-Block',
+        ),
+    )
     FakeBlockAddonVersion = namedtuple(
         'FakeBlockAddonVersion',
         (
@@ -236,7 +248,6 @@ class BlocklistSubmission(ModelBase):
     )
 
     action = models.SmallIntegerField(choices=ACTIONS.items(), default=ACTION_ADDCHANGE)
-
     input_guids = models.TextField()
     changed_version_ids = models.JSONField(default=list)
     to_block = models.JSONField(default=list)
@@ -265,6 +276,10 @@ class BlocklistSubmission(ModelBase):
         help_text='The submission will not be published into blocks before this time.',
     )
     disable_addon = models.BooleanField(default=True)
+    block_type = models.IntegerField(
+        default=BLOCK_TYPE_CHOICES.BLOCKED,
+        choices=BLOCK_TYPE_CHOICES,
+    )
 
     objects = BlocklistSubmissionManager()
 
diff --git a/src/olympia/blocklist/templates/admin/blocklist/blocklistsubmission_add_form.html b/src/olympia/blocklist/templates/admin/blocklist/blocklistsubmission_add_form.html
index 5180e6bf77b4..b60b5b9f9209 100644
--- a/src/olympia/blocklist/templates/admin/blocklist/blocklistsubmission_add_form.html
+++ b/src/olympia/blocklist/templates/admin/blocklist/blocklistsubmission_add_form.html
@@ -71,6 +71,12 @@ <h2>{{ fieldsets.2.0 }}</h2>
       {{ adminform.form.non_field_errors }}
     </div>
     {% endif %}
+    <div class="form-row field-block_type">
+      {{ adminform.form.block_type.errors }}
+      {{ adminform.form.block_type.label_tag }}
+      {{ adminform.form.block_type }}
+      <p class="help">{{ adminform.form.block_type.help_text }}</p>
+    </div>
     <div class="form-row">
       {{ adminform.form.disable_addon.errors }}
       {{ adminform.form.disable_addon.label_tag }}
diff --git a/src/olympia/blocklist/templates/admin/blocklist/includes/logs.html b/src/olympia/blocklist/templates/admin/blocklist/includes/logs.html
index f2f7a5c6dac3..2e7b3fbdadd6 100644
--- a/src/olympia/blocklist/templates/admin/blocklist/includes/logs.html
+++ b/src/olympia/blocklist/templates/admin/blocklist/includes/logs.html
@@ -10,9 +10,9 @@
         {% if log.details %}{{ log.details.guid }}{% else %}{{ log.arguments.1 }}{% endif %}{% if 'min_version' in log.details %}
             , versions {{ log.details.min_version }} - {{ log.details.max_version }}.
         {% elif 'added_versions' in log.details %}
-        , versions added [{{ log.details.added_versions|join:', ' }}].
+        , versions {% if log.details.soft %}soft-{% else %}hard-{% endif %}blocked [{{ log.details.added_versions|join:', ' }}].
         {% elif 'removed_versions' in log.details %}
-        , versions removed [{{ log.details.removed_versions|join:', ' }}].
+        , versions unblocked [{{ log.details.removed_versions|join:', ' }}].
         {% else %}.
         {% endif %}
         <ul>
diff --git a/src/olympia/blocklist/templates/admin/blocklist/widgets/blocks.html b/src/olympia/blocklist/templates/admin/blocklist/widgets/blocks.html
index 4ab9eeda84f9..6ab5e8a4567c 100644
--- a/src/olympia/blocklist/templates/admin/blocklist/widgets/blocks.html
+++ b/src/olympia/blocklist/templates/admin/blocklist/widgets/blocks.html
@@ -29,11 +29,10 @@ <h3>{{ blocks|length|intcomma }} Add-on GUIDs with {{ total_adu|intcomma }} user
               name="changed_version_ids"
               value="{{ version.id }}"
               {% if version.id in widget.value %}checked{% endif %}
-            > {% if is_delete %}Unblock{% else %}Block{% endif %} {{ version.version }}</label>
+            > {% if is_add_change %}Block{% else %}Unblock{% endif %} {{ version.version }} {% if version.blockversion %}({{ version.blockversion.get_soft_display }}){% endif %}</label>
           {% else %}
-            <span title="{% if version.is_blocked %}Blocked{% else %}Not blocked{% endif %}">
-              <!-- Red Hexagonal stop sign for Blocked; Green cirle for not blocked -->
-              {% if version.is_blocked %}&#x1F6D1;{% else %}&#x1F7E2;{% endif %}{{ version.version }}
+            <span>
+              {{ version.version }} ({% if version.is_blocked %}{{ version.blockversion.get_soft_display }}{% else %}&#x1F7E2; Not Blocked{% endif %})
               {% if version.blocklist_submission_id %}
                 [<a href="{% url 'admin:blocklist_blocklistsubmission_change' version.blocklist_submission_id %}">Edit Submission</a>]
               {% endif %}
diff --git a/src/olympia/blocklist/tests/test_admin.py b/src/olympia/blocklist/tests/test_admin.py
index a1e4d4353850..18b1e4c20c96 100644
--- a/src/olympia/blocklist/tests/test_admin.py
+++ b/src/olympia/blocklist/tests/test_admin.py
@@ -26,7 +26,7 @@
 )
 from olympia.reviewers.models import NeedsHumanReview
 
-from ..models import Block, BlocklistSubmission
+from ..models import Block, BlocklistSubmission, BlockVersion
 
 
 FANCY_QUOTE_OPEN = '“'
@@ -197,22 +197,17 @@ def test_view_versions(self):
             reverse('admin:blocklist_block_change', args=(block.id,)),
         )
         assert response.status_code == 200
-        doc = pq(response.content)
+        doc = pq(response.content.decode('utf-8'))
         assert doc('.field-blocked_versions').text() == (
-            'Blocked versions:\n2.0 (Blocked), 3.0 (Soft-Blocked)'
+            'Blocked versions:\n2.0 (🛑 Hard-Blocked), 3.0 (⚠️ Soft-Blocked)'
         )
 
 
-def check_checkbox(checkbox, version, is_checked, is_disabled):
+def check_checkbox(checkbox, version):
     assert checkbox.attrib['value'] == str(version.id)
-    if not is_disabled:
-        assert checkbox.value == str(version.id)
-    assert checkbox.checked is is_checked
-    assert (
-        'disabled' in checkbox.attrib
-        if is_disabled
-        else 'disabled' not in checkbox.attrib
-    ), checkbox.attrib
+    assert checkbox.value == str(version.id)
+    assert checkbox.checked
+    assert 'disabled' not in checkbox.attrib
 
 
 class TestBlocklistSubmissionAdmin(TestCase):
@@ -302,32 +297,35 @@ def test_version_checkboxes(self):
         ver = addon.current_version
         ver_deleted = version_factory(addon=addon, channel=amo.CHANNEL_UNLISTED)
         ver_deleted.delete()  # shouldn't affect it's status
-        # these next two versions shouldn't be possible choices
+        # these next three versions shouldn't be possible choices
         ver_add_subm = version_factory(addon=addon)
         add_submission = BlocklistSubmission.objects.create(
             input_guids=addon.guid, changed_version_ids=[ver_add_subm.id]
         )
         ver_other = addon_factory(average_daily_users=99).current_version
         ver_block = version_factory(addon=ver_other.addon)
-        block_factory(addon=addon, version_ids=[ver_block.id], updated_by=user)
+        ver_soft_block = version_factory(addon=ver_other.addon)
+        block_factory(
+            addon=addon, version_ids=[ver_block.id, ver_soft_block.id], updated_by=user
+        )
+        ver_soft_block.blockversion.update(soft=True)
+
         response = self.client.get(
             self.submission_url,
             {'guids': f'{addon.guid}\n {ver_block.addon.guid}\n'},
         )
-        doc = pq(response.content)
+        doc = pq(response.content.decode('utf-8'))
         checkboxes = doc('input[name=changed_version_ids]')
 
         assert len(checkboxes) == 3
-        check_checkbox(checkboxes[0], ver, True, False)
-        check_checkbox(checkboxes[1], ver_deleted, True, False)
-        check_checkbox(checkboxes[2], ver_other, True, False)
+        check_checkbox(checkboxes[0], ver)
+        check_checkbox(checkboxes[1], ver_deleted)
+        check_checkbox(checkboxes[2], ver_other)
 
-        # not a checkbox because in a submission, green circle because not blocked
+        # not a checkbox because in a submission, green circle because not
+        # blocked yet technically.
         assert doc(f'li[data-version-id="{ver_add_subm.id}"]').text() == (
-            f'\U0001f7e2{ver_add_subm.version} [Edit Submission]'
-        )
-        assert doc(f'li[data-version-id="{ver_add_subm.id}"] span').attr('title') == (
-            'Not blocked'
+            f'{ver_add_subm.version} (🟢 Not Blocked) [Edit Submission]'
         )
         submission_link = doc(f'li[data-version-id="{ver_add_subm.id}"] a')
         assert submission_link.text() == 'Edit Submission'
@@ -338,10 +336,12 @@ def test_version_checkboxes(self):
 
         # not a checkbox because blocked already and this is an add action
         assert doc(f'li[data-version-id="{ver_block.id}"]').text() == (
-            f'\U0001f6d1{ver_block.version}'
+            f'{ver_block.version} (🛑 Hard-Blocked)'
         )
-        assert doc(f'li[data-version-id="{ver_block.id}"] span').attr('title') == (
-            'Blocked'
+
+        # not a checkbox because (soft-)blocked already and this is an add action
+        assert doc(f'li[data-version-id="{ver_soft_block.id}"]').text() == (
+            f'{ver_soft_block.version} (⚠️ Soft-Blocked)'
         )
 
         # Now with an existing submission
@@ -357,8 +357,8 @@ def test_version_checkboxes(self):
         doc = pq(response.content)
         checkboxes = doc('input[name=changed_version_ids]')
         assert len(checkboxes) == 2
-        check_checkbox(checkboxes[0], ver_deleted, True, False)
-        check_checkbox(checkboxes[1], ver_other, True, False)
+        check_checkbox(checkboxes[0], ver_deleted)
+        check_checkbox(checkboxes[1], ver_other)
 
     def test_add_single(self):
         user = user_factory(email='someone@mozilla.com')
@@ -420,6 +420,7 @@ def test_add_single(self):
             {
                 'input_guids': 'guid@',
                 'action': str(BlocklistSubmission.ACTION_ADDCHANGE),
+                'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
                 'changed_version_ids': changed_version_ids,
                 'url': 'dfd',
                 'reason': 'some reason',
@@ -447,6 +448,7 @@ def test_add_single(self):
         assert block_log.details['blocked_versions'] == changed_version_strs
         assert block_log.details['added_versions'] == changed_version_strs
         assert block_log.details['reason'] == 'some reason'
+        assert not block_log.details['soft']
         assert block_log == (
             ActivityLog.objects.for_block(block).filter(action=block_log.action).get()
         )
@@ -490,7 +492,7 @@ def test_add_single(self):
         todaysdate = datetime.now().date()
         assert f'<a href="dfd">{todaysdate}</a>' in content
         assert f'Block added by {user.name}:\n        guid@' in content
-        assert f'versions added [{", ".join(changed_version_strs)}].' in content
+        assert f'versions hard-blocked [{", ".join(changed_version_strs)}].' in content
 
         addon.reload()
         first_version.file.reload()
@@ -584,6 +586,7 @@ def _test_add_multiple_submit(self, addon_adu, delay=0):
             {
                 'input_guids': ('any@new\npartial@existing\nfull@existing\ninvalid@'),
                 'action': str(BlocklistSubmission.ACTION_ADDCHANGE),
+                'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
                 'changed_version_ids': [
                     new_addon.current_version.id,
                     partial_addon.current_version.id,
@@ -805,6 +808,7 @@ def test_submit_dual_signoff(self):
         # and existing block wasn't updated
 
         multi = BlocklistSubmission.objects.get()
+        assert multi.block_type == BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED
         multi.update(
             signoff_state=BlocklistSubmission.SIGNOFF_APPROVED,
             signoff_by=user_factory(),
@@ -854,6 +858,7 @@ def test_submit_no_metadata_updates(self):
             {
                 'input_guids': ('any@new\npartial@existing\nfull@existing\ninvalid@'),
                 'action': str(BlocklistSubmission.ACTION_ADDCHANGE),
+                'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
                 'changed_version_ids': [
                     new_addon.current_version.id,
                     partial_addon.current_version.id,
@@ -1020,6 +1025,7 @@ def test_can_not_add_without_create_permission(self):
             {
                 'input_guids': 'guid@\nfoo@baa\ninvalid@',
                 'action': str(BlocklistSubmission.ACTION_ADDCHANGE),
+                'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
                 'url': 'dfd',
                 'reason': 'some reason',
                 'update_url_value': True,
@@ -1133,7 +1139,10 @@ def test_edit_with_blocklist_create(self):
         response = self.client.get(multi_url, follow=True)
         assert response.status_code == 200
         assert b'guid@<br>invalid@<br>second@invalid' in response.content
-        doc = pq(response.content)
+        doc = pq(response.content.decode('utf-8'))
+        # Can't change block type when approving
+        assert not doc('.field_block_type select')
+        assert doc('.field-block_type .readonly').text() == '🛑 Hard-Block'
         buttons = doc('.submit-row input')
         assert buttons[0].attrib['value'] == 'Update'
         assert len(buttons) == 1
@@ -1738,6 +1747,7 @@ def test_blocked_deleted_keeps_addon_status(self):
             {
                 'input_guids': 'guid@',
                 'action': str(BlocklistSubmission.ACTION_ADDCHANGE),
+                'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
                 'changed_version_ids': [version.id],
                 'disable_addon': True,
                 'url': 'dfd',
@@ -1785,6 +1795,7 @@ def test_blocking_addon_guid_already_denied(self):
             {
                 'input_guids': 'guid@',
                 'action': str(BlocklistSubmission.ACTION_ADDCHANGE),
+                'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
                 'changed_version_ids': [version.id],
                 'url': 'dfd',
                 'reason': 'some reason',
@@ -2024,6 +2035,7 @@ def test_not_disable_addon(self):
             name='Partial Danger',
             average_daily_users=(partial_addon_adu),
         )
+        already_blocked_version = partial_addon.current_version
         block_factory(
             guid=partial_addon.guid,
             # should be updated to addon's adu
@@ -2038,6 +2050,7 @@ def test_not_disable_addon(self):
             {
                 'input_guids': ('any@new\npartial@existing\nfull@existing\ninvalid@'),
                 'action': str(BlocklistSubmission.ACTION_ADDCHANGE),
+                'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
                 'changed_version_ids': [
                     new_addon.current_version.id,
                     partial_addon.current_version.id,
@@ -2068,6 +2081,87 @@ def test_not_disable_addon(self):
         assert partial_addon.status != amo.STATUS_DISABLED
         assert partial_addon_version.file.status == (amo.STATUS_DISABLED)
 
+        assert not new_addon_version.blockversion.soft
+        assert not partial_addon_version.blockversion.soft
+        assert not already_blocked_version.blockversion.soft
+
+    def test_soft_block(self):
+        user = user_factory(email='someone@mozilla.com')
+        self.grant_permission(user, 'Blocklist:Create')
+        self.client.force_login(user)
+
+        new_addon_adu = settings.DUAL_SIGNOFF_AVERAGE_DAILY_USERS_THRESHOLD - 1
+        new_addon = addon_factory(
+            guid='any@new', name='New Danger', average_daily_users=new_addon_adu
+        )
+        partial_addon_adu = new_addon_adu - 1
+        partial_addon = addon_factory(
+            guid='partial@existing',
+            name='Partial Danger',
+            average_daily_users=(partial_addon_adu),
+        )
+        existing_block = block_factory(
+            guid=partial_addon.guid,
+            # should be updated to addon's adu
+            average_daily_users_snapshot=146722437,
+            updated_by=user_factory(),
+        )
+        already_blocked_version = partial_addon.current_version
+        new_partial_version = version_factory(addon=partial_addon)
+        assert Block.objects.count() == 1
+        # Create the block submission
+        response = self.client.post(
+            self.submission_url,
+            {
+                'input_guids': ('any@new\npartial@existing\nfull@existing\ninvalid@'),
+                'action': str(BlocklistSubmission.ACTION_ADDCHANGE),
+                'block_type': BlockVersion.BLOCK_TYPE_CHOICES.SOFT_BLOCKED,
+                'changed_version_ids': [
+                    new_addon.current_version.id,
+                    new_partial_version.id,
+                ],
+                'url': 'dfd',
+                'reason': 'some reason',
+                'update_url_value': True,
+                'update_reason_field': True,
+                'delay_days': 0,
+                '_save': 'Save',
+            },
+            follow=True,
+        )
+        assert response.status_code == 200
+
+        assert Block.objects.count() == 2
+        assert BlocklistSubmission.objects.count() == 1
+        assert (
+            BlocklistSubmission.objects.get().block_type
+            == BlockVersion.BLOCK_TYPE_CHOICES.SOFT_BLOCKED
+        )
+
+        assert new_addon.current_version.blockversion.soft
+        assert new_partial_version.blockversion.soft
+        assert not already_blocked_version.blockversion.soft
+
+        todaysdate = datetime.now().date()
+        response = self.client.get(
+            reverse('admin:blocklist_block_change', args=(existing_block.pk,))
+        )
+        content = response.content.decode('utf-8')
+        assert f'<a href="dfd">{todaysdate}</a>' in content
+        assert f'Block edited by {user.name}:\n        {existing_block.guid}' in content
+        assert f'versions soft-blocked [{new_partial_version.version}].' in content
+
+        new_block = Block.objects.latest('pk')
+        response = self.client.get(
+            reverse('admin:blocklist_block_change', args=(new_block.pk,))
+        )
+        content = response.content.decode('utf-8')
+        assert f'<a href="dfd">{todaysdate}</a>' in content
+        assert f'Block added by {user.name}:\n        {new_block.guid}' in content
+        assert (
+            f'versions soft-blocked [{new_addon.current_version.version}].' in content
+        )
+
 
 class TestBlockAdminDelete(TestCase):
     def setUp(self):
@@ -2272,11 +2366,13 @@ def test_version_checkboxes(self):
         ver_deleted = version_factory(addon=other_addon)
         ver_deleted.delete()  # shouldn't affect it's status
         ver_block = version_factory(addon=other_addon)
+        ver_soft_block = version_factory(addon=other_addon)
         block_factory(
             addon=addon,
             updated_by=user,
-            version_ids=[ver_del_subm.id, ver_block.id],
+            version_ids=[ver_del_subm.id, ver_block.id, ver_soft_block.id],
         )
+        ver_soft_block.blockversion.update(soft=True)
         response = self.client.get(
             self.submission_url,
             {
@@ -2284,36 +2380,45 @@ def test_version_checkboxes(self):
                 'action': BlocklistSubmission.ACTION_DELETE,
             },
         )
-        doc = pq(response.content)
+        doc = pq(response.content.decode('utf-8'))
         checkboxes = doc('input[name=changed_version_ids]')
 
-        assert len(checkboxes) == 1
+        assert len(checkboxes) == 2
 
-        check_checkbox(checkboxes[0], ver_block, True, False)
+        check_checkbox(checkboxes[0], ver_block)
+        assert (
+            checkboxes[0].getparent().text_content().strip()
+            == f'Unblock {ver_block.version} (🛑 Hard-Blocked)'
+        )
+        check_checkbox(checkboxes[1], ver_soft_block)
+        assert (
+            checkboxes[1].getparent().text_content().strip()
+            == f'Unblock {ver_soft_block.version} (⚠️ Soft-Blocked)'
+        )
 
         # not a checkbox because in a submission, green circle because not blocked
         assert doc(f'li[data-version-id="{ver_add_subm.id}"]').text() == (
-            f'\U0001f7e2{ver_add_subm.version} [Edit Submission]'
-        )
-        assert doc(f'li[data-version-id="{ver_add_subm.id}"] span').attr('title') == (
-            'Not blocked'
+            f'{ver_add_subm.version} (🟢 Not Blocked) [Edit Submission]'
         )
-        # not a checkbox because in a submission, red hexagon because not blocked
+        # not a checkbox because in a submission, red hexagon because hard blocked
         assert doc(f'li[data-version-id="{ver_del_subm.id}"]').text() == (
-            f'\U0001f6d1{ver_del_subm.version} [Edit Submission]'
-        )
-        assert doc(f'li[data-version-id="{ver_del_subm.id}"] span').attr('title') == (
-            'Blocked'
+            f'{ver_del_subm.version} (🛑 Hard-Blocked) [Edit Submission]'
         )
         # not a checkbox because not blocked, and this is a delete action
         assert doc(f'li[data-version-id="{ver.id}"]').text() == (
-            f'\U0001f7e2{ver.version}'
+            f'{ver.version} (🟢 Not Blocked)'
         )
         # not a checkbox because not blocked, and this is a delete action
         assert doc(f'li[data-version-id="{ver_deleted.id}"]').text() == (
-            f'\U0001f7e2{ver_deleted.version}'
+            f'{ver_deleted.version} (🟢 Not Blocked)'
         )
 
+        # block_type isn't shown because on a deletion action, it doesn't make
+        # sense, it's per-version, and we have verified that we are displaying
+        # whether versions are soft or hard blocked in the checkboxes above.
+        assert doc('.field-block_type').text() == ''
+        assert not doc('.field-block_type select')
+
         submission_link = doc(f'li[data-version-id="{ver_add_subm.id}"] a')
         assert submission_link.text() == 'Edit Submission'
         assert submission_link.attr['href'] == reverse(
diff --git a/src/olympia/blocklist/tests/test_forms.py b/src/olympia/blocklist/tests/test_forms.py
index f953681a57d0..3caeeb63f425 100644
--- a/src/olympia/blocklist/tests/test_forms.py
+++ b/src/olympia/blocklist/tests/test_forms.py
@@ -65,6 +65,7 @@ def test_changed_version_ids_choices_add_action(self):
             f'{self.existing_block_full.guid}\n'
             f'{self.existing_block_partial.guid}\n'
             'invalid@guid',
+            'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
         }
         Form = self.get_form()
         form = Form(data=data)
@@ -118,6 +119,7 @@ def test_changed_version_ids_choices_delete_action(self):
             f'{self.existing_block_full.guid}\n'
             f'{self.existing_block_partial.guid}\n'
             'invalid@guid',
+            'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
         }
         form = Form(data=data)
         assert form.fields['changed_version_ids'].choices == [
@@ -210,6 +212,7 @@ def test_changed_version_ids_widget(self):
             f'{self.existing_block_full.guid}\n'
             f'{self.existing_block_partial.guid}\n'
             'invalid@guid',
+            'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
             'changed_version_ids': [self.new_addon.current_version.id],
         }
         form = self.get_form()(data=data)
@@ -221,6 +224,7 @@ def test_changed_version_ids_widget(self):
             v_id for _guid, opts in field.choices for (v_id, _text) in opts
         ]
         assert field.widget.get_context(name, value, attrs) == {
+            'is_add_change': True,
             'widget': {
                 'attrs': {'multiple': True, **attrs},
                 'choices': flattened_choices,
@@ -296,6 +300,7 @@ def test_new_blocks_must_have_changed_versions(self):
             f'{self.existing_block_full.guid}\n'
             f'{self.existing_block_partial.guid}\n'
             'invalid@guid',
+            'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
             # only one version selected
             'changed_version_ids': [self.partial_existing_addon_v_notblocked.id],
         }
@@ -338,6 +343,7 @@ def test_duplicate_version_strings_must_all_be_changed(self):
             'input_guids': f'{self.new_addon.guid}\n'
             f'{self.existing_block_full.guid}\n'
             f'{self.existing_block_partial.guid}',
+            'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
             'changed_version_ids': [
                 self.new_addon.current_version.id,
             ],
@@ -370,6 +376,7 @@ def test_clean(self):
             f'{self.existing_block_full.guid}\n'
             f'{self.existing_block_partial.guid}\n'
             'invalid@guid',
+            'block_type': BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,
             'url': 'new url',
             'update_url_value': False,
             'reason': 'new reason',
diff --git a/src/olympia/blocklist/tests/test_models.py b/src/olympia/blocklist/tests/test_models.py
index 67cb44c36546..e1fdf03de95f 100644
--- a/src/olympia/blocklist/tests/test_models.py
+++ b/src/olympia/blocklist/tests/test_models.py
@@ -26,7 +26,8 @@ def test_str(self):
             block=self.block, version=self.version, soft=False
         )
         assert str(hard_block_version) == (
-            f'Block.id={self.block.id} ' f'(Blocked) -> Version.id={self.version.id}'
+            f'Block.id={self.block.id} '
+            f'(🛑 Hard-Blocked) -> Version.id={self.version.id}'
         )
 
         soft_block_version = BlockVersion.objects.create(
@@ -34,7 +35,7 @@ def test_str(self):
         )
         assert str(soft_block_version.reload()) == (
             f'Block.id={self.block.id} '
-            f'(Soft-Blocked) -> Version.id={self.version_2.id}'
+            f'(⚠️ Soft-Blocked) -> Version.id={self.version_2.id}'
         )
 
 
diff --git a/src/olympia/blocklist/tests/test_utils.py b/src/olympia/blocklist/tests/test_utils.py
index c7b2a40d0785..04e40a10a539 100644
--- a/src/olympia/blocklist/tests/test_utils.py
+++ b/src/olympia/blocklist/tests/test_utils.py
@@ -8,9 +8,9 @@
 
 from olympia import amo
 from olympia.activity.models import ActivityLog
-from olympia.amo.tests import TestCase, addon_factory, user_factory
+from olympia.amo.tests import TestCase, addon_factory, block_factory, user_factory
 
-from ..models import Block, BlocklistSubmission
+from ..models import Block, BlocklistSubmission, BlockVersion
 from ..utils import datetime_to_ts, save_versions_to_blocks
 
 
@@ -57,6 +57,7 @@ def test_log_entries_new_block(self):
             updated_by=user_new,
             disable_addon=True,
             changed_version_ids=[addon.current_version.pk],
+            signoff_state=BlocklistSubmission.SIGNOFF_PUBLISHED,
         )
         ActivityLog.objects.all().delete()
 
@@ -79,6 +80,82 @@ def test_log_entries_new_block(self):
         assert activity.details['is_addon_being_blocked']
         assert activity.details['is_addon_being_disabled']
 
+        activity = ActivityLog.objects.get(action=amo.LOG.BLOCKLIST_BLOCK_ADDED.id)
+        assert activity.user == user_new
+        assert activity.details == {
+            'added_versions': [
+                f'{addon.current_version.version}',
+            ],
+            'blocked_versions': [
+                f'{addon.current_version.version}',
+            ],
+            'comments': '1 versions added to block; 1 total versions now blocked.',
+            'guid': f'{addon.guid}',
+            'reason': 'some reason',
+            'signoff_state': 'Published',
+            'soft': False,
+            'url': '',
+        }
+
+        activity = ActivityLog.objects.get(action=amo.LOG.BLOCKLIST_VERSION_BLOCKED.id)
+        assert activity.user == user_new
+        assert not activity.details['soft']
+
+    def test_log_soft_block(self):
+        user_new = user_factory()
+        addon = addon_factory()
+        submission = BlocklistSubmission.objects.create(
+            input_guids=addon.guid,
+            reason='some reason',
+            url=None,
+            updated_by=user_new,
+            disable_addon=True,
+            block_type=BlockVersion.BLOCK_TYPE_CHOICES.SOFT_BLOCKED,
+            changed_version_ids=[addon.current_version.pk],
+            signoff_state=BlocklistSubmission.SIGNOFF_PUBLISHED,
+        )
+        ActivityLog.objects.all().delete()
+
+        save_versions_to_blocks([addon.guid], submission)
+
+        assert ActivityLog.objects.count() == 4
+        assert list(
+            ActivityLog.objects.order_by('pk').values_list('action', flat=True)
+        ) == [
+            amo.LOG.BLOCKLIST_BLOCK_ADDED.id,
+            amo.LOG.BLOCKLIST_VERSION_BLOCKED.id,
+            amo.LOG.CHANGE_STATUS.id,
+            amo.LOG.REJECT_VERSION.id,
+        ]
+
+        activity = ActivityLog.objects.latest('pk')
+        assert activity.action == amo.LOG.REJECT_VERSION.id
+        assert activity.user == self.task_user
+        assert activity.details['comments'] == 'some reason'
+        assert activity.details['is_addon_being_blocked']
+        assert activity.details['is_addon_being_disabled']
+
+        activity = ActivityLog.objects.get(action=amo.LOG.BLOCKLIST_BLOCK_ADDED.id)
+        assert activity.user == user_new
+        assert activity.details == {
+            'added_versions': [
+                f'{addon.current_version.version}',
+            ],
+            'blocked_versions': [
+                f'{addon.current_version.version}',
+            ],
+            'comments': '1 versions added to block; 1 total versions now blocked.',
+            'guid': f'{addon.guid}',
+            'reason': 'some reason',
+            'signoff_state': 'Published',
+            'soft': True,
+            'url': '',
+        }
+
+        activity = ActivityLog.objects.get(action=amo.LOG.BLOCKLIST_VERSION_BLOCKED.id)
+        assert activity.user == user_new
+        assert activity.details['soft']
+
     def test_no_empty_new_blocks(self):
         user_new = user_factory()
         addon = addon_factory()
@@ -92,3 +169,37 @@ def test_no_empty_new_blocks(self):
         save_versions_to_blocks([addon.guid], submission)
 
         assert not Block.objects.exists()
+
+    def test_save_blocks_override_existing_block_type_soft_to_hard(self):
+        user_new = user_factory()
+        addon = addon_factory()
+        block_factory(guid=addon.guid, updated_by=self.task_user, soft=True)
+        assert addon.current_version.blockversion.soft
+        submission = BlocklistSubmission.objects.create(
+            input_guids=addon.guid,
+            reason='some reason',
+            url=None,
+            updated_by=user_new,
+            block_type=BlockVersion.BLOCK_TYPE_CHOICES.BLOCKED,  # Hard-block override.
+            changed_version_ids=[addon.current_version.pk],
+            signoff_state=BlocklistSubmission.SIGNOFF_PUBLISHED,
+        )
+        save_versions_to_blocks([addon.guid], submission)
+        assert not addon.current_version.blockversion.reload().soft
+
+    def test_save_blocks_override_existing_block_type_hard_to_soft(self):
+        user_new = user_factory()
+        addon = addon_factory()
+        block_factory(guid=addon.guid, updated_by=self.task_user)
+        assert not addon.current_version.blockversion.soft
+        submission = BlocklistSubmission.objects.create(
+            input_guids=addon.guid,
+            reason='some reason',
+            url=None,
+            updated_by=user_new,
+            block_type=BlockVersion.BLOCK_TYPE_CHOICES.SOFT_BLOCKED,
+            changed_version_ids=[addon.current_version.pk],
+            signoff_state=BlocklistSubmission.SIGNOFF_PUBLISHED,
+        )
+        save_versions_to_blocks([addon.guid], submission)
+        assert addon.current_version.blockversion.reload().soft
diff --git a/src/olympia/blocklist/utils.py b/src/olympia/blocklist/utils.py
index 6ef97744cd01..896e5274f1e5 100644
--- a/src/olympia/blocklist/utils.py
+++ b/src/olympia/blocklist/utils.py
@@ -15,6 +15,8 @@ def block_activity_log_save(
     change,
     submission_obj=None,
 ):
+    from .models import BlockVersion
+
     action = amo.LOG.BLOCKLIST_BLOCK_EDITED if change else amo.LOG.BLOCKLIST_BLOCK_ADDED
     addon_versions = {ver.id: ver.version for ver in obj.addon_versions}
     blocked_versions = sorted(
@@ -36,18 +38,23 @@ def block_activity_log_save(
         'comments': f'{len(changed_versions)} versions added to block; '
         f'{len(blocked_versions)} total versions now blocked.',
     }
+    version_details = {}
     if submission_obj:
         details['signoff_state'] = submission_obj.SIGNOFF_STATES.get(
             submission_obj.signoff_state
         )
         if submission_obj.signoff_by:
             details['signoff_by'] = submission_obj.signoff_by.id
+        details['soft'] = version_details['soft'] = (
+            submission_obj.block_type == BlockVersion.BLOCK_TYPE_CHOICES.SOFT_BLOCKED
+        )
 
     log_create(action, obj.addon, obj.guid, obj, details=details, user=obj.updated_by)
     log_create(
         amo.LOG.BLOCKLIST_VERSION_BLOCKED,
         *((Version, version_id) for version_id in changed_version_ids),
         obj,
+        **{'details': version_details} if version_details else {},
         user=obj.updated_by,
     )
 
@@ -194,19 +201,27 @@ def save_versions_to_blocks(guids, submission):
         block.average_daily_users_snapshot = block.current_adu
         # And now update the BlockVersion instances - instances to add first
         block_versions_to_create = []
+        block_versions_to_update = []
+        is_soft = submission.block_type == BlockVersion.BLOCK_TYPE_CHOICES.SOFT_BLOCKED
         for version in block.addon_versions:
-            if version.id in submission.changed_version_ids and (
-                not change or not version.is_blocked
-            ):
-                block_version = BlockVersion(block=block, version=version)
-                block_versions_to_create.append(block_version)
-                version.blockversion = block_version
+            if version.id in submission.changed_version_ids:
+                if version.is_blocked:
+                    block_version = version.blockversion
+                    block_versions_to_update.append(block_version)
+                else:
+                    block_version = BlockVersion(block=block, version=version)
+                    block_versions_to_create.append(block_version)
+                    version.blockversion = block_version
+                block_version.soft = is_soft
         if not block_versions_to_create and not change:
             # If we have no versions to block and it's a new Block don't do anything.
             # Note: we shouldn't have gotten this far with such a guid - it would have
             # been raised as a validation error in the form.
             continue
         block.save()
+        # Update existing BlockVersion in bulk - the only field to update is 'soft'.
+        BlockVersion.objects.bulk_update(block_versions_to_update, fields=['soft'])
+        # Add new BlockVersion in bulk.
         BlockVersion.objects.bulk_create(block_versions_to_create)
 
         if submission.id:
diff --git a/static/css/admin/blocklist_blocklistsubmission.css b/static/css/admin/blocklist_blocklistsubmission.css
index e01c8a399f65..532800cf950b 100644
--- a/static/css/admin/blocklist_blocklistsubmission.css
+++ b/static/css/admin/blocklist_blocklistsubmission.css
@@ -7,8 +7,8 @@ div.horizontal-grid {
 form ul.guid_list {
     margin: 0;
     border: solid 1px black;
-    max-height: 8em;
-    min-height: 8em;
+    max-height: 12em;
+    min-height: 12em;
     overflow:hidden; overflow-y:scroll;
     padding: 5px 20px;
 }