diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index ff0cef96087..16e31b5fb67 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -1123,7 +1123,7 @@
 	RefreshParts()
 
 	if(shouldplaysound)
-		replacer_tool.play_rped_sound()
+		replacer_tool.play_rped_effect()
 	return TRUE
 
 /obj/machinery/proc/display_parts(mob/user)
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index b6160ed6e2f..ad906e12471 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -124,7 +124,7 @@
 
 			if(add_cabling(user, cable, time = 0))
 				if(!no_sound)
-					replacer.play_rped_sound()
+					replacer.play_rped_effect()
 					no_sound = TRUE
 				return install_parts_from_part_replacer(user, replacer, no_sound = no_sound)  // Recursive call to handle the next part
 
@@ -137,7 +137,7 @@
 
 			if(add_glass(user, glass_sheets, time = 0))
 				if(!no_sound)
-					replacer.play_rped_sound()
+					replacer.play_rped_effect()
 				return TRUE
 
 			return FALSE
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 0a41adcac98..880313d09fb 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -196,7 +196,7 @@
 		// After installing, attempts to follow up by inserting parts
 		install_parts_from_part_replacer(user, replacer, no_sound = TRUE)
 		if(!no_sound)
-			replacer.play_rped_sound()
+			replacer.play_rped_effect()
 		return TRUE
 
 	return FALSE
diff --git a/code/game/machinery/machine_frame.dm b/code/game/machinery/machine_frame.dm
index 4447ef140dc..e74daa5c3ad 100644
--- a/code/game/machinery/machine_frame.dm
+++ b/code/game/machinery/machine_frame.dm
@@ -258,7 +258,7 @@
 				play_sound = TRUE
 
 	if(play_sound && !no_sound)
-		replacer.play_rped_sound()
+		replacer.play_rped_effect()
 
 	return TRUE
 
diff --git a/code/modules/research/part_replacer.dm b/code/modules/research/part_replacer.dm
index 53831026444..cb7c1819e58 100644
--- a/code/modules/research/part_replacer.dm
+++ b/code/modules/research/part_replacer.dm
@@ -24,9 +24,10 @@
 
 	return attacked_machinery.exchange_parts(user, src) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_FAILURE
 
-///Plays the sound for RPED exhanging or installing parts.
-/obj/item/storage/part_replacer/proc/play_rped_sound()
+///Plays the sound & flick animation for RPED exhanging or installing parts.
+/obj/item/storage/part_replacer/proc/play_rped_effect()
 	playsound(src, 'sound/items/tools/rped.ogg', 40, TRUE)
+	flick("[icon_state]_active", src)
 
 /**
  * Gets parts sorted in order of their tier
@@ -53,6 +54,7 @@
 /obj/item/storage/part_replacer/bluespace
 	name = "bluespace rapid part exchange device"
 	desc = "A version of the RPED that allows for replacement of parts and scanning from a distance, along with higher capacity for parts."
+	icon = 'icons/obj/storage/storage_wide.dmi'
 	icon_state = "BS_RPED"
 	inhand_icon_state = "BS_RPED"
 	w_class = WEIGHT_CLASS_NORMAL
@@ -72,11 +74,13 @@
 /obj/item/storage/part_replacer/bluespace/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
 	return interact_with_atom(interacting_with, user, modifiers)
 
-/obj/item/storage/part_replacer/bluespace/play_rped_sound()
+/obj/item/storage/part_replacer/bluespace/play_rped_effect()
 	if(prob(1))
 		playsound(src, 'sound/items/pshoom/pshoom_2.ogg', 40, TRUE)
+		flick("[icon_state]_old", src)
 		return
 	playsound(src, 'sound/items/pshoom/pshoom.ogg', 40, TRUE)
+	flick("[icon_state]_active", src)
 
 /**
  * Signal handler for when a part has been inserted into the BRPED.
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 3d07df1ae82..52bf9c0c3d0 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -1175,7 +1175,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
 			restocked += restock(replacer_item)
 	post_restock(user, restocked)
 	if(restocked > 0)
-		replacer.play_rped_sound()
+		replacer.play_rped_effect()
 	return TRUE
 
 /obj/machinery/vending/on_deconstruction(disassembled)
diff --git a/icons/obj/storage/storage.dmi b/icons/obj/storage/storage.dmi
index f77d72dcebd..c9495d48325 100644
Binary files a/icons/obj/storage/storage.dmi and b/icons/obj/storage/storage.dmi differ
diff --git a/icons/obj/storage/storage_wide.dmi b/icons/obj/storage/storage_wide.dmi
new file mode 100644
index 00000000000..ac71d433dcc
Binary files /dev/null and b/icons/obj/storage/storage_wide.dmi differ