diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
index 57ec0c40d5..65817aaf4a 100644
--- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
+++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -961,6 +961,8 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
         StopTargeting();
 
         SelectingTargetFor = actionId;
+        // TODO inform the server
+        action.Toggled = true;
 
         // override "held-item" overlay
         var provider = action.Provider;
@@ -977,6 +979,15 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
                 handOverlay.IconOverride = _spriteSystem.Frame0(action.Icon);
         }
 
+        if (_container != null)
+        {
+            foreach (var button in _container.GetButtons())
+            {
+                if (button.ActionId == actionId)
+                    button.UpdateIcons();
+            }
+        }
+
         // TODO: allow world-targets to check valid positions. E.g., maybe:
         // - Draw a red/green ghost entity
         // - Add a yes/no checkmark where the HandItemOverlay usually is
@@ -1005,10 +1016,27 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
         if (SelectingTargetFor == null)
             return;
 
+        var oldAction = SelectingTargetFor;
+        if (_actionsSystem != null && _actionsSystem.TryGetActionData(oldAction, out var action))
+        {
+            // TODO inform the server
+            action.Toggled = false;
+        }
+
         SelectingTargetFor = null;
+
         _targetOutline?.Disable();
         _interactionOutline?.SetEnabled(true);
 
+        if (_container != null)
+        {
+            foreach (var button in _container.GetButtons())
+            {
+                if (button.ActionId == oldAction)
+                    button.UpdateIcons();
+            }
+        }
+
         if (!_overlays.TryGetOverlay<ShowHandItemOverlay>(out var handOverlay))
             return;
 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index 5fa8b8327e..7360076772 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -180,5 +180,6 @@
   noSpawn: true
   components:
   - type: EntityTargetAction
-    icon: Interface/Actions/devour.png
+    icon: { sprite : Interface/Actions/devour.rsi, state: icon }
+    iconOn: { sprite : Interface/Actions/devour.rsi, state: icon-on }
     event: !type:DevourActionEvent
diff --git a/Resources/Textures/Interface/Actions/devour.png b/Resources/Textures/Interface/Actions/devour.png
deleted file mode 100644
index d23d26ce8c..0000000000
Binary files a/Resources/Textures/Interface/Actions/devour.png and /dev/null differ
diff --git a/Resources/Textures/Interface/Actions/devour.rsi/icon-on.png b/Resources/Textures/Interface/Actions/devour.rsi/icon-on.png
new file mode 100644
index 0000000000..3c77155d16
Binary files /dev/null and b/Resources/Textures/Interface/Actions/devour.rsi/icon-on.png differ
diff --git a/Resources/Textures/Interface/Actions/devour.rsi/icon.png b/Resources/Textures/Interface/Actions/devour.rsi/icon.png
new file mode 100644
index 0000000000..50af5c2a4a
Binary files /dev/null and b/Resources/Textures/Interface/Actions/devour.rsi/icon.png differ
diff --git a/Resources/Textures/Interface/Actions/devour.rsi/meta.json b/Resources/Textures/Interface/Actions/devour.rsi/meta.json
new file mode 100644
index 0000000000..b176d2ec37
--- /dev/null
+++ b/Resources/Textures/Interface/Actions/devour.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Created by EmoGarbage404 (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-on"
+    }
+  ]
+}
diff --git a/Resources/Textures/Interface/Actions/meta.json b/Resources/Textures/Interface/Actions/meta.json
index a26a136365..cbe06c11c5 100644
--- a/Resources/Textures/Interface/Actions/meta.json
+++ b/Resources/Textures/Interface/Actions/meta.json
@@ -25,9 +25,6 @@
         {
             "name": "manifest"
         },
-        {
-            "name": "devour"
-        },
         {
             "name": "carp_summon"
         },