diff --git a/code/__DEFINES/~~bubber_defines/mobs.dm b/code/__DEFINES/~~bubber_defines/mobs.dm
index 7b8379ec665..3b798de68dc 100644
--- a/code/__DEFINES/~~bubber_defines/mobs.dm
+++ b/code/__DEFINES/~~bubber_defines/mobs.dm
@@ -45,11 +45,11 @@
 #define BODYPART_ICON_GAS 'modular_skyrat/modules/bodyparts/icons/serpentid_parts_greyscale.dmi'
 
 // Genital Layers
-#define BUTT_LAYER_OFFSET 0.8
-#define ANUS_LAYER_OFFSET  0.7
-#define VAGINA_LAYER_OFFSET 0.6
-#define TESTICLES_LAYER_OFFSET 0.5
-#define GENITAL_LAYER_OFFSET 0.4
-#define PENIS_LAYER_OFFSET 0.3
-#define BELLY_LAYER_OFFSET 0.2
-#define BREASTS_LAYER_OFFSET 0.1
+#define BUTT_LAYER_OFFSET 0.08
+#define ANUS_LAYER_OFFSET  0.07
+#define VAGINA_LAYER_OFFSET 0.06
+#define TESTICLES_LAYER_OFFSET 0.05
+#define GENITAL_LAYER_OFFSET 0.04
+#define PENIS_LAYER_OFFSET 0.03
+#define BELLY_LAYER_OFFSET 0.02
+#define BREASTS_LAYER_OFFSET 0.01
diff --git a/modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/testicles_onmob.dmi b/modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/testicles_onmob.dmi
index 17ccc9df8b2..01a7869949f 100644
Binary files a/modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/testicles_onmob.dmi and b/modular_skyrat/master_files/icons/mob/sprite_accessory/genitals/testicles_onmob.dmi differ
diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm
index 82e57e99116..dcba8822e51 100644
--- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm
+++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/genitals.dm
@@ -138,7 +138,7 @@
 	always_color_customizable = TRUE
 	special_x_dimension = TRUE
 	default_color = DEFAULT_SKIN_OR_PRIMARY
-	relevent_layers = list(BODY_ADJ_LAYER, BODY_BEHIND_LAYER)
+	relevent_layers = list(BODY_FRONT_LAYER, BODY_BEHIND_LAYER)
 	var/has_size = TRUE
 
 /datum/sprite_accessory/genital/testicles/get_special_icon(mob/living/carbon/human/target_mob)
diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm
index b46b6876e54..baced4cc745 100644
--- a/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm
+++ b/modular_skyrat/modules/customization/modules/surgery/organs/genitals.dm
@@ -314,7 +314,7 @@
 
 /datum/bodypart_overlay/mutant/genital/testicles
 	feature_key = ORGAN_SLOT_TESTICLES
-	layers = EXTERNAL_ADJACENT | EXTERNAL_BEHIND
+	layers = EXTERNAL_FRONT | EXTERNAL_BEHIND
 	layer_offset = TESTICLES_LAYER_OFFSET
 
 /obj/item/organ/genital/testicles/update_genital_icon_state()
diff --git a/modular_zubbers/icons/mob/sprite_accesory/genitals/testicles_onmob.dmi b/modular_zubbers/icons/mob/sprite_accesory/genitals/testicles_onmob.dmi
index 2356e793355..a7392efc6b0 100644
Binary files a/modular_zubbers/icons/mob/sprite_accesory/genitals/testicles_onmob.dmi and b/modular_zubbers/icons/mob/sprite_accesory/genitals/testicles_onmob.dmi differ