diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm
index 9587526a4e7..a63b9679f14 100644
--- a/code/modules/hydroponics/trays/tray_tools.dm
+++ b/code/modules/hydroponics/trays/tray_tools.dm
@@ -22,9 +22,10 @@
 
 /obj/item/device/analyzer/plant_analyzer
 	name = "plant analyzer"
-	icon = 'icons/obj/device.dmi'
+	icon = 'icons/obj/contained_items/tools/plant_analyzer.dmi'
 	icon_state = "hydro"
-	item_state = "analyzer"
+	item_state = "hydro"
+	contained_sprite = TRUE
 	var/form_title
 	var/last_data
 	matter = list(DEFAULT_WALL_MATERIAL = 80, MATERIAL_GLASS = 20)
diff --git a/html/changelogs/geeves-plant_analyzer_fix.yml b/html/changelogs/geeves-plant_analyzer_fix.yml
new file mode 100644
index 00000000000..e236daf9e89
--- /dev/null
+++ b/html/changelogs/geeves-plant_analyzer_fix.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - tweak: "Changed the plant analyzer's sprite."
+  - bugfix: "Fixed the plant analyzer turning you into a square when held."
\ No newline at end of file
diff --git a/icons/obj/contained_items/tools/plant_analyzer.dmi b/icons/obj/contained_items/tools/plant_analyzer.dmi
new file mode 100644
index 00000000000..18276765780
Binary files /dev/null and b/icons/obj/contained_items/tools/plant_analyzer.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 2abf454ab8b..ee6a493ba35 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ