diff --git a/code/game/objects/items/devices/floor_painter.dm b/code/game/objects/items/devices/floor_painter.dm
index 679ddcdfe45..be945223bb2 100644
--- a/code/game/objects/items/devices/floor_painter.dm
+++ b/code/game/objects/items/devices/floor_painter.dm
@@ -1,9 +1,9 @@
 /obj/item/device/floor_painter
 	name = "paint gun"
-	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "labeler1"
-	item_state = "flight"
-
+	icon = 'icons/obj/contained_items/tools/floor_painter.dmi'
+	icon_state = "floor_painter"
+	item_state = "floor_painter"
+	contained_sprite = TRUE
 	var/decal =        "remove all decals"
 	var/paint_dir =    "precise"
 	var/paint_colour = COLOR_WHITE
diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm
index 68f50f41f70..c003d018920 100644
--- a/code/game/objects/items/devices/pipe_painter.dm
+++ b/code/game/objects/items/devices/pipe_painter.dm
@@ -1,8 +1,9 @@
 /obj/item/device/pipe_painter
 	name = "pipe painter"
-	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "labeler1"
-	item_state = "flight"
+	icon = 'icons/obj/contained_items/tools/pipe_painter.dmi'
+	icon_state = "pipe_painter"
+	item_state = "pipe_painter"
+	contained_sprite = TRUE
 	var/list/modes
 	var/mode
 
diff --git a/html/changelogs/geeves-cool_painters.yml b/html/changelogs/geeves-cool_painters.yml
new file mode 100644
index 00000000000..2b7fb79c5db
--- /dev/null
+++ b/html/changelogs/geeves-cool_painters.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - tweak: "Ported Pipe- and Floor Painter sprites from Paradise."
\ No newline at end of file
diff --git a/icons/obj/contained_items/tools/floor_painter.dmi b/icons/obj/contained_items/tools/floor_painter.dmi
new file mode 100644
index 00000000000..7c4979b9b5c
Binary files /dev/null and b/icons/obj/contained_items/tools/floor_painter.dmi differ
diff --git a/icons/obj/contained_items/tools/pipe_painter.dmi b/icons/obj/contained_items/tools/pipe_painter.dmi
new file mode 100644
index 00000000000..a0fcb7accea
Binary files /dev/null and b/icons/obj/contained_items/tools/pipe_painter.dmi differ