diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
index 7de6e7d9900..6ceb38619a4 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
@@ -278,7 +278,7 @@
dir = 4
},
/turf/open/floor/iron{
- icon = 'icons/misc/beach.dmi';
+ icon = 'icons/obj/fluff/beach.dmi';
icon_state = "sand"
},
/area/ruin/powered/beach)
@@ -479,7 +479,7 @@
},
/obj/effect/turf_decal/sand,
/turf/open/floor/iron{
- icon = 'icons/misc/beach.dmi';
+ icon = 'icons/obj/fluff/beach.dmi';
icon_state = "sand"
},
/area/ruin/powered/beach)
diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm
index 7ed902651a5..a7096750a19 100644
--- a/_maps/RandomZLevels/SnowCabin.dmm
+++ b/_maps/RandomZLevels/SnowCabin.dmm
@@ -1147,7 +1147,7 @@
/turf/open/indestructible/binary{
density = 1;
desc = "No, I am not going through this.";
- icon = 'icons/misc/beach.dmi';
+ icon = 'icons/obj/fluff/beach.dmi';
icon_state = "water";
name = "dirty water"
},
diff --git a/code/__DEFINES/achievements.dm b/code/__DEFINES/achievements.dm
index e46fef9123e..0253df0b57a 100644
--- a/code/__DEFINES/achievements.dm
+++ b/code/__DEFINES/achievements.dm
@@ -1,7 +1,7 @@
// Keep the identifiers here below 32 characters, you can put the full display name in the actual achievement datum
/// Achievements icon set
-#define ACHIEVEMENTS_SET 'icons/ui_icons/achievements/achievements.dmi'
+#define ACHIEVEMENTS_SET 'icons/ui/achievements/achievements.dmi'
#define ACHIEVEMENT_DEFAULT "default"
#define ACHIEVEMENT_SCORE "score"
diff --git a/code/__DEFINES/fonts.dm b/code/__DEFINES/fonts.dm
index 0f1dbd501d0..b643ec997ca 100644
--- a/code/__DEFINES/fonts.dm
+++ b/code/__DEFINES/fonts.dm
@@ -13,7 +13,7 @@
#define SIGNATURE_FONT "Segoe Script"
/// Emoji icon set
-#define EMOJI_SET 'icons/ui_icons/emoji/emoji.dmi'
+#define EMOJI_SET 'icons/ui/chat/emoji.dmi'
// Font metrics bitfield
/// Include leading A width and trailing C width in GetWidth() or in DrawText()
diff --git a/code/_onclick/hud/picture_in_picture.dm b/code/_onclick/hud/picture_in_picture.dm
index dbf4e0af531..f3bb3713225 100644
--- a/code/_onclick/hud/picture_in_picture.dm
+++ b/code/_onclick/hud/picture_in_picture.dm
@@ -41,7 +41,7 @@
/atom/movable/screen/movable/pic_in_pic/proc/make_backgrounds()
standard_background = new /mutable_appearance()
- standard_background.icon = 'icons/misc/pic_in_pic.dmi'
+ standard_background.icon = 'icons/hud/pic_in_pic.dmi'
standard_background.icon_state = "background"
standard_background.layer = SPACE_LAYER
@@ -51,7 +51,7 @@
move_tab = new /mutable_appearance()
//all these properties are always the same, and since adding something to the overlay
//list makes a copy, there is no reason to make a new one each call
- move_tab.icon = 'icons/misc/pic_in_pic.dmi'
+ move_tab.icon = 'icons/hud/pic_in_pic.dmi'
move_tab.icon_state = "move"
move_tab.plane = HUD_PLANE
var/matrix/M = matrix()
@@ -63,7 +63,7 @@
button_x = new /atom/movable/screen/component_button(null, src)
var/mutable_appearance/MA = new /mutable_appearance()
MA.name = "close"
- MA.icon = 'icons/misc/pic_in_pic.dmi'
+ MA.icon = 'icons/hud/pic_in_pic.dmi'
MA.icon_state = "x"
MA.plane = HUD_PLANE
button_x.appearance = MA
@@ -76,7 +76,7 @@
button_expand = new /atom/movable/screen/component_button(null, src)
var/mutable_appearance/MA = new /mutable_appearance()
MA.name = "expand"
- MA.icon = 'icons/misc/pic_in_pic.dmi'
+ MA.icon = 'icons/hud/pic_in_pic.dmi'
MA.icon_state = "expand"
MA.plane = HUD_PLANE
button_expand.appearance = MA
@@ -89,7 +89,7 @@
button_shrink = new /atom/movable/screen/component_button(null, src)
var/mutable_appearance/MA = new /mutable_appearance()
MA.name = "shrink"
- MA.icon = 'icons/misc/pic_in_pic.dmi'
+ MA.icon = 'icons/hud/pic_in_pic.dmi'
MA.icon_state = "shrink"
MA.plane = HUD_PLANE
button_shrink.appearance = MA
diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 4884ed8f433..d300fcc3713 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -144,10 +144,10 @@
// Append radio icon if from a virtual speaker
if (extra_classes.Find("virtual-speaker"))
- var/image/r_icon = image('icons/ui_icons/chat/chat_icons.dmi', icon_state = "radio")
+ var/image/r_icon = image('icons/ui/chat/chat_icons.dmi', icon_state = "radio")
LAZYADD(prefixes, "\icon[r_icon]")
else if (extra_classes.Find("emote"))
- var/image/r_icon = image('icons/ui_icons/chat/chat_icons.dmi', icon_state = "emote")
+ var/image/r_icon = image('icons/ui/chat/chat_icons.dmi', icon_state = "emote")
LAZYADD(prefixes, "\icon[r_icon]")
chat_color_name_to_use = target.get_visible_name(add_id_name = FALSE) // use face name for nonverbal messages
diff --git a/code/datums/components/clickbox.dm b/code/datums/components/clickbox.dm
index 5d840b16a8e..b38a5f1c09b 100644
--- a/code/datums/components/clickbox.dm
+++ b/code/datums/components/clickbox.dm
@@ -74,7 +74,7 @@
else if(abs_height && abs_height < min_scale)
clickbox_height = min_scale/height
- clickbox_underlay = mutable_appearance('icons/misc/clickbox.dmi', clickbox_icon_state, CLICKBOX_LAYER, alpha = 1, appearance_flags = RESET_COLOR|RESET_ALPHA)
+ clickbox_underlay = mutable_appearance('icons/ui/clickbox.dmi', clickbox_icon_state, CLICKBOX_LAYER, alpha = 1, appearance_flags = RESET_COLOR|RESET_ALPHA)
clickbox_underlay.transform = clickbox_underlay.transform.Scale(clickbox_width, clickbox_height)
//Keeps the underlay more or less centered.
clickbox_underlay.pixel_x = x_offset * 1/clickbox_width
diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm
index be536bb792d..d1ff1b792e1 100644
--- a/code/datums/components/creamed.dm
+++ b/code/datums/components/creamed.dm
@@ -50,9 +50,9 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list(
carbon_parent.add_mood_event("creampie", /datum/mood_event/creampie)
carbon_parent.update_body_parts()
else if(iscorgi(parent))
- normal_overlay = mutable_appearance('icons/effects/creampie.dmi', "creampie_corgi")
+ normal_overlay = mutable_appearance('icons/mob/effects/creampie.dmi', "creampie_corgi")
else if(isAI(parent))
- normal_overlay = mutable_appearance('icons/effects/creampie.dmi', "creampie_ai")
+ normal_overlay = mutable_appearance('icons/mob/effects/creampie.dmi', "creampie_ai")
RegisterSignals(parent, list(
COMSIG_COMPONENT_CLEAN_ACT,
diff --git a/code/datums/elements/cult_halo.dm b/code/datums/elements/cult_halo.dm
index d6da6d8145a..684144ca0ab 100644
--- a/code/datums/elements/cult_halo.dm
+++ b/code/datums/elements/cult_halo.dm
@@ -27,7 +27,7 @@
return
ADD_TRAIT(target, TRAIT_CULT_HALO, CULT_TRAIT)
- var/mutable_appearance/new_halo_overlay = mutable_appearance('icons/effects/cult/halo.dmi', "halo[rand(1, 6)]", -HALO_LAYER)
+ var/mutable_appearance/new_halo_overlay = mutable_appearance('icons/mob/effects/halo.dmi', "halo[rand(1, 6)]", -HALO_LAYER)
if (ishuman(target))
var/mob/living/carbon/human/human_parent = target
new /obj/effect/temp_visual/cult/sparks(get_turf(human_parent), human_parent.dir)
diff --git a/code/datums/greyscale/README.md b/code/datums/greyscale/README.md
index 65f5c488790..9ff6bbca1d1 100644
--- a/code/datums/greyscale/README.md
+++ b/code/datums/greyscale/README.md
@@ -63,7 +63,7 @@ In this example, we start off by creating a sprite specified by a different conf
The first of the two in the inner group is an "icon_state", this means that the icon will be retrieved from the associated dmi file using the "icon_state" key.
-Note that you don't need to give colors to every layer if the layer does not need any colors applied to it, such as if it's a pre-colored component.
+Note that you don't need to give colors to every layer if the layer does not need any colors applied to it, such as if it's a pre-colored component.
In this example, the last layer is one such example, referencing a separately colored config.
"blend_mode" and "color_ids" are special, all layer types have them. The blend mode is what controls how that layer's finished product gets merged together with the rest of the sprite. The color ids control what colors are passed in to the layer.
@@ -128,7 +128,7 @@ While creating a greyscale config, be sure to take subtypes into account! Rather
```c
/datum/greyscale_config/tablet
name = "PDA"
- icon_file = 'icons/obj/modular_pda.dmi'
+ icon_file = 'icons/obj/devices/modular_pda.dmi'
json_config = 'code/datums/greyscale/json_configs/pda.json'
/datum/greyscale_config/tablet/chaplain
diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm
index 6b9465bf46a..69e78ec74b3 100644
--- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm
+++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_items.dm
@@ -122,7 +122,7 @@
/datum/greyscale_config/tablet
name = "PDA"
- icon_file = 'icons/obj/modular_pda.dmi'
+ icon_file = 'icons/obj/devices/modular_pda.dmi'
json_config = 'code/datums/greyscale/json_configs/pda.json'
/datum/greyscale_config/tablet/chaplain
diff --git a/code/datums/screentips/screentips.dm b/code/datums/screentips/screentips.dm
index d72e41960e5..20a7f334974 100644
--- a/code/datums/screentips/screentips.dm
+++ b/code/datums/screentips/screentips.dm
@@ -1,4 +1,4 @@
-#define HINT_ICON_FILE 'icons/ui_icons/screentips/cursor_hints.dmi'
+#define HINT_ICON_FILE 'icons/ui/screentips/cursor_hints.dmi'
/// Stores the cursor hint icons for screentip context.
GLOBAL_LIST_INIT_TYPED(screentip_context_icons, /image, prepare_screentip_context_icons())
diff --git a/code/game/machinery/mining_weather_monitor.dm b/code/game/machinery/mining_weather_monitor.dm
index 65cc4b9347c..32c41871b60 100644
--- a/code/game/machinery/mining_weather_monitor.dm
+++ b/code/game/machinery/mining_weather_monitor.dm
@@ -2,7 +2,7 @@
/obj/machinery/mining_weather_monitor
name = "barometric monitor"
desc = "A machine monitoring atmospheric data from mining environments. Provides warnings about incoming weather fronts."
- icon = 'icons/obj/miningradio.dmi'
+ icon = 'icons/obj/devices/miningradio.dmi'
icon_state = "wallmount"
light_power = 1
light_range = 1.6
diff --git a/code/game/objects/effects/decals/turfdecal/weather.dm b/code/game/objects/effects/decals/turfdecal/weather.dm
index 37b4f335e45..af05e997197 100644
--- a/code/game/objects/effects/decals/turfdecal/weather.dm
+++ b/code/game/objects/effects/decals/turfdecal/weather.dm
@@ -19,7 +19,7 @@
/obj/effect/turf_decal/weather/sand
name = "sand siding"
- icon = 'icons/misc/beach.dmi'
+ icon = 'icons/obj/fluff/beach.dmi'
icon_state = "sand_side"
/obj/effect/turf_decal/weather/sand/light
diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm
index cf1257308d9..4445815a422 100644
--- a/code/game/objects/effects/forcefields.dm
+++ b/code/game/objects/effects/forcefields.dm
@@ -44,7 +44,7 @@
/obj/effect/forcefield/cult
name = "glowing wall"
desc = "An unholy shield that blocks all attacks."
- icon = 'icons/effects/cult/effects.dmi'
+ icon = 'icons/effects/cult.dmi'
icon_state = "cultshield"
can_atmos_pass = ATMOS_PASS_NO
initial_duration = 20 SECONDS
diff --git a/code/game/objects/effects/temporary_visuals/cult.dm b/code/game/objects/effects/temporary_visuals/cult.dm
index f000aa4c039..a53d4df9b92 100644
--- a/code/game/objects/effects/temporary_visuals/cult.dm
+++ b/code/game/objects/effects/temporary_visuals/cult.dm
@@ -1,6 +1,6 @@
//temporary visual effects(/obj/effect/temp_visual) used by cult stuff
/obj/effect/temp_visual/cult
- icon = 'icons/effects/cult/effects.dmi'
+ icon = 'icons/effects/cult.dmi'
randomdir = FALSE
duration = 10
@@ -18,13 +18,13 @@
icon_state = "bloodout"
/obj/effect/temp_visual/dir_setting/cult/phase // The veil shifter teleport
- icon = 'icons/effects/cult/effects.dmi'
+ icon = 'icons/effects/cult.dmi'
name = "phase glow"
duration = 7
icon_state = "cultin"
/obj/effect/temp_visual/dir_setting/cult/phase/out
- icon = 'icons/effects/cult/effects.dmi'
+ icon = 'icons/effects/cult.dmi'
icon_state = "cultout"
/obj/effect/temp_visual/cult/sac
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 4c8ce41debf..d132dd53da8 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -492,7 +492,7 @@
duration = 2 SECONDS
/obj/effect/constructing_effect
- icon = 'icons/effects/effects_rcd.dmi'
+ icon = 'icons/effects/rcd.dmi'
icon_state = ""
layer = ABOVE_ALL_MOB_LAYER
plane = ABOVE_GAME_PLANE
diff --git a/code/game/objects/effects/wanted_poster.dm b/code/game/objects/effects/wanted_poster.dm
index 001f0119b9d..ab3661139fb 100644
--- a/code/game/objects/effects/wanted_poster.dm
+++ b/code/game/objects/effects/wanted_poster.dm
@@ -86,7 +86,7 @@
var/i
for(i=1; i <= textLen, i++)
var/letter = uppertext(text[i])
- var/icon/letter_icon = icon("icon" = 'icons/misc/Font_Minimal.dmi', "icon_state" = letter)
+ var/icon/letter_icon = icon("icon" = 'icons/testing/Font_Minimal.dmi', "icon_state" = letter)
letter_icon.Shift(EAST, startX) //16 - (2*n)
letter_icon.Shift(SOUTH, 2)
letter_icon.SwapColor(rgb(255,255,255), color)
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 192842e6447..4ab568fdd4f 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -11,7 +11,7 @@
/obj/item/restraints
breakouttime = 1 MINUTES
dye_color = DYE_PRISONER
- icon = 'icons/obj/restraints.dmi'
+ icon = 'icons/obj/weapons/restraints.dmi'
/obj/item/restraints/suicide_act(mob/living/carbon/user)
user.visible_message(span_suicide("[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm
index 028366481d4..e156bf8a0a8 100644
--- a/code/game/objects/items/surgery_tray.dm
+++ b/code/game/objects/items/surgery_tray.dm
@@ -6,7 +6,7 @@
/obj/item/surgery_tray
name = "surgery tray"
desc = "A Deforest brand medical cart. It is a folding model, meaning the wheels on the bottom can be retracted and the body used as a tray."
- icon = 'icons/obj/medicart.dmi'
+ icon = 'icons/obj/medical/medicart.dmi'
icon_state = "tray"
w_class = WEIGHT_CLASS_BULKY
slowdown = 1
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 7f0e28c95e6..faf8862e116 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1071,7 +1071,7 @@
*/
/obj/item/toy/beach_ball
name = "beach ball"
- icon = 'icons/misc/beach.dmi'
+ icon = 'icons/obj/fluff/beach.dmi'
icon_state = "ball"
inhand_icon_state = "beachball"
w_class = WEIGHT_CLASS_BULKY //Stops people from hiding it in their bags/pockets
@@ -1426,7 +1426,7 @@
/obj/item/toy/seashell
name = "seashell"
desc = "May you always have a shell in your pocket and sand in your shoes. Whatever that's supposed to mean."
- icon = 'icons/misc/beach.dmi'
+ icon = 'icons/obj/fluff/beach.dmi'
icon_state = "shell1"
var/static/list/possible_colors = list("" = 2, COLOR_PURPLE_GRAY = 1, COLOR_OLIVE = 1, COLOR_PALE_BLUE_GRAY = 1, COLOR_RED_GRAY = 1)
diff --git a/code/game/objects/items/virgin_mary.dm b/code/game/objects/items/virgin_mary.dm
index b0446abadbd..46264dc2814 100644
--- a/code/game/objects/items/virgin_mary.dm
+++ b/code/game/objects/items/virgin_mary.dm
@@ -1,7 +1,7 @@
/obj/item/virgin_mary
name = "\proper a picture of the virgin mary"
desc = "A small, cheap icon depicting the virgin mother."
- icon = 'icons/obj/blackmarket.dmi'
+ icon = 'icons/obj/devices/blackmarket.dmi'
icon_state = "madonna"
resistance_flags = FLAMMABLE
///Has this item been used already.
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index f7717da19e7..54f77ff1b70 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -636,7 +636,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/melee/skateboard
name = "skateboard"
desc = "A skateboard. It can be placed on its wheels and ridden, or used as a radical weapon."
- icon = 'icons/obj/vehicles.dmi'
+ icon = 'icons/mob/rideables/vehicles.dmi'
icon_state = "skateboard_held"
inhand_icon_state = "skateboard"
force = 12
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 2cfd490203c..49a230d6bdc 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -499,13 +499,13 @@
/obj/structure/flora/coconuts
gender = PLURAL
name = "coconuts"
- icon = 'icons/misc/beach.dmi'
+ icon = 'icons/obj/fluff/beach.dmi'
icon_state = "coconuts"
/obj/structure/flora/tree/palm
name = "palm tree"
desc = "A tree straight from the tropics."
- icon = 'icons/misc/beach2.dmi'
+ icon = 'icons/obj/fluff/beach2.dmi'
icon_state = "palm1"
pixel_x = 0
diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm
index baeb8209447..2158a88a6b6 100644
--- a/code/game/objects/structures/showcase.dm
+++ b/code/game/objects/structures/showcase.dm
@@ -64,13 +64,13 @@
/obj/structure/showcase/mecha/marauder
name = "combat mech exhibit"
desc = "A stand with an empty old Nanotrasen Corporation combat mech bolted to it. It is described as the premier unit used to defend corporate interests and employees."
- icon = 'icons/mob/mecha.dmi'
+ icon = 'icons/mob/rideables/mecha.dmi'
icon_state = "marauder"
/obj/structure/showcase/mecha/ripley
name = "construction mech exhibit"
desc = "A stand with a retired construction mech bolted to it. The clamps are rated at 9300PSI. It seems to be falling apart."
- icon = 'icons/mob/mecha.dmi'
+ icon = 'icons/mob/rideables/mecha.dmi'
icon_state = "firefighter"
/obj/structure/showcase/machinery/implanter
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index d4bab223d45..0cf5ddf7c91 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -102,7 +102,7 @@
/obj/structure/trap/stun/hunter
name = "bounty trap"
desc = "A trap that only goes off when a fugitive steps on it, announcing the location and stunning the target. You'd better avoid it."
- icon = 'icons/obj/restraints.dmi'
+ icon = 'icons/obj/weapons/restraints.dmi'
icon_state = "bounty_trap_on"
stun_time = 20 SECONDS
sparks = FALSE //the item version gives them off to prevent runtimes (see Destroy())
@@ -143,7 +143,7 @@
/obj/item/bountytrap
name = "bounty trap"
desc = "A trap that only goes off when a fugitive steps on it, announcing the location and stunning the target. It's currently inactive."
- icon = 'icons/obj/restraints.dmi'
+ icon = 'icons/obj/weapons/restraints.dmi'
icon_state = "bounty_trap_off"
var/obj/structure/trap/stun/hunter/stored_trap
var/obj/item/radio/radio
diff --git a/code/modules/admin/view_variables/color_matrix_editor.dm b/code/modules/admin/view_variables/color_matrix_editor.dm
index ea1278901f3..6c61382ceec 100644
--- a/code/modules/admin/view_variables/color_matrix_editor.dm
+++ b/code/modules/admin/view_variables/color_matrix_editor.dm
@@ -14,7 +14,7 @@
else
current_color = COLOR_MATRIX_IDENTITY
- var/mutable_appearance/view = image('icons/misc/colortest.dmi', "colors")
+ var/mutable_appearance/view = image('icons/testing/colortest.dmi', "colors")
if(_target)
target = WEAKREF(_target)
if(!(_target.appearance_flags & PLANE_MASTER))
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 5a25d68c507..e94e68cab0a 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -255,7 +255,7 @@
clicked_on.set_hallucinations_if_lower(240 SECONDS)
SEND_SOUND(caller, sound('sound/effects/ghost.ogg', FALSE, TRUE, 50))
- var/image/sparkle_image = image('icons/effects/cult/effects.dmi', clicked_on, "bloodsparkles", ABOVE_MOB_LAYER)
+ var/image/sparkle_image = image('icons/effects/cult.dmi', clicked_on, "bloodsparkles", ABOVE_MOB_LAYER)
clicked_on.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", sparkle_image, NONE)
addtimer(CALLBACK(clicked_on, TYPE_PROC_REF(/atom/, remove_alt_appearance), "cult_apoc", TRUE), 4 MINUTES, TIMER_OVERRIDE|TIMER_UNIQUE)
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index a9537d26d38..cd77799419c 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -382,7 +382,7 @@ Striking a noncultist, however, will tear their flesh."}
AddComponent( \
/datum/component/shielded, \
recharge_start_delay = 0 SECONDS, \
- shield_icon_file = 'icons/effects/cult/effects.dmi', \
+ shield_icon_file = 'icons/effects/cult.dmi', \
shield_icon = "shield-cult", \
run_hit_callback = CALLBACK(src, PROC_REF(shield_damaged)), \
)
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index b75d74ee160..185770a474b 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -1141,7 +1141,7 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0)
images += B
if(!IS_CULTIST(M))
if(M.client)
- var/image/C = image('icons/effects/cult/effects.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER)
+ var/image/C = image('icons/effects/cult.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER)
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE)
addtimer(CALLBACK(M, TYPE_PROC_REF(/atom/, remove_alt_appearance),"cult_apoc",TRUE), duration)
images += C
diff --git a/code/modules/antagonists/nukeop/datums/operative_team.dm b/code/modules/antagonists/nukeop/datums/operative_team.dm
index 3345f3cf4d2..1e06f32594d 100644
--- a/code/modules/antagonists/nukeop/datums/operative_team.dm
+++ b/code/modules/antagonists/nukeop/datums/operative_team.dm
@@ -69,7 +69,7 @@
text += "
"
text += "(Syndicates used [TC_uses] TC) [purchases]"
if(TC_uses == 0 && GLOB.station_was_nuked && !are_all_operatives_dead())
- text += "[icon2html('icons/ui_icons/antags/badass.dmi', world, "badass")]"
+ text += "[icon2html('icons/ui/antags/badass.dmi', world, "badass")]"
parts += text
diff --git a/code/modules/antagonists/obsessed/obsessed.dm b/code/modules/antagonists/obsessed/obsessed.dm
index a866ef4c2fc..3d0a0063bf7 100644
--- a/code/modules/antagonists/obsessed/obsessed.dm
+++ b/code/modules/antagonists/obsessed/obsessed.dm
@@ -47,7 +47,7 @@
var/icon/final_icon = finish_preview_icon(obsessed_icon)
final_icon.Blend(
- icon('icons/ui_icons/antags/obsessed.dmi', "obsession"),
+ icon('icons/ui/antags/obsessed.dmi', "obsession"),
ICON_OVERLAY,
ANTAGONIST_PREVIEW_ICON_SIZE - 30,
20,
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index 5ad5aeecf26..d784175d62b 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -349,7 +349,7 @@
if(uplink_owned)
var/uplink_text = "(used [used_telecrystals] TC) [purchases]"
if((used_telecrystals == 0) && traitor_won)
- var/static/icon/badass = icon('icons/ui_icons/antags/badass.dmi', "badass")
+ var/static/icon/badass = icon('icons/ui/antags/badass.dmi', "badass")
uplink_text += "[icon2html(badass, world)]"
result += uplink_text
diff --git a/code/modules/asset_cache/assets/adventure.dm b/code/modules/asset_cache/assets/adventure.dm
index 65f6c3fe9cc..e1a7bae2358 100644
--- a/code/modules/asset_cache/assets/adventure.dm
+++ b/code/modules/asset_cache/assets/adventure.dm
@@ -1,7 +1,7 @@
/datum/asset/simple/adventure
assets = list(
- "default" = 'icons/ui_icons/adventure/default.png',
- "grue" = 'icons/ui_icons/adventure/grue.png',
- "signal_lost" ='icons/ui_icons/adventure/signal_lost.png',
- "trade" = 'icons/ui_icons/adventure/trade.png',
+ "default" = 'icons/ui/adventure/default.png',
+ "grue" = 'icons/ui/adventure/grue.png',
+ "signal_lost" ='icons/ui/adventure/signal_lost.png',
+ "trade" = 'icons/ui/adventure/trade.png',
)
diff --git a/code/modules/asset_cache/assets/arcade.dm b/code/modules/asset_cache/assets/arcade.dm
index 338b891190c..3a68644d152 100644
--- a/code/modules/asset_cache/assets/arcade.dm
+++ b/code/modules/asset_cache/assets/arcade.dm
@@ -1,11 +1,11 @@
/datum/asset/simple/arcade
assets = list(
- "shopkeeper.png" = 'icons/ui_icons/arcade/shopkeeper.png',
- "fireplace.png" = 'icons/ui_icons/arcade/fireplace.png',
- "boss1.gif" = 'icons/ui_icons/arcade/boss1.gif',
- "boss2.gif" = 'icons/ui_icons/arcade/boss2.gif',
- "boss3.gif" = 'icons/ui_icons/arcade/boss3.gif',
- "boss4.gif" = 'icons/ui_icons/arcade/boss4.gif',
- "boss5.gif" = 'icons/ui_icons/arcade/boss5.gif',
- "boss6.gif" = 'icons/ui_icons/arcade/boss6.gif',
+ "shopkeeper.png" = 'icons/ui/arcade/shopkeeper.png',
+ "fireplace.png" = 'icons/ui/arcade/fireplace.png',
+ "boss1.gif" = 'icons/ui/arcade/boss1.gif',
+ "boss2.gif" = 'icons/ui/arcade/boss2.gif',
+ "boss3.gif" = 'icons/ui/arcade/boss3.gif',
+ "boss4.gif" = 'icons/ui/arcade/boss4.gif',
+ "boss5.gif" = 'icons/ui/arcade/boss5.gif',
+ "boss6.gif" = 'icons/ui/arcade/boss6.gif',
)
diff --git a/code/modules/asset_cache/assets/chat.dm b/code/modules/asset_cache/assets/chat.dm
index 3765f113dda..1da0869a85a 100644
--- a/code/modules/asset_cache/assets/chat.dm
+++ b/code/modules/asset_cache/assets/chat.dm
@@ -4,11 +4,11 @@
/datum/asset/spritesheet/chat/create_spritesheets()
InsertAll("emoji", EMOJI_SET)
// pre-loading all lanugage icons also helps to avoid meta
- InsertAll("language", 'icons/misc/language.dmi')
+ InsertAll("language", 'icons/ui/chat/language.dmi')
// catch languages which are pulling icons from another file
for(var/path in typesof(/datum/language))
var/datum/language/L = path
var/icon = initial(L.icon)
- if (icon != 'icons/misc/language.dmi')
+ if (icon != 'icons/ui/chat/language.dmi')
var/icon_state = initial(L.icon_state)
Insert("language-[icon_state]", icon, icon_state=icon_state)
diff --git a/code/modules/asset_cache/assets/circuits.dm b/code/modules/asset_cache/assets/circuits.dm
index df9aa1fa6d8..ea97a907d93 100644
--- a/code/modules/asset_cache/assets/circuits.dm
+++ b/code/modules/asset_cache/assets/circuits.dm
@@ -1,4 +1,4 @@
/datum/asset/simple/circuit_assets
assets = list(
- "grid_background.png" = 'icons/ui_icons/tgui/grid_background.png'
+ "grid_background.png" = 'icons/ui/tgui/grid_background.png'
)
diff --git a/code/modules/asset_cache/assets/common.dm b/code/modules/asset_cache/assets/common.dm
index 1b0fb301a19..931b4999b43 100644
--- a/code/modules/asset_cache/assets/common.dm
+++ b/code/modules/asset_cache/assets/common.dm
@@ -1,3 +1,3 @@
/datum/asset/simple/namespaced/common
- assets = list("padlock.png" = 'icons/ui_icons/common/padlock.png')
+ assets = list("padlock.png" = 'icons/ui/common/padlock.png')
parents = list("common.css" = 'html/browser/common.css')
diff --git a/code/modules/asset_cache/assets/condiments.dm b/code/modules/asset_cache/assets/condiments.dm
index d5a7490904d..8b471487324 100644
--- a/code/modules/asset_cache/assets/condiments.dm
+++ b/code/modules/asset_cache/assets/condiments.dm
@@ -1,24 +1,24 @@
/datum/asset/spritesheet/simple/condiments
name = "condiments"
assets = list(
- CONDIMASTER_STYLE_FALLBACK = 'icons/ui_icons/condiments/bottle.png',
- "flour" = 'icons/ui_icons/condiments/flour.png',
- "rice" = 'icons/ui_icons/condiments/rice.png',
- "sugar" = 'icons/ui_icons/condiments/sugar.png',
- "milk" = 'icons/ui_icons/condiments/milk.png',
- "enzyme" = 'icons/ui_icons/condiments/enzyme.png',
- "capsaicin" = 'icons/ui_icons/condiments/hotsauce.png',
- "frostoil" = 'icons/ui_icons/condiments/coldsauce.png',
- "bbqsauce" = 'icons/ui_icons/condiments/bbqsauce.png',
- "soymilk" = 'icons/ui_icons/condiments/soymilk.png',
- "soysauce" = 'icons/ui_icons/condiments/soysauce.png',
- "ketchup" = 'icons/ui_icons/condiments/ketchup.png',
- "mayonnaise" = 'icons/ui_icons/condiments/mayonnaise.png',
- "oliveoil" = 'icons/ui_icons/condiments/oliveoil.png',
- "cooking_oil" = 'icons/ui_icons/condiments/cookingoil.png',
- "peanut_butter" = 'icons/ui_icons/condiments/peanutbutter.png',
- "cherryjelly" = 'icons/ui_icons/condiments/cherryjelly.png',
- "honey" = 'icons/ui_icons/condiments/honey.png',
- "blackpepper" = 'icons/ui_icons/condiments/peppermillsmall.png',
- "sodiumchloride" = 'icons/ui_icons/condiments/saltshakersmall.png',
+ CONDIMASTER_STYLE_FALLBACK = 'icons/ui/condiments/bottle.png',
+ "flour" = 'icons/ui/condiments/flour.png',
+ "rice" = 'icons/ui/condiments/rice.png',
+ "sugar" = 'icons/ui/condiments/sugar.png',
+ "milk" = 'icons/ui/condiments/milk.png',
+ "enzyme" = 'icons/ui/condiments/enzyme.png',
+ "capsaicin" = 'icons/ui/condiments/hotsauce.png',
+ "frostoil" = 'icons/ui/condiments/coldsauce.png',
+ "bbqsauce" = 'icons/ui/condiments/bbqsauce.png',
+ "soymilk" = 'icons/ui/condiments/soymilk.png',
+ "soysauce" = 'icons/ui/condiments/soysauce.png',
+ "ketchup" = 'icons/ui/condiments/ketchup.png',
+ "mayonnaise" = 'icons/ui/condiments/mayonnaise.png',
+ "oliveoil" = 'icons/ui/condiments/oliveoil.png',
+ "cooking_oil" = 'icons/ui/condiments/cookingoil.png',
+ "peanut_butter" = 'icons/ui/condiments/peanutbutter.png',
+ "cherryjelly" = 'icons/ui/condiments/cherryjelly.png',
+ "honey" = 'icons/ui/condiments/honey.png',
+ "blackpepper" = 'icons/ui/condiments/peppermillsmall.png',
+ "sodiumchloride" = 'icons/ui/condiments/saltshakersmall.png',
)
diff --git a/code/modules/asset_cache/assets/contracts.dm b/code/modules/asset_cache/assets/contracts.dm
index 6ac1a9cb678..72bd81572b5 100644
--- a/code/modules/asset_cache/assets/contracts.dm
+++ b/code/modules/asset_cache/assets/contracts.dm
@@ -1,7 +1,7 @@
/datum/asset/simple/contracts
assets = list(
- "bluespace.png" = 'icons/ui_icons/contracts/bluespace.png',
- "destruction.png" = 'icons/ui_icons/contracts/destruction.png',
- "healing.png" = 'icons/ui_icons/contracts/healing.png',
- "robeless.png" = 'icons/ui_icons/contracts/robeless.png',
+ "bluespace.png" = 'icons/ui/contracts/bluespace.png',
+ "destruction.png" = 'icons/ui/contracts/destruction.png',
+ "healing.png" = 'icons/ui/contracts/healing.png',
+ "robeless.png" = 'icons/ui/contracts/robeless.png',
)
diff --git a/code/modules/asset_cache/assets/genetics.dm b/code/modules/asset_cache/assets/genetics.dm
index d74f10f631b..51ac0b47b40 100644
--- a/code/modules/asset_cache/assets/genetics.dm
+++ b/code/modules/asset_cache/assets/genetics.dm
@@ -1,6 +1,6 @@
/datum/asset/simple/genetics
assets = list(
- "dna_discovered.gif" = 'icons/ui_icons/dna/dna_discovered.gif',
- "dna_undiscovered.gif" = 'icons/ui_icons/dna/dna_undiscovered.gif',
- "dna_extra.gif" = 'icons/ui_icons/dna/dna_extra.gif'
+ "dna_discovered.gif" = 'icons/ui/dna/dna_discovered.gif',
+ "dna_undiscovered.gif" = 'icons/ui/dna/dna_undiscovered.gif',
+ "dna_extra.gif" = 'icons/ui/dna/dna_extra.gif'
)
diff --git a/code/modules/asset_cache/assets/headers.dm b/code/modules/asset_cache/assets/headers.dm
index 62c7fc532e6..1c070bd0322 100644
--- a/code/modules/asset_cache/assets/headers.dm
+++ b/code/modules/asset_cache/assets/headers.dm
@@ -1,31 +1,31 @@
/datum/asset/simple/headers
assets = list(
- "alarm_green.gif" = 'icons/program_icons/alarm_green.gif',
- "alarm_red.gif" = 'icons/program_icons/alarm_red.gif',
- "batt_5.gif" = 'icons/program_icons/batt_5.gif',
- "batt_20.gif" = 'icons/program_icons/batt_20.gif',
- "batt_40.gif" = 'icons/program_icons/batt_40.gif',
- "batt_60.gif" = 'icons/program_icons/batt_60.gif',
- "batt_80.gif" = 'icons/program_icons/batt_80.gif',
- "batt_100.gif" = 'icons/program_icons/batt_100.gif',
- "downloader_finished.gif" = 'icons/program_icons/downloader_finished.gif',
- "downloader_running.gif" = 'icons/program_icons/downloader_running.gif',
- "ntnrc_idle.gif" = 'icons/program_icons/ntnrc_idle.gif',
- "ntnrc_new.gif" = 'icons/program_icons/ntnrc_new.gif',
- "power_norm.gif" = 'icons/program_icons/power_norm.gif',
- "power_warn.gif" = 'icons/program_icons/power_warn.gif',
- "sig_high.gif" = 'icons/program_icons/sig_high.gif',
- "sig_low.gif" = 'icons/program_icons/sig_low.gif',
- "sig_lan.gif" = 'icons/program_icons/sig_lan.gif',
- "sig_none.gif" = 'icons/program_icons/sig_none.gif',
- "smmon_0.gif" = 'icons/program_icons/smmon_0.gif',
- "smmon_1.gif" = 'icons/program_icons/smmon_1.gif',
- "smmon_2.gif" = 'icons/program_icons/smmon_2.gif',
- "smmon_3.gif" = 'icons/program_icons/smmon_3.gif',
- "smmon_4.gif" = 'icons/program_icons/smmon_4.gif',
- "smmon_5.gif" = 'icons/program_icons/smmon_5.gif',
- "smmon_6.gif" = 'icons/program_icons/smmon_6.gif',
- "borg_mon.gif" = 'icons/program_icons/borg_mon.gif',
- "robotact.gif" = 'icons/program_icons/robotact.gif',
- "mafia.gif" = 'icons/program_icons/mafia.gif',
+ "alarm_green.gif" = 'icons/ui/programs/alarm_green.gif',
+ "alarm_red.gif" = 'icons/ui/programs/alarm_red.gif',
+ "batt_5.gif" = 'icons/ui/programs/batt_5.gif',
+ "batt_20.gif" = 'icons/ui/programs/batt_20.gif',
+ "batt_40.gif" = 'icons/ui/programs/batt_40.gif',
+ "batt_60.gif" = 'icons/ui/programs/batt_60.gif',
+ "batt_80.gif" = 'icons/ui/programs/batt_80.gif',
+ "batt_100.gif" = 'icons/ui/programs/batt_100.gif',
+ "downloader_finished.gif" = 'icons/ui/programs/downloader_finished.gif',
+ "downloader_running.gif" = 'icons/ui/programs/downloader_running.gif',
+ "ntnrc_idle.gif" = 'icons/ui/programs/ntnrc_idle.gif',
+ "ntnrc_new.gif" = 'icons/ui/programs/ntnrc_new.gif',
+ "power_norm.gif" = 'icons/ui/programs/power_norm.gif',
+ "power_warn.gif" = 'icons/ui/programs/power_warn.gif',
+ "sig_high.gif" = 'icons/ui/programs/sig_high.gif',
+ "sig_low.gif" = 'icons/ui/programs/sig_low.gif',
+ "sig_lan.gif" = 'icons/ui/programs/sig_lan.gif',
+ "sig_none.gif" = 'icons/ui/programs/sig_none.gif',
+ "smmon_0.gif" = 'icons/ui/programs/smmon_0.gif',
+ "smmon_1.gif" = 'icons/ui/programs/smmon_1.gif',
+ "smmon_2.gif" = 'icons/ui/programs/smmon_2.gif',
+ "smmon_3.gif" = 'icons/ui/programs/smmon_3.gif',
+ "smmon_4.gif" = 'icons/ui/programs/smmon_4.gif',
+ "smmon_5.gif" = 'icons/ui/programs/smmon_5.gif',
+ "smmon_6.gif" = 'icons/ui/programs/smmon_6.gif',
+ "borg_mon.gif" = 'icons/ui/programs/borg_mon.gif',
+ "robotact.gif" = 'icons/ui/programs/robotact.gif',
+ "mafia.gif" = 'icons/ui/programs/mafia.gif',
)
diff --git a/code/modules/asset_cache/assets/inventory.dm b/code/modules/asset_cache/assets/inventory.dm
index a63fc45620f..0883dbd7515 100644
--- a/code/modules/asset_cache/assets/inventory.dm
+++ b/code/modules/asset_cache/assets/inventory.dm
@@ -1,20 +1,20 @@
/datum/asset/simple/inventory
assets = list(
- "inventory-glasses.png" = 'icons/ui_icons/inventory/glasses.png',
- "inventory-head.png" = 'icons/ui_icons/inventory/head.png',
- "inventory-neck.png" = 'icons/ui_icons/inventory/neck.png',
- "inventory-mask.png" = 'icons/ui_icons/inventory/mask.png',
- "inventory-ears.png" = 'icons/ui_icons/inventory/ears.png',
- "inventory-uniform.png" = 'icons/ui_icons/inventory/uniform.png',
- "inventory-suit.png" = 'icons/ui_icons/inventory/suit.png',
- "inventory-gloves.png" = 'icons/ui_icons/inventory/gloves.png',
- "inventory-hand_l.png" = 'icons/ui_icons/inventory/hand_l.png',
- "inventory-hand_r.png" = 'icons/ui_icons/inventory/hand_r.png',
- "inventory-shoes.png" = 'icons/ui_icons/inventory/shoes.png',
- "inventory-suit_storage.png" = 'icons/ui_icons/inventory/suit_storage.png',
- "inventory-id.png" = 'icons/ui_icons/inventory/id.png',
- "inventory-belt.png" = 'icons/ui_icons/inventory/belt.png',
- "inventory-back.png" = 'icons/ui_icons/inventory/back.png',
- "inventory-pocket.png" = 'icons/ui_icons/inventory/pocket.png',
- "inventory-collar.png" = 'icons/ui_icons/inventory/collar.png',
+ "inventory-glasses.png" = 'icons/ui/inventory/glasses.png',
+ "inventory-head.png" = 'icons/ui/inventory/head.png',
+ "inventory-neck.png" = 'icons/ui/inventory/neck.png',
+ "inventory-mask.png" = 'icons/ui/inventory/mask.png',
+ "inventory-ears.png" = 'icons/ui/inventory/ears.png',
+ "inventory-uniform.png" = 'icons/ui/inventory/uniform.png',
+ "inventory-suit.png" = 'icons/ui/inventory/suit.png',
+ "inventory-gloves.png" = 'icons/ui/inventory/gloves.png',
+ "inventory-hand_l.png" = 'icons/ui/inventory/hand_l.png',
+ "inventory-hand_r.png" = 'icons/ui/inventory/hand_r.png',
+ "inventory-shoes.png" = 'icons/ui/inventory/shoes.png',
+ "inventory-suit_storage.png" = 'icons/ui/inventory/suit_storage.png',
+ "inventory-id.png" = 'icons/ui/inventory/id.png',
+ "inventory-belt.png" = 'icons/ui/inventory/belt.png',
+ "inventory-back.png" = 'icons/ui/inventory/back.png',
+ "inventory-pocket.png" = 'icons/ui/inventory/pocket.png',
+ "inventory-collar.png" = 'icons/ui/inventory/collar.png',
)
diff --git a/code/modules/asset_cache/assets/mecha.dm b/code/modules/asset_cache/assets/mecha.dm
index fd4b911e20c..3c2403cf1c3 100644
--- a/code/modules/asset_cache/assets/mecha.dm
+++ b/code/modules/asset_cache/assets/mecha.dm
@@ -2,5 +2,5 @@
name = "mecha_equipment"
/datum/asset/spritesheet/mecha_equipment/create_spritesheets()
- InsertAll("", 'icons/mob/mecha_equipment.dmi')
+ InsertAll("", 'icons/obj/devices/mecha_equipment.dmi')
InsertAll("", 'icons/obj/ore.dmi')
diff --git a/code/modules/asset_cache/assets/notes.dm b/code/modules/asset_cache/assets/notes.dm
index aec6838f967..4f5e42cb158 100644
--- a/code/modules/asset_cache/assets/notes.dm
+++ b/code/modules/asset_cache/assets/notes.dm
@@ -1,7 +1,7 @@
/datum/asset/simple/notes
assets = list(
- "high_button.png" = 'icons/ui_icons/notes/high_button.png',
- "medium_button.png" = 'icons/ui_icons/notes/medium_button.png',
- "minor_button.png" = 'icons/ui_icons/notes/minor_button.png',
- "none_button.png" = 'icons/ui_icons/notes/none_button.png',
+ "high_button.png" = 'icons/ui/notes/high_button.png',
+ "medium_button.png" = 'icons/ui/notes/medium_button.png',
+ "minor_button.png" = 'icons/ui/notes/minor_button.png',
+ "none_button.png" = 'icons/ui/notes/none_button.png',
)
diff --git a/code/modules/asset_cache/assets/orbit.dm b/code/modules/asset_cache/assets/orbit.dm
index 7d0e0d98a0e..8ac22877ecd 100644
--- a/code/modules/asset_cache/assets/orbit.dm
+++ b/code/modules/asset_cache/assets/orbit.dm
@@ -1,4 +1,4 @@
/datum/asset/simple/orbit
assets = list(
- "ghost.png" = 'icons/ui_icons/orbit/ghost.png'
+ "ghost.png" = 'icons/ui/orbit/ghost.png'
)
diff --git a/code/modules/asset_cache/assets/particle_editor.dm b/code/modules/asset_cache/assets/particle_editor.dm
index f5f7bb00987..27f78251759 100644
--- a/code/modules/asset_cache/assets/particle_editor.dm
+++ b/code/modules/asset_cache/assets/particle_editor.dm
@@ -1,17 +1,17 @@
/datum/asset/simple/particle_editor
assets = list(
- "motion" = 'icons/ui_icons/particle_editor/motion.png',
+ "motion" = 'icons/ui/particle_editor/motion.png',
- "uniform" = 'icons/ui_icons/particle_editor/uniform_rand.png',
- "normal" ='icons/ui_icons/particle_editor/normal_rand.png',
- "linear" = 'icons/ui_icons/particle_editor/linear_rand.png',
- "square_rand" = 'icons/ui_icons/particle_editor/square_rand.png',
+ "uniform" = 'icons/ui/particle_editor/uniform_rand.png',
+ "normal" ='icons/ui/particle_editor/normal_rand.png',
+ "linear" = 'icons/ui/particle_editor/linear_rand.png',
+ "square_rand" = 'icons/ui/particle_editor/square_rand.png',
- "num" = 'icons/ui_icons/particle_editor/num_gen.png',
- "vector" = 'icons/ui_icons/particle_editor/vector_gen.png',
- "box" = 'icons/ui_icons/particle_editor/box_gen.png',
- "circle" = 'icons/ui_icons/particle_editor/circle_gen.png',
- "sphere" = 'icons/ui_icons/particle_editor/sphere_gen.png',
- "square" = 'icons/ui_icons/particle_editor/square_gen.png',
- "cube" = 'icons/ui_icons/particle_editor/cube_gen.png',
+ "num" = 'icons/ui/particle_editor/num_gen.png',
+ "vector" = 'icons/ui/particle_editor/vector_gen.png',
+ "box" = 'icons/ui/particle_editor/box_gen.png',
+ "circle" = 'icons/ui/particle_editor/circle_gen.png',
+ "sphere" = 'icons/ui/particle_editor/sphere_gen.png',
+ "square" = 'icons/ui/particle_editor/square_gen.png',
+ "cube" = 'icons/ui/particle_editor/cube_gen.png',
)
diff --git a/code/modules/asset_cache/assets/pda.dm b/code/modules/asset_cache/assets/pda.dm
index 392efa35b91..7fd3f2f40e4 100644
--- a/code/modules/asset_cache/assets/pda.dm
+++ b/code/modules/asset_cache/assets/pda.dm
@@ -1,34 +1,34 @@
/datum/asset/spritesheet/simple/pda
name = "pda"
assets = list(
- "atmos" = 'icons/pda_icons/pda_atmos.png',
- "back" = 'icons/pda_icons/pda_back.png',
- "bell" = 'icons/pda_icons/pda_bell.png',
- "blank" = 'icons/pda_icons/pda_blank.png',
- "boom" = 'icons/pda_icons/pda_boom.png',
- "bucket" = 'icons/pda_icons/pda_bucket.png',
- "medbot" = 'icons/pda_icons/pda_medbot.png',
- "floorbot" = 'icons/pda_icons/pda_floorbot.png',
- "cleanbot" = 'icons/pda_icons/pda_cleanbot.png',
- "crate" = 'icons/pda_icons/pda_crate.png',
- "cuffs" = 'icons/pda_icons/pda_cuffs.png',
- "eject" = 'icons/pda_icons/pda_eject.png',
- "flashlight" = 'icons/pda_icons/pda_flashlight.png',
- "honk" = 'icons/pda_icons/pda_honk.png',
- "mail" = 'icons/pda_icons/pda_mail.png',
- "medical" = 'icons/pda_icons/pda_medical.png',
- "menu" = 'icons/pda_icons/pda_menu.png',
- "mule" = 'icons/pda_icons/pda_mule.png',
- "notes" = 'icons/pda_icons/pda_notes.png',
- "power" = 'icons/pda_icons/pda_power.png',
- "rdoor" = 'icons/pda_icons/pda_rdoor.png',
- "reagent" = 'icons/pda_icons/pda_reagent.png',
- "refresh" = 'icons/pda_icons/pda_refresh.png',
- "scanner" = 'icons/pda_icons/pda_scanner.png',
- "signaler" = 'icons/pda_icons/pda_signaler.png',
- "skills" = 'icons/pda_icons/pda_skills.png',
- "status" = 'icons/pda_icons/pda_status.png',
- "dronephone" = 'icons/pda_icons/pda_dronephone.png',
- "emoji" = 'icons/pda_icons/pda_emoji.png',
- "droneblacklist" = 'icons/pda_icons/pda_droneblacklist.png',
+ "atmos" = 'icons/ui/pda/pda_atmos.png',
+ "back" = 'icons/ui/pda/pda_back.png',
+ "bell" = 'icons/ui/pda/pda_bell.png',
+ "blank" = 'icons/ui/pda/pda_blank.png',
+ "boom" = 'icons/ui/pda/pda_boom.png',
+ "bucket" = 'icons/ui/pda/pda_bucket.png',
+ "medbot" = 'icons/ui/pda/pda_medbot.png',
+ "floorbot" = 'icons/ui/pda/pda_floorbot.png',
+ "cleanbot" = 'icons/ui/pda/pda_cleanbot.png',
+ "crate" = 'icons/ui/pda/pda_crate.png',
+ "cuffs" = 'icons/ui/pda/pda_cuffs.png',
+ "eject" = 'icons/ui/pda/pda_eject.png',
+ "flashlight" = 'icons/ui/pda/pda_flashlight.png',
+ "honk" = 'icons/ui/pda/pda_honk.png',
+ "mail" = 'icons/ui/pda/pda_mail.png',
+ "medical" = 'icons/ui/pda/pda_medical.png',
+ "menu" = 'icons/ui/pda/pda_menu.png',
+ "mule" = 'icons/ui/pda/pda_mule.png',
+ "notes" = 'icons/ui/pda/pda_notes.png',
+ "power" = 'icons/ui/pda/pda_power.png',
+ "rdoor" = 'icons/ui/pda/pda_rdoor.png',
+ "reagent" = 'icons/ui/pda/pda_reagent.png',
+ "refresh" = 'icons/ui/pda/pda_refresh.png',
+ "scanner" = 'icons/ui/pda/pda_scanner.png',
+ "signaler" = 'icons/ui/pda/pda_signaler.png',
+ "skills" = 'icons/ui/pda/pda_skills.png',
+ "status" = 'icons/ui/pda/pda_status.png',
+ "dronephone" = 'icons/ui/pda/pda_dronephone.png',
+ "emoji" = 'icons/ui/pda/pda_emoji.png',
+ "droneblacklist" = 'icons/ui/pda/pda_droneblacklist.png',
)
diff --git a/code/modules/asset_cache/assets/plane_debug.dm b/code/modules/asset_cache/assets/plane_debug.dm
index 0d8ddac162c..eda7244fa9e 100644
--- a/code/modules/asset_cache/assets/plane_debug.dm
+++ b/code/modules/asset_cache/assets/plane_debug.dm
@@ -1,4 +1,4 @@
/datum/asset/simple/plane_background
assets = list(
- "grid_background.png" = 'icons/ui_icons/tgui/grid_background.png'
+ "grid_background.png" = 'icons/ui/tgui/grid_background.png'
)
diff --git a/code/modules/asset_cache/assets/radar.dm b/code/modules/asset_cache/assets/radar.dm
index cef2679a92d..c7642f71fd9 100644
--- a/code/modules/asset_cache/assets/radar.dm
+++ b/code/modules/asset_cache/assets/radar.dm
@@ -1,6 +1,6 @@
/datum/asset/simple/radar_assets
assets = list(
- "ntosradarbackground.png" = 'icons/ui_icons/tgui/ntosradar_background.png',
- "ntosradarpointer.png" = 'icons/ui_icons/tgui/ntosradar_pointer.png',
- "ntosradarpointerS.png" = 'icons/ui_icons/tgui/ntosradar_pointer_S.png'
+ "ntosradarbackground.png" = 'icons/ui/tgui/ntosradar_background.png',
+ "ntosradarpointer.png" = 'icons/ui/tgui/ntosradar_pointer.png',
+ "ntosradarpointerS.png" = 'icons/ui/tgui/ntosradar_pointer_S.png'
)
diff --git a/code/modules/asset_cache/assets/safe.dm b/code/modules/asset_cache/assets/safe.dm
index b1d6ba9a8aa..0bca5b6659c 100644
--- a/code/modules/asset_cache/assets/safe.dm
+++ b/code/modules/asset_cache/assets/safe.dm
@@ -1,4 +1,4 @@
/datum/asset/simple/safe
assets = list(
- "safe_dial.png" = 'icons/ui_icons/safe/safe_dial.png'
+ "safe_dial.png" = 'icons/ui/safe/safe_dial.png'
)
diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm
index ca48ec2767e..d9a0a0faf63 100644
--- a/code/modules/buildmode/buttons.dm
+++ b/code/modules/buildmode/buttons.dm
@@ -1,5 +1,5 @@
/atom/movable/screen/buildmode
- icon = 'icons/misc/buildmode.dmi'
+ icon = 'icons/hud/buildmode.dmi'
var/datum/buildmode/bd
// If we don't do this, we get occluded by item action buttons
plane = ABOVE_HUD_PLANE
diff --git a/code/modules/cargo/markets/market_uplink.dm b/code/modules/cargo/markets/market_uplink.dm
index da86161e46a..df8c8eb36a5 100644
--- a/code/modules/cargo/markets/market_uplink.dm
+++ b/code/modules/cargo/markets/market_uplink.dm
@@ -1,7 +1,7 @@
/obj/item/market_uplink
name = "\improper Market Uplink"
desc = "An market uplink. Usable with markets. You probably shouldn't have this!"
- icon = 'icons/obj/blackmarket.dmi'
+ icon = 'icons/obj/devices/blackmarket.dmi'
icon_state = "uplink"
// UI variables.
@@ -151,7 +151,7 @@
/obj/item/market_uplink/blackmarket
name = "\improper Black Market Uplink"
desc = "An illegal black market uplink. If command wanted you to have these, they wouldn't have made it so hard to get one."
- icon = 'icons/obj/blackmarket.dmi'
+ icon = 'icons/obj/devices/blackmarket.dmi'
icon_state = "uplink"
//The original black market uplink
accessible_markets = list(/datum/market/blackmarket)
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 49583ce7015..baabaa610c5 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -80,7 +80,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
var/keyname = key
if(prefs.unlock_content)
if(prefs.toggles & MEMBER_PUBLIC)
- keyname = "[icon2html('icons/ui_icons/chat/member_content.dmi', world, "blag")][keyname]"
+ keyname = "[icon2html('icons/ui/chat/member_content.dmi', world, "blag")][keyname]"
if(prefs.hearted)
var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
keyname = "[sheet.icon_tag("emoji-heart")][keyname]"
diff --git a/code/modules/language/_language.dm b/code/modules/language/_language.dm
index 94ea4a6aa40..6a00610c0ad 100644
--- a/code/modules/language/_language.dm
+++ b/code/modules/language/_language.dm
@@ -32,7 +32,7 @@
var/always_use_default_namelist = FALSE
/// Icon displayed in the chat window when speaking this language.
/// if you are seeing someone speak popcorn language, then something is wrong.
- var/icon = 'icons/misc/language.dmi'
+ var/icon = 'icons/ui/chat/language.dmi'
/// Icon state displayed in the chat window when speaking this language.
var/icon_state = "popcorn"
diff --git a/code/modules/mining/equipment/miningradio.dm b/code/modules/mining/equipment/miningradio.dm
index c6fa3a34fc3..61d80bfce6f 100644
--- a/code/modules/mining/equipment/miningradio.dm
+++ b/code/modules/mining/equipment/miningradio.dm
@@ -1,6 +1,6 @@
/// Portable mining radio purchasable by miners
/obj/item/radio/weather_monitor
- icon = 'icons/obj/miningradio.dmi'
+ icon = 'icons/obj/devices/miningradio.dmi'
name = "mining weather radio"
icon_state = "miningradio"
desc = "A weather radio designed for use in inhospitable environments. Gives audible warnings when storms approach. Has access to cargo channel."
diff --git a/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid_abilities.dm b/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid_abilities.dm
index d82812b62a3..2d2b69d119a 100644
--- a/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid_abilities.dm
+++ b/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid_abilities.dm
@@ -2,7 +2,7 @@
/datum/action/cooldown/spell/pointed/projectile/flesh_restraints
name = "fleshy restraints"
desc = "Launch at your prey to immobilize them."
- button_icon = 'icons/obj/restraints.dmi'
+ button_icon = 'icons/obj/weapons/restraints.dmi'
button_icon_state = "flesh_snare"
cooldown_time = 6 SECONDS
diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm
index 8980a1017f2..97ea9ebedc9 100644
--- a/code/modules/mob/living/silicon/ai/multicam.dm
+++ b/code/modules/mob/living/silicon/ai/multicam.dm
@@ -24,7 +24,7 @@
/atom/movable/screen/movable/pic_in_pic/ai/make_backgrounds()
..()
highlighted_background = new /mutable_appearance()
- highlighted_background.icon = 'icons/misc/pic_in_pic.dmi'
+ highlighted_background.icon = 'icons/hud/pic_in_pic.dmi'
highlighted_background.icon_state = "background_highlight"
highlighted_background.layer = SPACE_LAYER
@@ -84,7 +84,7 @@
/turf/open/ai_visible
name = ""
- icon = 'icons/misc/pic_in_pic.dmi'
+ icon = 'icons/hud/pic_in_pic.dmi'
icon_state = "room_background"
turf_flags = NOJAUNT
diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm
index b55fb6d2ee6..523c241724e 100644
--- a/code/modules/modular_computers/computers/item/laptop.dm
+++ b/code/modules/modular_computers/computers/item/laptop.dm
@@ -2,7 +2,7 @@
name = "laptop"
desc = "A portable laptop computer."
- icon = 'icons/obj/modular_laptop.dmi'
+ icon = 'icons/obj/devices/modular_laptop.dmi'
icon_state = "laptop-closed"
icon_state_powered = "laptop"
icon_state_unpowered = "laptop-off"
diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm
index e5c8c8da89c..8935161089b 100644
--- a/code/modules/modular_computers/computers/item/pda.dm
+++ b/code/modules/modular_computers/computers/item/pda.dm
@@ -1,6 +1,6 @@
/obj/item/modular_computer/pda
name = "pda"
- icon = 'icons/obj/modular_pda.dmi'
+ icon = 'icons/obj/devices/modular_pda.dmi'
icon_state = "pda"
worn_icon_state = "nothing"
base_icon_state = "tablet"
diff --git a/code/modules/modular_computers/file_system/programs/virtual_pet.dm b/code/modules/modular_computers/file_system/programs/virtual_pet.dm
index 1a1c69b9748..7a0adba3cce 100644
--- a/code/modules/modular_computers/file_system/programs/virtual_pet.dm
+++ b/code/modules/modular_computers/file_system/programs/virtual_pet.dm
@@ -45,10 +45,10 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
var/max_hunger = 500
///pet icon for each state
var/static/list/pet_state_icons = list(
- PET_STATE_HUNGRY = list("icon" = 'icons/ui_icons/virtualpet/pet_state.dmi', "icon_state" = "pet_hungry"),
- PET_STATE_HAPPY = list("icon" = 'icons/ui_icons/virtualpet/pet_state.dmi', "icon_state" = "pet_happy"),
- PET_STATE_ASLEEP = list("icon" = 'icons/ui_icons/virtualpet/pet_state.dmi', "icon_state" = "pet_asleep"),
- PET_STATE_NEUTRAL = list("icon" = 'icons/ui_icons/virtualpet/pet_state.dmi', "icon_state" = "pet_neutral"),
+ PET_STATE_HUNGRY = list("icon" = 'icons/ui/virtualpet/pet_state.dmi', "icon_state" = "pet_hungry"),
+ PET_STATE_HAPPY = list("icon" = 'icons/ui/virtualpet/pet_state.dmi', "icon_state" = "pet_happy"),
+ PET_STATE_ASLEEP = list("icon" = 'icons/ui/virtualpet/pet_state.dmi', "icon_state" = "pet_asleep"),
+ PET_STATE_NEUTRAL = list("icon" = 'icons/ui/virtualpet/pet_state.dmi', "icon_state" = "pet_neutral"),
)
///hat options and what level they will be unlocked at
var/static/list/hat_selections = list(
@@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
/datum/computer_file/program/virtual_pet/on_install()
. = ..()
- profile_picture = getFlatIcon(image(icon = 'icons/ui_icons/virtualpet/pet_state.dmi', icon_state = "pet_preview"))
+ profile_picture = getFlatIcon(image(icon = 'icons/ui/virtualpet/pet_state.dmi', icon_state = "pet_preview"))
GLOB.virtual_pets_list += src
pet = new pet_type(computer)
pet.forceMove(computer)
@@ -188,7 +188,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
overlays += selected_hat["appearance"]
/datum/computer_file/program/virtual_pet/proc/alter_profile_picture()
- var/image/pet_preview = image(icon = 'icons/ui_icons/virtualpet/pet_state.dmi', icon_state = "pet_preview")
+ var/image/pet_preview = image(icon = 'icons/ui/virtualpet/pet_state.dmi', icon_state = "pet_preview")
if(LAZYACCESS(pet.atom_colours, FIXED_COLOUR_PRIORITY))
pet_preview.color = pet.atom_colours[FIXED_COLOUR_PRIORITY]
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 2e95b129146..ee2a20eb788 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -505,7 +505,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
if(!user)
return
- var/image/restraints_icon = image(icon = 'icons/obj/restraints.dmi', icon_state = "cuff")
+ var/image/restraints_icon = image(icon = 'icons/obj/weapons/restraints.dmi', icon_state = "cuff")
restraints_icon.maptext = MAPTEXT("= CABLE_RESTRAINTS_COST ? "" : "style='color: red'"]>[CABLE_RESTRAINTS_COST]")
restraints_icon.color = color
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 7608d0dd74f..812dc2267fb 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -72,7 +72,7 @@
var/area/area = get_area(src)
if(area)
- var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/cult/effects.dmi', "ghostalertsie")
+ var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/cult.dmi', "ghostalertsie")
notify_ghosts(
"Nar'Sie has risen in [area]. Reach out to the Geometer to be given a new shell for your soul.",
source = src,
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index b6d8108bb54..d70a91d36eb 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -23,7 +23,7 @@
/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg
desc = "A 6-shot grenade launcher."
name = "multi grenade launcher"
- icon = 'icons/mob/mecha_equipment.dmi'
+ icon = 'icons/obj/devices/mecha_equipment.dmi'
icon_state = "mecha_grenadelnchr"
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti
pin = /obj/item/firing_pin
diff --git a/code/modules/reagents/reagent_containers/misc.dm b/code/modules/reagents/reagent_containers/misc.dm
index f631e8e28a0..db9935d3ea2 100644
--- a/code/modules/reagents/reagent_containers/misc.dm
+++ b/code/modules/reagents/reagent_containers/misc.dm
@@ -1,7 +1,7 @@
/obj/item/reagent_containers/cup/maunamug
name = "mauna mug"
desc = "A drink served in a classy mug. Now with built-in heating!"
- icon = 'icons/obj/mauna_mug.dmi'
+ icon = 'icons/obj/devices/mauna_mug.dmi'
icon_state = "maunamug"
base_icon_state = "maunamug"
spillable = TRUE
diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm
index 4eca7cd4eba..faf95e8cd73 100644
--- a/code/modules/vehicles/_vehicle.dm
+++ b/code/modules/vehicles/_vehicle.dm
@@ -1,7 +1,7 @@
/obj/vehicle
name = "generic vehicle"
desc = "Yell at coderbus."
- icon = 'icons/obj/vehicles.dmi'
+ icon = 'icons/mob/rideables/vehicles.dmi'
icon_state = "error"
max_integrity = 300
armor_type = /datum/armor/obj_vehicle
diff --git a/code/modules/vehicles/lavaboat.dm b/code/modules/vehicles/lavaboat.dm
index e45f062d1a2..0336ff486dd 100644
--- a/code/modules/vehicles/lavaboat.dm
+++ b/code/modules/vehicles/lavaboat.dm
@@ -20,7 +20,7 @@
/obj/item/oar
name = "oar"
desc = "Not to be confused with the kind Research hassles you for."
- icon = 'icons/obj/vehicles.dmi'
+ icon = 'icons/mob/rideables/vehicles.dmi'
icon_state = "oar"
inhand_icon_state = "oar"
lefthand_file = 'icons/mob/inhands/items/lavaland_lefthand.dmi'
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index ca1728f3fc0..1155e6293d2 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -20,7 +20,7 @@
/obj/vehicle/sealed/mecha
name = "exosuit"
desc = "Exosuit"
- icon = 'icons/mob/mecha.dmi'
+ icon = 'icons/mob/rideables/mecha.dmi'
resistance_flags = FIRE_PROOF | ACID_PROOF
max_integrity = 300
armor_type = /datum/armor/sealed_mecha
diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
index 237a0d971b0..a0f50622e06 100644
--- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
+++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
@@ -15,7 +15,7 @@
/obj/vehicle/sealed/mecha/savannah_ivanov
name = "\improper Savannah-Ivanov"
desc = "An insanely overbulked mecha that handily crushes single-pilot opponents. The price is that you need two pilots to use it."
- icon = 'icons/mob/coop_mech.dmi'
+ icon = 'icons/mob/rideables/coop_mech.dmi'
base_icon_state = "savannah_ivanov"
icon_state = "savannah_ivanov_0_0"
//does not include mmi compatibility
diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
index b80ac6ef025..755f45d52b4 100644
--- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
+++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
@@ -4,7 +4,7 @@
*/
/obj/item/mecha_parts/mecha_equipment
name = "mecha equipment"
- icon = 'icons/mob/mecha_equipment.dmi'
+ icon = 'icons/obj/devices/mecha_equipment.dmi'
icon_state = "mecha_equip"
force = 5
max_integrity = 300
diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
index 6a70d4db9f0..4d3b682b427 100644
--- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
@@ -508,7 +508,7 @@
/obj/item/mecha_parts/camera_kit
name = "exosuit-mounted camera"
desc = "A security camera meant for exosuit-mounted surveillance-on-the-go."
- icon = 'icons/mob/mecha_equipment.dmi'
+ icon = 'icons/obj/devices/mecha_equipment.dmi'
icon_state = "mecha_camera"
w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm
index 0ad7bdf84a0..828bb6f152c 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm
@@ -2,7 +2,7 @@
name = "generic ammo box"
desc = "A box of ammo for an unknown weapon."
w_class = WEIGHT_CLASS_BULKY
- icon = 'icons/mob/mecha_ammo.dmi'
+ icon = 'icons/obj/weapons/guns/mecha_ammo.dmi'
icon_state = "empty"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
diff --git a/code/modules/vehicles/mecha/mecha_construction_paths.dm b/code/modules/vehicles/mecha/mecha_construction_paths.dm
index 9a05e3df696..28f5a7e9fb3 100644
--- a/code/modules/vehicles/mecha/mecha_construction_paths.dm
+++ b/code/modules/vehicles/mecha/mecha_construction_paths.dm
@@ -62,7 +62,7 @@
/datum/component/construction/unordered/mecha_chassis/spawn_result()
var/atom/parent_atom = parent
- parent_atom.icon = 'icons/mob/mech_construction.dmi'
+ parent_atom.icon = 'icons/mob/rideables/mech_construction.dmi'
parent_atom.set_density(TRUE)
parent_atom.cut_overlays()
..()
@@ -580,7 +580,7 @@
/datum/component/construction/mecha/honker/update_parent(step_index)
if(step_index == 1)
var/atom/parent_atom = parent
- parent_atom.icon = 'icons/mob/mech_construct.dmi'
+ parent_atom.icon = 'icons/mob/rideables/mech_construct.dmi'
parent_atom.icon_state = "honker_chassis"
..()
diff --git a/code/modules/vehicles/mecha/mecha_parts.dm b/code/modules/vehicles/mecha/mecha_parts.dm
index bec0fefcc6d..2a08f62bfac 100644
--- a/code/modules/vehicles/mecha/mecha_parts.dm
+++ b/code/modules/vehicles/mecha/mecha_parts.dm
@@ -4,7 +4,7 @@
/obj/item/mecha_parts
name = "mecha part"
- icon = 'icons/mob/mech_construct.dmi'
+ icon = 'icons/mob/rideables/mech_construct.dmi'
icon_state = "blank"
w_class = WEIGHT_CLASS_GIGANTIC
obj_flags = CONDUCTS_ELECTRICITY
diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm
index 8896b7268fe..dc0414e8606 100644
--- a/code/modules/vehicles/mecha/mecha_wreckage.dm
+++ b/code/modules/vehicles/mecha/mecha_wreckage.dm
@@ -6,7 +6,7 @@
/obj/structure/mecha_wreckage
name = "exosuit wreckage"
desc = "Remains of some unfortunate mecha. Completely irreparable, but perhaps something can be salvaged."
- icon = 'icons/mob/mecha.dmi'
+ icon = 'icons/mob/rideables/mecha.dmi'
density = TRUE
anchored = FALSE
opacity = FALSE
@@ -224,7 +224,7 @@
/obj/structure/mecha_wreckage/savannah_ivanov
name = "\improper Savannah-Ivanov wreckage"
- icon = 'icons/mob/coop_mech.dmi'
+ icon = 'icons/mob/rideables/coop_mech.dmi'
icon_state = "savannah_ivanov-broken"
welder_salvage = list(/obj/item/stack/sheet/mineral/silver, /obj/item/stack/sheet/iron, /obj/item/stack/rods)
parts = list(
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index a4f36524483..0cfde3de8ad 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -224,7 +224,7 @@
/obj/item/scooter_frame
name = "scooter frame"
desc = "A metal frame for building a scooter. Looks like you'll need to add some iron to make wheels."
- icon = 'icons/obj/vehicles.dmi'
+ icon = 'icons/mob/rideables/vehicles.dmi'
icon_state = "scooter_frame"
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/vehicles/vehicle_key.dm b/code/modules/vehicles/vehicle_key.dm
index 08cb75df2d4..f8db861449f 100644
--- a/code/modules/vehicles/vehicle_key.dm
+++ b/code/modules/vehicles/vehicle_key.dm
@@ -1,7 +1,7 @@
/obj/item/key
name = "key"
desc = "A small grey key."
- icon = 'icons/obj/vehicles.dmi'
+ icon = 'icons/mob/rideables/vehicles.dmi'
icon_state = "key"
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm
index d40b57276c0..92386b0fbc3 100644
--- a/code/modules/vehicles/wheelchair.dm
+++ b/code/modules/vehicles/wheelchair.dm
@@ -1,7 +1,7 @@
/obj/vehicle/ridden/wheelchair //ported from Hippiestation (by Jujumatic)
name = "wheelchair"
desc = "A chair with big wheels. It looks like you can move in this on your own."
- icon = 'icons/obj/vehicles.dmi'
+ icon = 'icons/mob/rideables/vehicles.dmi'
icon_state = "wheelchair"
layer = OBJ_LAYER
max_integrity = 100
@@ -90,7 +90,7 @@
/obj/item/wheelchair
name = "wheelchair"
desc = "A collapsed wheelchair that can be carried around."
- icon = 'icons/obj/vehicles.dmi'
+ icon = 'icons/mob/rideables/vehicles.dmi'
icon_state = "wheelchair_folded"
inhand_icon_state = "wheelchair_folded"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
@@ -105,7 +105,7 @@
/obj/item/wheelchair/gold
name = "gold wheelchair"
desc = "A collapsed, shiny wheelchair that can be carried around."
- icon = 'icons/obj/vehicles.dmi'
+ icon = 'icons/mob/rideables/vehicles.dmi'
icon_state = "wheelchair_folded_gold"
inhand_icon_state = "wheelchair_folded_gold"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
diff --git a/icons/effects/cult/effects.dmi b/icons/effects/cult.dmi
similarity index 100%
rename from icons/effects/cult/effects.dmi
rename to icons/effects/cult.dmi
diff --git a/icons/effects/effects_rcd.dmi b/icons/effects/rcd.dmi
similarity index 100%
rename from icons/effects/effects_rcd.dmi
rename to icons/effects/rcd.dmi
diff --git a/icons/misc/buildmode.dmi b/icons/hud/buildmode.dmi
similarity index 100%
rename from icons/misc/buildmode.dmi
rename to icons/hud/buildmode.dmi
diff --git a/icons/misc/pic_in_pic.dmi b/icons/hud/pic_in_pic.dmi
similarity index 100%
rename from icons/misc/pic_in_pic.dmi
rename to icons/hud/pic_in_pic.dmi
diff --git a/icons/mob/animal_item_head.dmi b/icons/mob/animal_item_head.dmi
deleted file mode 100644
index 6afabf22f76..00000000000
Binary files a/icons/mob/animal_item_head.dmi and /dev/null differ
diff --git a/icons/effects/creampie.dmi b/icons/mob/effects/creampie.dmi
similarity index 100%
rename from icons/effects/creampie.dmi
rename to icons/mob/effects/creampie.dmi
diff --git a/icons/effects/cult/halo.dmi b/icons/mob/effects/halo.dmi
similarity index 100%
rename from icons/effects/cult/halo.dmi
rename to icons/mob/effects/halo.dmi
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
deleted file mode 100644
index 8ddeaa0c3f4..00000000000
Binary files a/icons/mob/pets.dmi and /dev/null differ
diff --git a/icons/mob/pets_held_lh.dmi b/icons/mob/pets_held_lh.dmi
deleted file mode 100644
index 1a864db1341..00000000000
Binary files a/icons/mob/pets_held_lh.dmi and /dev/null differ
diff --git a/icons/mob/pets_held_rh.dmi b/icons/mob/pets_held_rh.dmi
deleted file mode 100644
index 39332a7e18e..00000000000
Binary files a/icons/mob/pets_held_rh.dmi and /dev/null differ
diff --git a/icons/mob/coop_mech.dmi b/icons/mob/rideables/coop_mech.dmi
similarity index 100%
rename from icons/mob/coop_mech.dmi
rename to icons/mob/rideables/coop_mech.dmi
diff --git a/icons/mob/mech_construct.dmi b/icons/mob/rideables/mech_construct.dmi
similarity index 100%
rename from icons/mob/mech_construct.dmi
rename to icons/mob/rideables/mech_construct.dmi
diff --git a/icons/mob/mech_construction.dmi b/icons/mob/rideables/mech_construction.dmi
similarity index 100%
rename from icons/mob/mech_construction.dmi
rename to icons/mob/rideables/mech_construction.dmi
diff --git a/icons/mob/mecha.dmi b/icons/mob/rideables/mecha.dmi
similarity index 100%
rename from icons/mob/mecha.dmi
rename to icons/mob/rideables/mecha.dmi
diff --git a/icons/obj/vehicles.dmi b/icons/mob/rideables/vehicles.dmi
similarity index 100%
rename from icons/obj/vehicles.dmi
rename to icons/mob/rideables/vehicles.dmi
diff --git a/icons/mob/telegraphing/telegraph.dmi b/icons/mob/telegraphing/telegraph.dmi
index de525ead4ee..b1ff26a4a10 100644
Binary files a/icons/mob/telegraphing/telegraph.dmi and b/icons/mob/telegraphing/telegraph.dmi differ
diff --git a/icons/obj/blackmarket.dmi b/icons/obj/devices/blackmarket.dmi
similarity index 100%
rename from icons/obj/blackmarket.dmi
rename to icons/obj/devices/blackmarket.dmi
diff --git a/icons/obj/mauna_mug.dmi b/icons/obj/devices/mauna_mug.dmi
similarity index 100%
rename from icons/obj/mauna_mug.dmi
rename to icons/obj/devices/mauna_mug.dmi
diff --git a/icons/mob/mecha_equipment.dmi b/icons/obj/devices/mecha_equipment.dmi
similarity index 100%
rename from icons/mob/mecha_equipment.dmi
rename to icons/obj/devices/mecha_equipment.dmi
diff --git a/icons/obj/miningradio.dmi b/icons/obj/devices/miningradio.dmi
similarity index 100%
rename from icons/obj/miningradio.dmi
rename to icons/obj/devices/miningradio.dmi
diff --git a/icons/obj/modular_laptop.dmi b/icons/obj/devices/modular_laptop.dmi
similarity index 100%
rename from icons/obj/modular_laptop.dmi
rename to icons/obj/devices/modular_laptop.dmi
diff --git a/icons/obj/modular_pda.dmi b/icons/obj/devices/modular_pda.dmi
similarity index 100%
rename from icons/obj/modular_pda.dmi
rename to icons/obj/devices/modular_pda.dmi
diff --git a/icons/obj/pda.dmi b/icons/obj/devices/pda.dmi
similarity index 100%
rename from icons/obj/pda.dmi
rename to icons/obj/devices/pda.dmi
diff --git a/icons/misc/beach.dmi b/icons/obj/fluff/beach.dmi
similarity index 100%
rename from icons/misc/beach.dmi
rename to icons/obj/fluff/beach.dmi
diff --git a/icons/misc/beach2.dmi b/icons/obj/fluff/beach2.dmi
similarity index 100%
rename from icons/misc/beach2.dmi
rename to icons/obj/fluff/beach2.dmi
diff --git a/icons/obj/medicart.dmi b/icons/obj/medical/medicart.dmi
similarity index 100%
rename from icons/obj/medicart.dmi
rename to icons/obj/medical/medicart.dmi
diff --git a/icons/mob/mecha_ammo.dmi b/icons/obj/weapons/guns/mecha_ammo.dmi
similarity index 100%
rename from icons/mob/mecha_ammo.dmi
rename to icons/obj/weapons/guns/mecha_ammo.dmi
diff --git a/icons/obj/restraints.dmi b/icons/obj/weapons/restraints.dmi
similarity index 100%
rename from icons/obj/restraints.dmi
rename to icons/obj/weapons/restraints.dmi
diff --git a/icons/misc/Font_Minimal.dmi b/icons/testing/Font_Minimal.dmi
similarity index 100%
rename from icons/misc/Font_Minimal.dmi
rename to icons/testing/Font_Minimal.dmi
diff --git a/icons/misc/colortest.dmi b/icons/testing/colortest.dmi
similarity index 100%
rename from icons/misc/colortest.dmi
rename to icons/testing/colortest.dmi
diff --git a/icons/misc/hidden.dmi b/icons/testing/hidden.dmi
similarity index 100%
rename from icons/misc/hidden.dmi
rename to icons/testing/hidden.dmi
diff --git a/icons/ui_icons/achievements/achievements.dmi b/icons/ui/achievements/achievements.dmi
similarity index 100%
rename from icons/ui_icons/achievements/achievements.dmi
rename to icons/ui/achievements/achievements.dmi
diff --git a/icons/ui_icons/adventure/default.png b/icons/ui/adventure/default.png
similarity index 100%
rename from icons/ui_icons/adventure/default.png
rename to icons/ui/adventure/default.png
diff --git a/icons/ui_icons/adventure/grue.png b/icons/ui/adventure/grue.png
similarity index 100%
rename from icons/ui_icons/adventure/grue.png
rename to icons/ui/adventure/grue.png
diff --git a/icons/ui_icons/adventure/signal_lost.png b/icons/ui/adventure/signal_lost.png
similarity index 100%
rename from icons/ui_icons/adventure/signal_lost.png
rename to icons/ui/adventure/signal_lost.png
diff --git a/icons/ui_icons/adventure/trade.png b/icons/ui/adventure/trade.png
similarity index 100%
rename from icons/ui_icons/adventure/trade.png
rename to icons/ui/adventure/trade.png
diff --git a/icons/ui_icons/antags/badass.dmi b/icons/ui/antags/badass.dmi
similarity index 100%
rename from icons/ui_icons/antags/badass.dmi
rename to icons/ui/antags/badass.dmi
diff --git a/icons/ui_icons/antags/obsessed.dmi b/icons/ui/antags/obsessed.dmi
similarity index 100%
rename from icons/ui_icons/antags/obsessed.dmi
rename to icons/ui/antags/obsessed.dmi
diff --git a/icons/ui_icons/arcade/boss1.gif b/icons/ui/arcade/boss1.gif
similarity index 100%
rename from icons/ui_icons/arcade/boss1.gif
rename to icons/ui/arcade/boss1.gif
diff --git a/icons/ui_icons/arcade/boss2.gif b/icons/ui/arcade/boss2.gif
similarity index 100%
rename from icons/ui_icons/arcade/boss2.gif
rename to icons/ui/arcade/boss2.gif
diff --git a/icons/ui_icons/arcade/boss3.gif b/icons/ui/arcade/boss3.gif
similarity index 100%
rename from icons/ui_icons/arcade/boss3.gif
rename to icons/ui/arcade/boss3.gif
diff --git a/icons/ui_icons/arcade/boss4.gif b/icons/ui/arcade/boss4.gif
similarity index 100%
rename from icons/ui_icons/arcade/boss4.gif
rename to icons/ui/arcade/boss4.gif
diff --git a/icons/ui_icons/arcade/boss5.gif b/icons/ui/arcade/boss5.gif
similarity index 100%
rename from icons/ui_icons/arcade/boss5.gif
rename to icons/ui/arcade/boss5.gif
diff --git a/icons/ui_icons/arcade/boss6.gif b/icons/ui/arcade/boss6.gif
similarity index 100%
rename from icons/ui_icons/arcade/boss6.gif
rename to icons/ui/arcade/boss6.gif
diff --git a/icons/ui_icons/arcade/fireplace.png b/icons/ui/arcade/fireplace.png
similarity index 100%
rename from icons/ui_icons/arcade/fireplace.png
rename to icons/ui/arcade/fireplace.png
diff --git a/icons/ui_icons/arcade/shopkeeper.png b/icons/ui/arcade/shopkeeper.png
similarity index 100%
rename from icons/ui_icons/arcade/shopkeeper.png
rename to icons/ui/arcade/shopkeeper.png
diff --git a/icons/ui_icons/chat/chat_icons.dmi b/icons/ui/chat/chat_icons.dmi
similarity index 100%
rename from icons/ui_icons/chat/chat_icons.dmi
rename to icons/ui/chat/chat_icons.dmi
diff --git a/icons/ui_icons/emoji/emoji.dmi b/icons/ui/chat/emoji.dmi
similarity index 100%
rename from icons/ui_icons/emoji/emoji.dmi
rename to icons/ui/chat/emoji.dmi
diff --git a/icons/misc/language.dmi b/icons/ui/chat/language.dmi
similarity index 100%
rename from icons/misc/language.dmi
rename to icons/ui/chat/language.dmi
diff --git a/icons/ui_icons/chat/member_content.dmi b/icons/ui/chat/member_content.dmi
similarity index 100%
rename from icons/ui_icons/chat/member_content.dmi
rename to icons/ui/chat/member_content.dmi
diff --git a/icons/misc/pepe.dmi b/icons/ui/chat/pepe.dmi
similarity index 100%
rename from icons/misc/pepe.dmi
rename to icons/ui/chat/pepe.dmi
diff --git a/icons/misc/clickbox.dmi b/icons/ui/clickbox.dmi
similarity index 100%
rename from icons/misc/clickbox.dmi
rename to icons/ui/clickbox.dmi
diff --git a/icons/ui_icons/common/padlock.png b/icons/ui/common/padlock.png
similarity index 100%
rename from icons/ui_icons/common/padlock.png
rename to icons/ui/common/padlock.png
diff --git a/icons/ui_icons/common/tg_16.png b/icons/ui/common/tg_16.png
similarity index 100%
rename from icons/ui_icons/common/tg_16.png
rename to icons/ui/common/tg_16.png
diff --git a/icons/ui_icons/common/tg_32.png b/icons/ui/common/tg_32.png
similarity index 100%
rename from icons/ui_icons/common/tg_32.png
rename to icons/ui/common/tg_32.png
diff --git a/icons/ui_icons/condiments/bbqsauce.png b/icons/ui/condiments/bbqsauce.png
similarity index 100%
rename from icons/ui_icons/condiments/bbqsauce.png
rename to icons/ui/condiments/bbqsauce.png
diff --git a/icons/ui_icons/condiments/bottle.png b/icons/ui/condiments/bottle.png
similarity index 100%
rename from icons/ui_icons/condiments/bottle.png
rename to icons/ui/condiments/bottle.png
diff --git a/icons/ui_icons/condiments/cherryjelly.png b/icons/ui/condiments/cherryjelly.png
similarity index 100%
rename from icons/ui_icons/condiments/cherryjelly.png
rename to icons/ui/condiments/cherryjelly.png
diff --git a/icons/ui_icons/condiments/coldsauce.png b/icons/ui/condiments/coldsauce.png
similarity index 100%
rename from icons/ui_icons/condiments/coldsauce.png
rename to icons/ui/condiments/coldsauce.png
diff --git a/icons/ui_icons/condiments/condi_empty.png b/icons/ui/condiments/condi_empty.png
similarity index 100%
rename from icons/ui_icons/condiments/condi_empty.png
rename to icons/ui/condiments/condi_empty.png
diff --git a/icons/ui_icons/condiments/cookingoil.png b/icons/ui/condiments/cookingoil.png
similarity index 100%
rename from icons/ui_icons/condiments/cookingoil.png
rename to icons/ui/condiments/cookingoil.png
diff --git a/icons/ui_icons/condiments/enzyme.png b/icons/ui/condiments/enzyme.png
similarity index 100%
rename from icons/ui_icons/condiments/enzyme.png
rename to icons/ui/condiments/enzyme.png
diff --git a/icons/ui_icons/condiments/flour.png b/icons/ui/condiments/flour.png
similarity index 100%
rename from icons/ui_icons/condiments/flour.png
rename to icons/ui/condiments/flour.png
diff --git a/icons/ui_icons/condiments/honey.png b/icons/ui/condiments/honey.png
similarity index 100%
rename from icons/ui_icons/condiments/honey.png
rename to icons/ui/condiments/honey.png
diff --git a/icons/ui_icons/condiments/hotsauce.png b/icons/ui/condiments/hotsauce.png
similarity index 100%
rename from icons/ui_icons/condiments/hotsauce.png
rename to icons/ui/condiments/hotsauce.png
diff --git a/icons/ui_icons/condiments/ketchup.png b/icons/ui/condiments/ketchup.png
similarity index 100%
rename from icons/ui_icons/condiments/ketchup.png
rename to icons/ui/condiments/ketchup.png
diff --git a/icons/ui_icons/condiments/mayonnaise.png b/icons/ui/condiments/mayonnaise.png
similarity index 100%
rename from icons/ui_icons/condiments/mayonnaise.png
rename to icons/ui/condiments/mayonnaise.png
diff --git a/icons/ui_icons/condiments/milk.png b/icons/ui/condiments/milk.png
similarity index 100%
rename from icons/ui_icons/condiments/milk.png
rename to icons/ui/condiments/milk.png
diff --git a/icons/ui_icons/condiments/oliveoil.png b/icons/ui/condiments/oliveoil.png
similarity index 100%
rename from icons/ui_icons/condiments/oliveoil.png
rename to icons/ui/condiments/oliveoil.png
diff --git a/icons/ui_icons/condiments/peanutbutter.png b/icons/ui/condiments/peanutbutter.png
similarity index 100%
rename from icons/ui_icons/condiments/peanutbutter.png
rename to icons/ui/condiments/peanutbutter.png
diff --git a/icons/ui_icons/condiments/peppermillsmall.png b/icons/ui/condiments/peppermillsmall.png
similarity index 100%
rename from icons/ui_icons/condiments/peppermillsmall.png
rename to icons/ui/condiments/peppermillsmall.png
diff --git a/icons/ui_icons/condiments/rice.png b/icons/ui/condiments/rice.png
similarity index 100%
rename from icons/ui_icons/condiments/rice.png
rename to icons/ui/condiments/rice.png
diff --git a/icons/ui_icons/condiments/saltshakersmall.png b/icons/ui/condiments/saltshakersmall.png
similarity index 100%
rename from icons/ui_icons/condiments/saltshakersmall.png
rename to icons/ui/condiments/saltshakersmall.png
diff --git a/icons/ui_icons/condiments/soymilk.png b/icons/ui/condiments/soymilk.png
similarity index 100%
rename from icons/ui_icons/condiments/soymilk.png
rename to icons/ui/condiments/soymilk.png
diff --git a/icons/ui_icons/condiments/soysauce.png b/icons/ui/condiments/soysauce.png
similarity index 100%
rename from icons/ui_icons/condiments/soysauce.png
rename to icons/ui/condiments/soysauce.png
diff --git a/icons/ui_icons/condiments/sugar.png b/icons/ui/condiments/sugar.png
similarity index 100%
rename from icons/ui_icons/condiments/sugar.png
rename to icons/ui/condiments/sugar.png
diff --git a/icons/ui_icons/contracts/bluespace.png b/icons/ui/contracts/bluespace.png
similarity index 100%
rename from icons/ui_icons/contracts/bluespace.png
rename to icons/ui/contracts/bluespace.png
diff --git a/icons/ui_icons/contracts/destruction.png b/icons/ui/contracts/destruction.png
similarity index 100%
rename from icons/ui_icons/contracts/destruction.png
rename to icons/ui/contracts/destruction.png
diff --git a/icons/ui_icons/contracts/healing.png b/icons/ui/contracts/healing.png
similarity index 100%
rename from icons/ui_icons/contracts/healing.png
rename to icons/ui/contracts/healing.png
diff --git a/icons/ui_icons/contracts/robeless.png b/icons/ui/contracts/robeless.png
similarity index 100%
rename from icons/ui_icons/contracts/robeless.png
rename to icons/ui/contracts/robeless.png
diff --git a/icons/ui_icons/dna/dna_discovered.gif b/icons/ui/dna/dna_discovered.gif
similarity index 100%
rename from icons/ui_icons/dna/dna_discovered.gif
rename to icons/ui/dna/dna_discovered.gif
diff --git a/icons/ui_icons/dna/dna_extra.gif b/icons/ui/dna/dna_extra.gif
similarity index 100%
rename from icons/ui_icons/dna/dna_extra.gif
rename to icons/ui/dna/dna_extra.gif
diff --git a/icons/ui_icons/dna/dna_undiscovered.gif b/icons/ui/dna/dna_undiscovered.gif
similarity index 100%
rename from icons/ui_icons/dna/dna_undiscovered.gif
rename to icons/ui/dna/dna_undiscovered.gif
diff --git a/icons/ui_icons/inventory/back.png b/icons/ui/inventory/back.png
similarity index 100%
rename from icons/ui_icons/inventory/back.png
rename to icons/ui/inventory/back.png
diff --git a/icons/ui_icons/inventory/belt.png b/icons/ui/inventory/belt.png
similarity index 100%
rename from icons/ui_icons/inventory/belt.png
rename to icons/ui/inventory/belt.png
diff --git a/icons/ui_icons/inventory/collar.png b/icons/ui/inventory/collar.png
similarity index 100%
rename from icons/ui_icons/inventory/collar.png
rename to icons/ui/inventory/collar.png
diff --git a/icons/ui_icons/inventory/ears.png b/icons/ui/inventory/ears.png
similarity index 100%
rename from icons/ui_icons/inventory/ears.png
rename to icons/ui/inventory/ears.png
diff --git a/icons/ui_icons/inventory/glasses.png b/icons/ui/inventory/glasses.png
similarity index 100%
rename from icons/ui_icons/inventory/glasses.png
rename to icons/ui/inventory/glasses.png
diff --git a/icons/ui_icons/inventory/gloves.png b/icons/ui/inventory/gloves.png
similarity index 100%
rename from icons/ui_icons/inventory/gloves.png
rename to icons/ui/inventory/gloves.png
diff --git a/icons/ui_icons/inventory/hand_l.png b/icons/ui/inventory/hand_l.png
similarity index 100%
rename from icons/ui_icons/inventory/hand_l.png
rename to icons/ui/inventory/hand_l.png
diff --git a/icons/ui_icons/inventory/hand_r.png b/icons/ui/inventory/hand_r.png
similarity index 100%
rename from icons/ui_icons/inventory/hand_r.png
rename to icons/ui/inventory/hand_r.png
diff --git a/icons/ui_icons/inventory/head.png b/icons/ui/inventory/head.png
similarity index 100%
rename from icons/ui_icons/inventory/head.png
rename to icons/ui/inventory/head.png
diff --git a/icons/ui_icons/inventory/id.png b/icons/ui/inventory/id.png
similarity index 100%
rename from icons/ui_icons/inventory/id.png
rename to icons/ui/inventory/id.png
diff --git a/icons/ui_icons/inventory/mask.png b/icons/ui/inventory/mask.png
similarity index 100%
rename from icons/ui_icons/inventory/mask.png
rename to icons/ui/inventory/mask.png
diff --git a/icons/ui_icons/inventory/neck.png b/icons/ui/inventory/neck.png
similarity index 100%
rename from icons/ui_icons/inventory/neck.png
rename to icons/ui/inventory/neck.png
diff --git a/icons/ui_icons/inventory/pocket.png b/icons/ui/inventory/pocket.png
similarity index 100%
rename from icons/ui_icons/inventory/pocket.png
rename to icons/ui/inventory/pocket.png
diff --git a/icons/ui_icons/inventory/shoes.png b/icons/ui/inventory/shoes.png
similarity index 100%
rename from icons/ui_icons/inventory/shoes.png
rename to icons/ui/inventory/shoes.png
diff --git a/icons/ui_icons/inventory/suit.png b/icons/ui/inventory/suit.png
similarity index 100%
rename from icons/ui_icons/inventory/suit.png
rename to icons/ui/inventory/suit.png
diff --git a/icons/ui_icons/inventory/suit_storage.png b/icons/ui/inventory/suit_storage.png
similarity index 100%
rename from icons/ui_icons/inventory/suit_storage.png
rename to icons/ui/inventory/suit_storage.png
diff --git a/icons/ui_icons/inventory/uniform.png b/icons/ui/inventory/uniform.png
similarity index 100%
rename from icons/ui_icons/inventory/uniform.png
rename to icons/ui/inventory/uniform.png
diff --git a/icons/ui_icons/mecha/armor.dmi b/icons/ui/mecha/armor.dmi
similarity index 100%
rename from icons/ui_icons/mecha/armor.dmi
rename to icons/ui/mecha/armor.dmi
diff --git a/icons/ui_icons/notes/high_button.png b/icons/ui/notes/high_button.png
similarity index 100%
rename from icons/ui_icons/notes/high_button.png
rename to icons/ui/notes/high_button.png
diff --git a/icons/ui_icons/notes/medium_button.png b/icons/ui/notes/medium_button.png
similarity index 100%
rename from icons/ui_icons/notes/medium_button.png
rename to icons/ui/notes/medium_button.png
diff --git a/icons/ui_icons/notes/minor_button.png b/icons/ui/notes/minor_button.png
similarity index 100%
rename from icons/ui_icons/notes/minor_button.png
rename to icons/ui/notes/minor_button.png
diff --git a/icons/ui_icons/notes/none_button.png b/icons/ui/notes/none_button.png
similarity index 100%
rename from icons/ui_icons/notes/none_button.png
rename to icons/ui/notes/none_button.png
diff --git a/icons/ui_icons/orbit/ghost.png b/icons/ui/orbit/ghost.png
similarity index 100%
rename from icons/ui_icons/orbit/ghost.png
rename to icons/ui/orbit/ghost.png
diff --git a/icons/ui_icons/particle_editor/box_gen.png b/icons/ui/particle_editor/box_gen.png
similarity index 100%
rename from icons/ui_icons/particle_editor/box_gen.png
rename to icons/ui/particle_editor/box_gen.png
diff --git a/icons/ui_icons/particle_editor/circle_gen.png b/icons/ui/particle_editor/circle_gen.png
similarity index 100%
rename from icons/ui_icons/particle_editor/circle_gen.png
rename to icons/ui/particle_editor/circle_gen.png
diff --git a/icons/ui_icons/particle_editor/cube_gen.png b/icons/ui/particle_editor/cube_gen.png
similarity index 100%
rename from icons/ui_icons/particle_editor/cube_gen.png
rename to icons/ui/particle_editor/cube_gen.png
diff --git a/icons/ui_icons/particle_editor/linear_rand.png b/icons/ui/particle_editor/linear_rand.png
similarity index 100%
rename from icons/ui_icons/particle_editor/linear_rand.png
rename to icons/ui/particle_editor/linear_rand.png
diff --git a/icons/ui_icons/particle_editor/motion.png b/icons/ui/particle_editor/motion.png
similarity index 100%
rename from icons/ui_icons/particle_editor/motion.png
rename to icons/ui/particle_editor/motion.png
diff --git a/icons/ui_icons/particle_editor/normal_rand.png b/icons/ui/particle_editor/normal_rand.png
similarity index 100%
rename from icons/ui_icons/particle_editor/normal_rand.png
rename to icons/ui/particle_editor/normal_rand.png
diff --git a/icons/ui_icons/particle_editor/num_gen.png b/icons/ui/particle_editor/num_gen.png
similarity index 100%
rename from icons/ui_icons/particle_editor/num_gen.png
rename to icons/ui/particle_editor/num_gen.png
diff --git a/icons/ui_icons/particle_editor/sphere_gen.png b/icons/ui/particle_editor/sphere_gen.png
similarity index 100%
rename from icons/ui_icons/particle_editor/sphere_gen.png
rename to icons/ui/particle_editor/sphere_gen.png
diff --git a/icons/ui_icons/particle_editor/square_gen.png b/icons/ui/particle_editor/square_gen.png
similarity index 100%
rename from icons/ui_icons/particle_editor/square_gen.png
rename to icons/ui/particle_editor/square_gen.png
diff --git a/icons/ui_icons/particle_editor/square_rand.png b/icons/ui/particle_editor/square_rand.png
similarity index 100%
rename from icons/ui_icons/particle_editor/square_rand.png
rename to icons/ui/particle_editor/square_rand.png
diff --git a/icons/ui_icons/particle_editor/uniform_rand.png b/icons/ui/particle_editor/uniform_rand.png
similarity index 100%
rename from icons/ui_icons/particle_editor/uniform_rand.png
rename to icons/ui/particle_editor/uniform_rand.png
diff --git a/icons/ui_icons/particle_editor/vector_gen.png b/icons/ui/particle_editor/vector_gen.png
similarity index 100%
rename from icons/ui_icons/particle_editor/vector_gen.png
rename to icons/ui/particle_editor/vector_gen.png
diff --git a/icons/pda_icons/pda_atmos.png b/icons/ui/pda/pda_atmos.png
similarity index 100%
rename from icons/pda_icons/pda_atmos.png
rename to icons/ui/pda/pda_atmos.png
diff --git a/icons/pda_icons/pda_back.png b/icons/ui/pda/pda_back.png
similarity index 100%
rename from icons/pda_icons/pda_back.png
rename to icons/ui/pda/pda_back.png
diff --git a/icons/pda_icons/pda_bell.png b/icons/ui/pda/pda_bell.png
similarity index 100%
rename from icons/pda_icons/pda_bell.png
rename to icons/ui/pda/pda_bell.png
diff --git a/icons/pda_icons/pda_blank.png b/icons/ui/pda/pda_blank.png
similarity index 100%
rename from icons/pda_icons/pda_blank.png
rename to icons/ui/pda/pda_blank.png
diff --git a/icons/pda_icons/pda_boom.png b/icons/ui/pda/pda_boom.png
similarity index 100%
rename from icons/pda_icons/pda_boom.png
rename to icons/ui/pda/pda_boom.png
diff --git a/icons/pda_icons/pda_bucket.png b/icons/ui/pda/pda_bucket.png
similarity index 100%
rename from icons/pda_icons/pda_bucket.png
rename to icons/ui/pda/pda_bucket.png
diff --git a/icons/pda_icons/pda_chatroom.png b/icons/ui/pda/pda_chatroom.png
similarity index 100%
rename from icons/pda_icons/pda_chatroom.png
rename to icons/ui/pda/pda_chatroom.png
diff --git a/icons/pda_icons/pda_cleanbot.png b/icons/ui/pda/pda_cleanbot.png
similarity index 100%
rename from icons/pda_icons/pda_cleanbot.png
rename to icons/ui/pda/pda_cleanbot.png
diff --git a/icons/pda_icons/pda_color.png b/icons/ui/pda/pda_color.png
similarity index 100%
rename from icons/pda_icons/pda_color.png
rename to icons/ui/pda/pda_color.png
diff --git a/icons/pda_icons/pda_crate.png b/icons/ui/pda/pda_crate.png
similarity index 100%
rename from icons/pda_icons/pda_crate.png
rename to icons/ui/pda/pda_crate.png
diff --git a/icons/pda_icons/pda_cuffs.png b/icons/ui/pda/pda_cuffs.png
similarity index 100%
rename from icons/pda_icons/pda_cuffs.png
rename to icons/ui/pda/pda_cuffs.png
diff --git a/icons/pda_icons/pda_droneblacklist.png b/icons/ui/pda/pda_droneblacklist.png
similarity index 100%
rename from icons/pda_icons/pda_droneblacklist.png
rename to icons/ui/pda/pda_droneblacklist.png
diff --git a/icons/pda_icons/pda_dronephone.png b/icons/ui/pda/pda_dronephone.png
similarity index 100%
rename from icons/pda_icons/pda_dronephone.png
rename to icons/ui/pda/pda_dronephone.png
diff --git a/icons/pda_icons/pda_eject.png b/icons/ui/pda/pda_eject.png
similarity index 100%
rename from icons/pda_icons/pda_eject.png
rename to icons/ui/pda/pda_eject.png
diff --git a/icons/pda_icons/pda_emoji.png b/icons/ui/pda/pda_emoji.png
similarity index 100%
rename from icons/pda_icons/pda_emoji.png
rename to icons/ui/pda/pda_emoji.png
diff --git a/icons/pda_icons/pda_exit.png b/icons/ui/pda/pda_exit.png
similarity index 100%
rename from icons/pda_icons/pda_exit.png
rename to icons/ui/pda/pda_exit.png
diff --git a/icons/pda_icons/pda_flashlight.png b/icons/ui/pda/pda_flashlight.png
similarity index 100%
rename from icons/pda_icons/pda_flashlight.png
rename to icons/ui/pda/pda_flashlight.png
diff --git a/icons/pda_icons/pda_floorbot.png b/icons/ui/pda/pda_floorbot.png
similarity index 100%
rename from icons/pda_icons/pda_floorbot.png
rename to icons/ui/pda/pda_floorbot.png
diff --git a/icons/pda_icons/pda_font.png b/icons/ui/pda/pda_font.png
similarity index 100%
rename from icons/pda_icons/pda_font.png
rename to icons/ui/pda/pda_font.png
diff --git a/icons/pda_icons/pda_honk.png b/icons/ui/pda/pda_honk.png
similarity index 100%
rename from icons/pda_icons/pda_honk.png
rename to icons/ui/pda/pda_honk.png
diff --git a/icons/pda_icons/pda_locked.PNG b/icons/ui/pda/pda_locked.PNG
similarity index 100%
rename from icons/pda_icons/pda_locked.PNG
rename to icons/ui/pda/pda_locked.PNG
diff --git a/icons/pda_icons/pda_mail.png b/icons/ui/pda/pda_mail.png
similarity index 100%
rename from icons/pda_icons/pda_mail.png
rename to icons/ui/pda/pda_mail.png
diff --git a/icons/pda_icons/pda_medbot.png b/icons/ui/pda/pda_medbot.png
similarity index 100%
rename from icons/pda_icons/pda_medbot.png
rename to icons/ui/pda/pda_medbot.png
diff --git a/icons/pda_icons/pda_medical.png b/icons/ui/pda/pda_medical.png
similarity index 100%
rename from icons/pda_icons/pda_medical.png
rename to icons/ui/pda/pda_medical.png
diff --git a/icons/pda_icons/pda_menu.png b/icons/ui/pda/pda_menu.png
similarity index 100%
rename from icons/pda_icons/pda_menu.png
rename to icons/ui/pda/pda_menu.png
diff --git a/icons/pda_icons/pda_mule.png b/icons/ui/pda/pda_mule.png
similarity index 100%
rename from icons/pda_icons/pda_mule.png
rename to icons/ui/pda/pda_mule.png
diff --git a/icons/pda_icons/pda_notes.png b/icons/ui/pda/pda_notes.png
similarity index 100%
rename from icons/pda_icons/pda_notes.png
rename to icons/ui/pda/pda_notes.png
diff --git a/icons/pda_icons/pda_power.png b/icons/ui/pda/pda_power.png
similarity index 100%
rename from icons/pda_icons/pda_power.png
rename to icons/ui/pda/pda_power.png
diff --git a/icons/pda_icons/pda_rdoor.png b/icons/ui/pda/pda_rdoor.png
similarity index 100%
rename from icons/pda_icons/pda_rdoor.png
rename to icons/ui/pda/pda_rdoor.png
diff --git a/icons/pda_icons/pda_reagent.png b/icons/ui/pda/pda_reagent.png
similarity index 100%
rename from icons/pda_icons/pda_reagent.png
rename to icons/ui/pda/pda_reagent.png
diff --git a/icons/pda_icons/pda_refresh.png b/icons/ui/pda/pda_refresh.png
similarity index 100%
rename from icons/pda_icons/pda_refresh.png
rename to icons/ui/pda/pda_refresh.png
diff --git a/icons/pda_icons/pda_scanner.png b/icons/ui/pda/pda_scanner.png
similarity index 100%
rename from icons/pda_icons/pda_scanner.png
rename to icons/ui/pda/pda_scanner.png
diff --git a/icons/pda_icons/pda_signaler.png b/icons/ui/pda/pda_signaler.png
similarity index 100%
rename from icons/pda_icons/pda_signaler.png
rename to icons/ui/pda/pda_signaler.png
diff --git a/icons/pda_icons/pda_skills.png b/icons/ui/pda/pda_skills.png
similarity index 100%
rename from icons/pda_icons/pda_skills.png
rename to icons/ui/pda/pda_skills.png
diff --git a/icons/pda_icons/pda_status.png b/icons/ui/pda/pda_status.png
similarity index 100%
rename from icons/pda_icons/pda_status.png
rename to icons/ui/pda/pda_status.png
diff --git a/icons/program_icons/alarm_green.gif b/icons/ui/programs/alarm_green.gif
similarity index 100%
rename from icons/program_icons/alarm_green.gif
rename to icons/ui/programs/alarm_green.gif
diff --git a/icons/program_icons/alarm_red.gif b/icons/ui/programs/alarm_red.gif
similarity index 100%
rename from icons/program_icons/alarm_red.gif
rename to icons/ui/programs/alarm_red.gif
diff --git a/icons/program_icons/batt_100.gif b/icons/ui/programs/batt_100.gif
similarity index 100%
rename from icons/program_icons/batt_100.gif
rename to icons/ui/programs/batt_100.gif
diff --git a/icons/program_icons/batt_20.gif b/icons/ui/programs/batt_20.gif
similarity index 100%
rename from icons/program_icons/batt_20.gif
rename to icons/ui/programs/batt_20.gif
diff --git a/icons/program_icons/batt_40.gif b/icons/ui/programs/batt_40.gif
similarity index 100%
rename from icons/program_icons/batt_40.gif
rename to icons/ui/programs/batt_40.gif
diff --git a/icons/program_icons/batt_5.gif b/icons/ui/programs/batt_5.gif
similarity index 100%
rename from icons/program_icons/batt_5.gif
rename to icons/ui/programs/batt_5.gif
diff --git a/icons/program_icons/batt_60.gif b/icons/ui/programs/batt_60.gif
similarity index 100%
rename from icons/program_icons/batt_60.gif
rename to icons/ui/programs/batt_60.gif
diff --git a/icons/program_icons/batt_80.gif b/icons/ui/programs/batt_80.gif
similarity index 100%
rename from icons/program_icons/batt_80.gif
rename to icons/ui/programs/batt_80.gif
diff --git a/icons/program_icons/borg_mon.gif b/icons/ui/programs/borg_mon.gif
similarity index 100%
rename from icons/program_icons/borg_mon.gif
rename to icons/ui/programs/borg_mon.gif
diff --git a/icons/program_icons/charging.gif b/icons/ui/programs/charging.gif
similarity index 100%
rename from icons/program_icons/charging.gif
rename to icons/ui/programs/charging.gif
diff --git a/icons/program_icons/downloader_finished.gif b/icons/ui/programs/downloader_finished.gif
similarity index 100%
rename from icons/program_icons/downloader_finished.gif
rename to icons/ui/programs/downloader_finished.gif
diff --git a/icons/program_icons/downloader_running.gif b/icons/ui/programs/downloader_running.gif
similarity index 100%
rename from icons/program_icons/downloader_running.gif
rename to icons/ui/programs/downloader_running.gif
diff --git a/icons/program_icons/mafia.gif b/icons/ui/programs/mafia.gif
similarity index 100%
rename from icons/program_icons/mafia.gif
rename to icons/ui/programs/mafia.gif
diff --git a/icons/program_icons/ntnrc_idle.gif b/icons/ui/programs/ntnrc_idle.gif
similarity index 100%
rename from icons/program_icons/ntnrc_idle.gif
rename to icons/ui/programs/ntnrc_idle.gif
diff --git a/icons/program_icons/ntnrc_new.gif b/icons/ui/programs/ntnrc_new.gif
similarity index 100%
rename from icons/program_icons/ntnrc_new.gif
rename to icons/ui/programs/ntnrc_new.gif
diff --git a/icons/program_icons/power_norm.gif b/icons/ui/programs/power_norm.gif
similarity index 100%
rename from icons/program_icons/power_norm.gif
rename to icons/ui/programs/power_norm.gif
diff --git a/icons/program_icons/power_warn.gif b/icons/ui/programs/power_warn.gif
similarity index 100%
rename from icons/program_icons/power_warn.gif
rename to icons/ui/programs/power_warn.gif
diff --git a/icons/program_icons/robotact.gif b/icons/ui/programs/robotact.gif
similarity index 100%
rename from icons/program_icons/robotact.gif
rename to icons/ui/programs/robotact.gif
diff --git a/icons/program_icons/sig_high.gif b/icons/ui/programs/sig_high.gif
similarity index 100%
rename from icons/program_icons/sig_high.gif
rename to icons/ui/programs/sig_high.gif
diff --git a/icons/program_icons/sig_lan.gif b/icons/ui/programs/sig_lan.gif
similarity index 100%
rename from icons/program_icons/sig_lan.gif
rename to icons/ui/programs/sig_lan.gif
diff --git a/icons/program_icons/sig_low.gif b/icons/ui/programs/sig_low.gif
similarity index 100%
rename from icons/program_icons/sig_low.gif
rename to icons/ui/programs/sig_low.gif
diff --git a/icons/program_icons/sig_none.gif b/icons/ui/programs/sig_none.gif
similarity index 100%
rename from icons/program_icons/sig_none.gif
rename to icons/ui/programs/sig_none.gif
diff --git a/icons/program_icons/smmon_0.gif b/icons/ui/programs/smmon_0.gif
similarity index 100%
rename from icons/program_icons/smmon_0.gif
rename to icons/ui/programs/smmon_0.gif
diff --git a/icons/program_icons/smmon_1.gif b/icons/ui/programs/smmon_1.gif
similarity index 100%
rename from icons/program_icons/smmon_1.gif
rename to icons/ui/programs/smmon_1.gif
diff --git a/icons/program_icons/smmon_2.gif b/icons/ui/programs/smmon_2.gif
similarity index 100%
rename from icons/program_icons/smmon_2.gif
rename to icons/ui/programs/smmon_2.gif
diff --git a/icons/program_icons/smmon_3.gif b/icons/ui/programs/smmon_3.gif
similarity index 100%
rename from icons/program_icons/smmon_3.gif
rename to icons/ui/programs/smmon_3.gif
diff --git a/icons/program_icons/smmon_4.gif b/icons/ui/programs/smmon_4.gif
similarity index 100%
rename from icons/program_icons/smmon_4.gif
rename to icons/ui/programs/smmon_4.gif
diff --git a/icons/program_icons/smmon_5.gif b/icons/ui/programs/smmon_5.gif
similarity index 100%
rename from icons/program_icons/smmon_5.gif
rename to icons/ui/programs/smmon_5.gif
diff --git a/icons/program_icons/smmon_6.gif b/icons/ui/programs/smmon_6.gif
similarity index 100%
rename from icons/program_icons/smmon_6.gif
rename to icons/ui/programs/smmon_6.gif
diff --git a/icons/ui_icons/safe/safe_dial.png b/icons/ui/safe/safe_dial.png
similarity index 100%
rename from icons/ui_icons/safe/safe_dial.png
rename to icons/ui/safe/safe_dial.png
diff --git a/icons/ui_icons/screentips/cursor_hints.dmi b/icons/ui/screentips/cursor_hints.dmi
similarity index 100%
rename from icons/ui_icons/screentips/cursor_hints.dmi
rename to icons/ui/screentips/cursor_hints.dmi
diff --git a/icons/ui_icons/tgui/grid_background.png b/icons/ui/tgui/grid_background.png
similarity index 100%
rename from icons/ui_icons/tgui/grid_background.png
rename to icons/ui/tgui/grid_background.png
diff --git a/icons/ui_icons/tgui/ntosradar_background.png b/icons/ui/tgui/ntosradar_background.png
similarity index 100%
rename from icons/ui_icons/tgui/ntosradar_background.png
rename to icons/ui/tgui/ntosradar_background.png
diff --git a/icons/ui_icons/tgui/ntosradar_pointer.png b/icons/ui/tgui/ntosradar_pointer.png
similarity index 100%
rename from icons/ui_icons/tgui/ntosradar_pointer.png
rename to icons/ui/tgui/ntosradar_pointer.png
diff --git a/icons/ui_icons/tgui/ntosradar_pointer_S.png b/icons/ui/tgui/ntosradar_pointer_S.png
similarity index 100%
rename from icons/ui_icons/tgui/ntosradar_pointer_S.png
rename to icons/ui/tgui/ntosradar_pointer_S.png
diff --git a/icons/ui_icons/virtualpet/pet_state.dmi b/icons/ui/virtualpet/pet_state.dmi
similarity index 100%
rename from icons/ui_icons/virtualpet/pet_state.dmi
rename to icons/ui/virtualpet/pet_state.dmi
diff --git a/strings/tcg/set_one.json b/strings/tcg/set_one.json
index c1c061cad46..233f984835d 100644
--- a/strings/tcg/set_one.json
+++ b/strings/tcg/set_one.json
@@ -277,7 +277,7 @@
"cardtype": "Creature",
"cardsubtype": "Sloth",
"rarity": "common",
- "summon_icon_file": "icons/mob/pets.dmi",
+ "summon_icon_file": "icons/mob/simple/pets.dmi",
"summon_icon_state": "cool_sloth"
},
{
@@ -1006,7 +1006,7 @@
"cardtype": "Creature",
"cardsubtype": "Cat",
"rarity": "uncommon",
- "summon_icon_file": "icons/mob/pets.dmi",
+ "summon_icon_file": "icons/mob/simple/pets.dmi",
"summon_icon_state": "cat"
},
{