diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 244a683afb..b53ef94bef 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -8,34 +8,27 @@
     sprite: Clothing/Eyes/Hud/diag.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/diag.rsi
-  - type: ClothingGrantComponent
-    component:
-      - type: ShowWhiteHealthBars
-        damageContainers:
-        - Inorganic
-        - Silicon
+  - type: ShowHealthBars
+    damageContainers:
+    - Inorganic
+    - Silicon
 
 - type: entity
   parent: ClothingEyesBase
   id: ClothingEyesHudMedical
   name: medical hud
-  description: A heads-up display that scans the humanoids in view and provides accurate data about their health status. 
+  description: A heads-up display that scans the humanoids in view and provides accurate data about their health status.
   components:
   - type: Sprite
     sprite: Clothing/Eyes/Hud/med.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/med.rsi
-# - type: ShowHealthBars
-#   damageContainers:
-#   - Biological
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
   - type: ShowHealthIcons
     damageContainers:
     - Biological
-  - type: ClothingGrantComponent
-    component:
-      - type: ShowWhiteHealthBars
-        damageContainers:
-        - Biological
   - type: Tag
     tags:
     - HudMedical
@@ -117,14 +110,12 @@
     sprite: Clothing/Eyes/Hud/medonion.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonion.rsi
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
   - type: ShowHealthIcons
     damageContainers:
     - Biological
-  - type: ClothingGrantComponent
-    component:
-      - type: ShowWhiteHealthBars
-        damageContainers:
-        - Biological
   - type: ShowHungerIcons
 
 - type: entity
@@ -137,14 +128,12 @@
     sprite: Clothing/Eyes/Hud/medonionbeer.rsi
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medonionbeer.rsi
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
   - type: ShowHealthIcons
     damageContainers:
     - Biological
-  - type: ClothingGrantComponent
-    component:
-      - type: ShowWhiteHealthBars
-        damageContainers:
-        - Biological
   - type: ShowHungerIcons
   - type: ShowThirstIcons
 
@@ -162,14 +151,12 @@
     graph: HudMedSec
     node: medsecHud
   - type: ShowSecurityIcons
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
   - type: ShowHealthIcons
     damageContainers:
     - Biological
-  - type: ClothingGrantComponent
-    component:
-      - type: ShowWhiteHealthBars
-        damageContainers:
-        - Biological
 
 - type: entity
   parent: ClothingEyesBase
@@ -182,13 +169,10 @@
   - type: Clothing
     sprite: Clothing/Eyes/Hud/medsecengi.rsi
   - type: ShowSecurityIcons
-  - type: ClothingGrantComponent
-    component:
-      - type: ShowWhiteHealthBars
-        damageContainers:
-        - Biological
-        - Inorganic
-        - Silicon
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+    - Inorganic
   - type: ShowHealthIcons
     damageContainers:
     - Biological
@@ -205,16 +189,13 @@
   - type: Clothing
     sprite: Clothing/Eyes/Hud/omni.rsi
   - type: ShowSecurityIcons
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+    - Inorganic
   - type: ShowHealthIcons
     damageContainers:
     - Biological
-  - type: ClothingGrantComponent
-    component:
-      - type: ShowWhiteHealthBars
-        damageContainers:
-        - Biological
-        - Inorganic
-        - Silicon
   - type: ShowHungerIcons
   - type: ShowThirstIcons
   - type: ShowSyndicateIcons
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index a5e0b38708..7c048777ea 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -785,13 +785,16 @@
         Caustic: 0.95
   - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+    - Inorganic
   - type: ShowHealthIcons
     damageContainers:
     - Biological
   - type: ClothingGrantComponent
     component:
     - type: NightVision
-    - type: ShowWhiteHealthBars
 
 #MISC. HARDSUITS
 #Clown Hardsuit
diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
index b98db3349a..4826628deb 100644
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -220,10 +220,10 @@
     access: [["Medical"], ["Command"], ["Research"]]
   - type: Inventory
     templateId: borgDutch
-  - type: ShowHealthIcons
+  - type: ShowHealthBars
     damageContainers:
     - Biological
-  - type: ShowWhiteHealthBars
+  - type: ShowHealthIcons
     damageContainers:
     - Biological
 
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 604632efa8..7f6114e364 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -279,10 +279,10 @@
     interactFailureString: petting-failure-medibot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: ShowHealthIcons
+  - type: ShowHealthBars
     damageContainers:
     - Biological
-  - type: ShowWhiteHealthBars
+  - type: ShowHealthIcons
     damageContainers:
     - Biological
 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
index 9ef2568433..c7713a6628 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -96,7 +96,10 @@
   - type: ShowHealthIcons
     damageContainers:
     - Biological
-  - type: ShowWhiteHealthBars
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+    - Inorganic
   - type: Invisibility
 
 - type: entity
diff --git a/Resources/Prototypes/StatusEffects/health.yml b/Resources/Prototypes/StatusEffects/health.yml
index 562dbb336d..fccd7c1381 100644
--- a/Resources/Prototypes/StatusEffects/health.yml
+++ b/Resources/Prototypes/StatusEffects/health.yml
@@ -32,4 +32,3 @@
   icon:
     sprite: /Textures/Interface/Misc/health_icons.rsi
     state: Rotting
-
diff --git a/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml b/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml
index 3397ed86dc..cb5494e9cf 100644
--- a/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml
@@ -43,9 +43,10 @@
         toggleAction: null
         toggleSound: null
         color: White
-      - type: ShowWhiteHealthBars
-        damageContainers:
-        - Biological
+    - type: ShowHealthBars
+      damageContainers:
+      - Biological
+      - Inorganic
     - type: ShowHealthIcons
       damageContainers:
       - Biological
diff --git a/Resources/Prototypes/_White/Entities/Cult/constructs.yml b/Resources/Prototypes/_White/Entities/Cult/constructs.yml
index 206bd3c106..74f50b6b8f 100644
--- a/Resources/Prototypes/_White/Entities/Cult/constructs.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/constructs.yml
@@ -66,9 +66,10 @@
     - type: NightVision
       toggleSound: null
       color: White
-    - type: ShowWhiteHealthBars
+    - type: ShowHealthBars
       damageContainers:
       - Biological
+      - Inorganic
     - type: ShowHealthIcons
       damageContainers:
       - Biological
@@ -248,7 +249,7 @@
   components:
     - type: Sprite
       state: envoy_of_death_neko
-  
+
 - type: nameIdentifierGroup
   id: Construct
   prefix: CO