diff --git a/Resources/Prototypes/Entities/janitor.yml b/Resources/Prototypes/Entities/janitor.yml
index fbc1c0bf9a..0cc504dd1f 100644
--- a/Resources/Prototypes/Entities/janitor.yml
+++ b/Resources/Prototypes/Entities/janitor.yml
@@ -1,15 +1,21 @@
 - type: entity
   parent: BaseItem
-  name: "Extra-Grip™ Mop"
+  name: mop
   id: MopItem
   description: A mop that can't be stopped, viscera cleanup detail awaits.
   components:
   - type: Sprite
-    texture: Objects/Janitorial/mop.png
+    sprite: Objects/Janitorial/mop.rsi
+    state: mop
+
   - type: Icon
-    texture: Objects/Janitorial/mop.png
+    sprite: Objects/Janitorial/mop.rsi
+    state: mop
+
   - type: Item
     Size: 10
+    sprite: Objects/Janitorial/mop.rsi
+
   - type: Mop
   - type: Solution
     maxVol: 10
@@ -49,9 +55,9 @@
 
 - type: entity
   parent: BaseItem
-  name: Bucket
+  name: bucket
   id: Bucket
-  description: "It's a bucket."
+  description: "Dear God."
   components:
   - type: Clickable
   - type: Sprite
@@ -75,3 +81,22 @@
     mass: 5
     Anchored: false
   - type: Sound
+
+
+- type: entity
+  name: wet floor sign
+  id: WetFloorSign
+  parent: BaseItem
+  description: Caution! Wet Floor!
+  components:
+  - type: Sprite
+    sprite: Objects/Janitorial/wet_floor_sign.rsi
+    state: caution
+
+  - type: Icon
+    sprite: Objects/Janitorial/wet_floor_sign.rsi
+    state: caution
+
+  - type: Item
+    sprite: Objects/Janitorial/wet_floor_sign.rsi
+
diff --git a/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-left.png b/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-left.png
new file mode 100644
index 0000000000..316a14c488
Binary files /dev/null and b/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-right.png b/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-right.png
new file mode 100644
index 0000000000..d38a5fc5b6
Binary files /dev/null and b/Resources/Textures/Objects/Janitorial/mop.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Janitorial/mop.rsi/meta.json b/Resources/Textures/Objects/Janitorial/mop.rsi/meta.json
new file mode 100644
index 0000000000..284a18f42c
--- /dev/null
+++ b/Resources/Textures/Objects/Janitorial/mop.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "mop", "directions": 1, "delays": [[1.0]]}]}
\ No newline at end of file
diff --git a/Resources/Textures/Objects/Janitorial/mop.png b/Resources/Textures/Objects/Janitorial/mop.rsi/mop.png
similarity index 100%
rename from Resources/Textures/Objects/Janitorial/mop.png
rename to Resources/Textures/Objects/Janitorial/mop.rsi/mop.png
diff --git a/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/caution.png b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/caution.png
new file mode 100644
index 0000000000..fdd5c1d2cb
Binary files /dev/null and b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/caution.png differ
diff --git a/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-left.png b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-left.png
new file mode 100644
index 0000000000..aa3d9fc9c1
Binary files /dev/null and b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-right.png b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-right.png
new file mode 100644
index 0000000000..286dec22cd
Binary files /dev/null and b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/meta.json b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/meta.json
new file mode 100644
index 0000000000..3bbf803a8b
--- /dev/null
+++ b/Resources/Textures/Objects/Janitorial/wet_floor_sign.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "caution", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
\ No newline at end of file