diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs
index 3304330aca..cd4e2edaec 100644
--- a/Content.Server/Forensics/Systems/ForensicsSystem.cs
+++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs
@@ -13,6 +13,7 @@ using Content.Shared.Inventory;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Random;
 using Content.Shared.Verbs;
+using Robust.Shared.Utility;
 
 namespace Content.Server.Forensics
 {
@@ -125,7 +126,7 @@ namespace Content.Server.Forensics
             var verb = new UtilityVerb()
             {
                 Act = () => TryStartCleaning(entity, user, target),
-                IconEntity = GetNetEntity(entity),
+                Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/bubbles.svg.192dpi.png")),
                 Text = Loc.GetString(Loc.GetString("forensics-verb-text")),
                 Message = Loc.GetString(Loc.GetString("forensics-verb-message")),
                 // This is important because if its true using the cleaning device will count as touching the object.
diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index d7b83d4439..e6c627f353 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -116,10 +116,12 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem
     /// </summary>
     public void ConsumeEntity(EntityUid hungry, EntityUid morsel, EventHorizonComponent eventHorizon, BaseContainer? outerContainer = null)
     {
-        if (!EntityManager.IsQueuedForDeletion(morsel) // I saw it log twice a few times for some reason?
-        && (HasComp<MindContainerComponent>(morsel)
+        if (EntityManager.IsQueuedForDeletion(morsel)) // already handled, and we're substepping
+            return;
+
+        if (HasComp<MindContainerComponent>(morsel)
             || _tagSystem.HasTag(morsel, "HighRiskItem")
-            || HasComp<ContainmentFieldGeneratorComponent>(morsel)))
+            || HasComp<ContainmentFieldGeneratorComponent>(morsel))
         {
             _adminLogger.Add(LogType.EntityDelete, LogImpact.Extreme, $"{ToPrettyString(morsel)} entered the event horizon of {ToPrettyString(hungry)} and was deleted");
         }
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5d69c23f6b..0eac0b307c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: DrSmugleaf
-  changes:
-  - message: Empty marking categories are now hidden in the markings picker.
-    type: Tweak
-  id: 6216
-  time: '2024-03-24T04:01:51.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/26377
 - author: Baptr0b0t
   changes:
   - message: Fix access of command door remote. The captain must control his station.
@@ -3847,3 +3840,10 @@
   id: 6715
   time: '2024-06-12T18:10:53.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/28896
+- author: notafet
+  changes:
+  - message: The singularity is now safe to operate up to PA level 3.
+    type: Fix
+  id: 6716
+  time: '2024-06-12T22:56:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/28906
diff --git a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
index 0b8ae856bd..5b1320b450 100644
--- a/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
+++ b/Resources/Textures/Interface/VerbIcons/ATTRIBUTION.txt
@@ -7,3 +7,6 @@ https://game-icons.net/1x1/lorc/padlock.html
 
 unlock.svg by Delapouite under CC BY 3.0
 https://game-icons.net/1x1/delapouite/padlock-open.html
+
+bubbles.svg by Lorc under CC BY 3.0
+https://game-icons.net/1x1/lorc/bubbles.html
\ No newline at end of file
diff --git a/Resources/Textures/Interface/VerbIcons/bubbles.svg b/Resources/Textures/Interface/VerbIcons/bubbles.svg
new file mode 100644
index 0000000000..8744443c2c
--- /dev/null
+++ b/Resources/Textures/Interface/VerbIcons/bubbles.svg
@@ -0,0 +1 @@
+<svg style="height: 512px; width: 512px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M0 0h512v512H0z" fill="#000000" fill-opacity="0.01"></path><g class="" style="" transform="translate(0,0)"><path d="M82.055 26.807c-33.127 0-60.182 27.057-60.182 60.183 0 33.126 27.055 60.182 60.182 60.182 33.126 0 60.18-27.056 60.18-60.182 0-33.127-27.054-60.183-60.18-60.183zm13.85 21.043c16.15 5.665 27.64 20.98 27.64 39.14 0 23.025-18.465 41.49-41.49 41.49-23.025 0-41.49-18.465-41.49-41.49 0-.55.02-1.097.04-1.642 6.067 8.444 15.966 13.95 27.157 13.95 18.46 0 33.425-14.966 33.425-33.427 0-6.638-1.943-12.82-5.28-18.02zm158.058 11.855c-58.15.002-105.123 47.627-105.123 105.71 0 48.528 32.96 89.51 77.738 101.726-8.41 17.653-13.498 37.277-13.498 58.294 0 76.485 62.51 138.998 138.996 138.998h.004c76.485 0 138.412-62.562 138.412-138.998 0-38.083-15.76-72.427-40.658-97.454 16.358-14.68 26.643-36.147 26.643-59.648 0-43.695-35.733-79.426-79.428-79.426-20.743 0-39.395 8.335-53.43 21.41-18.555-30.156-51.717-50.61-89.657-50.61zm0 18.69c34.466 0 64.11 20.527 78.127 49.697-2.174 5.54-3.38 11.563-3.38 17.873 0 27.04 21.918 48.96 48.958 48.96s48.96-21.92 48.96-48.96c0-14.81-6.586-28.073-16.978-37.05 27.496 5.802 48.137 30.194 48.137 59.417 0 21.225-10.98 40.403-27.336 51.186l-10.354 6.826 9.418 8.07c25.745 22.062 42.29 54.548 42.29 91.02 0 66.374-53.402 120.308-119.724 120.308h-.004c-57.162 0-105.154-40.103-117.322-93.642 15.684 22.5 41.747 37.226 71.254 37.226 47.94 0 86.8-38.862 86.8-86.8 0-47.94-38.86-86.8-86.8-86.8-28.382 0-53.578 13.625-69.416 34.688-39.414-8.176-69.063-43.066-69.063-85 0-.494.01-.985.017-1.476 9.545 23.694 32.734 40.425 59.846 40.425 35.627 0 64.51-28.88 64.51-64.508 0-28.533-18.534-52.723-44.214-61.232 2.07-.148 4.162-.228 6.273-.228zm-148.018 163.44c-7.16-.028-14.436.883-21.668 2.82C40.2 256.47 14.415 302.08 26.203 346.076c6.57 24.52 23.502 43.28 44.84 53.198-6.084 12.932-7.977 27.963-3.982 42.87 9.028 33.693 44.24 53.447 77.813 44.45 33.573-8.995 53.595-43.677 44.6-77.25-3.488-13.016-10.86-23.98-20.496-32.017 16.684-19.844 24.108-47.014 16.87-74.027v-.003c-9.596-35.817-41.55-59.943-76.84-61.395-1.017-.042-2.04-.064-3.062-.068zm0 18.665c.794.002 1.586.018 2.375.05 27.367 1.083 52.01 19.727 59.475 47.585 6.445 24.055-2.003 47.964-19.39 63.7l-9.663 8.743 11.383 6.346c10.19 5.68 18.04 15.104 21.295 27.256 6.393 23.86-7.526 47.97-31.383 54.36-20.92 5.606-42.49-4.383-51.775-22.935 6.85 3.057 14.754 3.877 22.564 1.784 18.086-4.847 28.82-23.438 23.973-41.525-4.847-18.085-23.437-28.816-41.523-23.97-2.766.74-5.36 1.807-7.752 3.14-19.715-6.628-35.476-22.17-41.27-43.797-.678-2.524-1.18-5.05-1.548-7.572 10.962 18.105 32.915 27.61 54.387 21.857 26.044-6.978 41.5-33.75 34.52-59.796-4.7-17.548-18.392-30.275-34.788-34.586 3.055-.432 6.1-.647 9.12-.64z" fill="#fff" fill-opacity="1"></path></g></svg>
\ No newline at end of file
diff --git a/Resources/Textures/Interface/VerbIcons/bubbles.svg.192dpi.png b/Resources/Textures/Interface/VerbIcons/bubbles.svg.192dpi.png
new file mode 100644
index 0000000000..87badd270b
Binary files /dev/null and b/Resources/Textures/Interface/VerbIcons/bubbles.svg.192dpi.png differ