diff --git a/code/datums/achievements/_awards.dm b/code/datums/achievements/_awards.dm
index 77485de8ba1..633ee625144 100644
--- a/code/datums/achievements/_awards.dm
+++ b/code/datums/achievements/_awards.dm
@@ -2,7 +2,7 @@
 	///Name of the achievement, If null it won't show up in the achievement browser. (Handy for inheritance trees)
 	var/name
 	var/desc = "You did it."
-	///Found in UI_Icons/Achievements
+	///Found in ui_icons/achievements
 	var/icon = "default"
 	var/category = "Normal"
 
diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm
index 14110dc1e5d..3a3e46c26fe 100644
--- a/code/datums/ai/dog/dog_controller.dm
+++ b/code/datums/ai/dog/dog_controller.dm
@@ -224,7 +224,7 @@
 /// Show the command radial menu
 /datum/ai_controller/dog/proc/command_radial(mob/living/clicker)
 	var/list/commands = list(
-		COMMAND_HEEL = image(icon = 'icons/Testing/turf_analysis.dmi', icon_state = "red_arrow"),
+		COMMAND_HEEL = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow"),
 		COMMAND_FETCH = image(icon = 'icons/mob/actions/actions_spells.dmi', icon_state = "summons"),
 		COMMAND_ATTACK = image(icon = 'icons/effects/effects.dmi', icon_state = "bite"),
 		COMMAND_DIE = image(icon = 'icons/mob/pets.dmi', icon_state = "puppy_dead")
diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 144cc4df3f8..7d1f5114561 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -145,10 +145,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_icons/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_icons/chat/chat_icons.dmi', icon_state = "emote")
 		LAZYADD(prefixes, "\icon[r_icon]")
 
 	// Append language icon if the language uses one
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 4b0713257a9..ca8da7e8cd3 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -54,9 +54,9 @@
 
 /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_icons/tgui/ntosradar_background.png',
+		"ntosradarpointer.png" = 'icons/ui_icons/tgui/ntosradar_pointer.png',
+		"ntosradarpointerS.png" = 'icons/ui_icons/tgui/ntosradar_pointer_S.png'
 	)
 
 /datum/asset/spritesheet/simple/pda
@@ -117,7 +117,7 @@
 
 /datum/asset/simple/irv
 	assets = list(
-		"jquery-ui.custom-core-widgit-mouse-sortable-min.js" = 'html/IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js',
+		"jquery-ui.custom-core-widgit-mouse-sortable.min.js" = 'html/jquery/jquery-ui.custom-core-widgit-mouse-sortable.min.js',
 	)
 
 /datum/asset/group/irv
@@ -129,7 +129,7 @@
 /datum/asset/simple/jquery
 	legacy = TRUE
 	assets = list(
-		"jquery.min.js" = 'html/jquery.min.js',
+		"jquery.min.js" = 'html/jquery/jquery.min.js',
 	)
 
 /datum/asset/simple/namespaced/fontawesome
@@ -171,7 +171,7 @@
 	)
 
 /datum/asset/simple/namespaced/common
-	assets = list("padlock.png" = 'html/padlock.png')
+	assets = list("padlock.png" = 'icons/ui_icons/common/padlock.png')
 	parents = list("common.css" = 'html/browser/common.css')
 
 /datum/asset/simple/permissions
@@ -188,105 +188,105 @@
 
 /datum/asset/simple/notes
 	assets = list(
-		"high_button.png" = 'html/high_button.png',
-		"medium_button.png" = 'html/medium_button.png',
-		"minor_button.png" = 'html/minor_button.png',
-		"none_button.png" = 'html/none_button.png',
+		"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',
 	)
 
 /datum/asset/simple/arcade
 	assets = list(
-		"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',
+		"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',
 	)
 
 /datum/asset/spritesheet/simple/achievements
 	name ="achievements"
 	assets = list(
-		"default" = 'icons/UI_Icons/Achievements/default.png',
-		"basemisc" = 'icons/UI_Icons/Achievements/basemisc.png',
-		"baseboss" = 'icons/UI_Icons/Achievements/baseboss.png',
-		"baseskill" = 'icons/UI_Icons/Achievements/baseskill.png',
-		"bbgum" = 'icons/UI_Icons/Achievements/Boss/bbgum.png',
-		"colossus" = 'icons/UI_Icons/Achievements/Boss/colossus.png',
-		"hierophant" = 'icons/UI_Icons/Achievements/Boss/hierophant.png',
-		"legion" = 'icons/UI_Icons/Achievements/Boss/legion.png',
-		"miner" = 'icons/UI_Icons/Achievements/Boss/miner.png',
-		"swarmer" = 'icons/UI_Icons/Achievements/Boss/swarmer.png',
-		"tendril" = 'icons/UI_Icons/Achievements/Boss/tendril.png',
-		"featofstrength" = 'icons/UI_Icons/Achievements/Misc/featofstrength.png',
-		"helbital" = 'icons/UI_Icons/Achievements/Misc/helbital.png',
-		"jackpot" = 'icons/UI_Icons/Achievements/Misc/jackpot.png',
-		"meteors" = 'icons/UI_Icons/Achievements/Misc/meteors.png',
-		"timewaste" = 'icons/UI_Icons/Achievements/Misc/timewaste.png',
-		"upgrade" = 'icons/UI_Icons/Achievements/Misc/upgrade.png',
-		"clownking" = 'icons/UI_Icons/Achievements/Misc/clownking.png',
-		"clownthanks" = 'icons/UI_Icons/Achievements/Misc/clownthanks.png',
-		"rule8" = 'icons/UI_Icons/Achievements/Misc/rule8.png',
-		"snail" = 'icons/UI_Icons/Achievements/Misc/snail.png',
-		"ascension" = 'icons/UI_Icons/Achievements/Misc/ascension.png',
-		"ashascend" = 'icons/UI_Icons/Achievements/Misc/ashascend.png',
-		"fleshascend" = 'icons/UI_Icons/Achievements/Misc/fleshascend.png',
-		"rustascend" = 'icons/UI_Icons/Achievements/Misc/rustascend.png',
-		"voidascend" = 'icons/UI_Icons/Achievements/Misc/voidascend.png',
-		"mining" = 'icons/UI_Icons/Achievements/Skills/mining.png',
-		"changeling" = 'icons/UI_Icons/Achievements/Mafia/mafia.png',
-		"chaplain" = 'icons/UI_Icons/Achievements/Mafia/town.png',
-		"clown" = 'icons/UI_Icons/Achievements/Mafia/neutral.png',
-		"basemafia" ='icons/UI_Icons/Achievements/basemafia.png',
-		"frenching" = 'icons/UI_Icons/Achievements/Misc/frenchingthebubble.png'
+		"default" = 'icons/ui_icons/achievements/default.png',
+		"basemisc" = 'icons/ui_icons/achievements/basemisc.png',
+		"baseboss" = 'icons/ui_icons/achievements/baseboss.png',
+		"baseskill" = 'icons/ui_icons/achievements/baseskill.png',
+		"bbgum" = 'icons/ui_icons/achievements/boss/bbgum.png',
+		"colossus" = 'icons/ui_icons/achievements/boss/colossus.png',
+		"hierophant" = 'icons/ui_icons/achievements/boss/hierophant.png',
+		"legion" = 'icons/ui_icons/achievements/boss/legion.png',
+		"miner" = 'icons/ui_icons/achievements/boss/miner.png',
+		"swarmer" = 'icons/ui_icons/achievements/boss/swarmer.png',
+		"tendril" = 'icons/ui_icons/achievements/boss/tendril.png',
+		"featofstrength" = 'icons/ui_icons/achievements/misc/featofstrength.png',
+		"helbital" = 'icons/ui_icons/achievements/misc/helbital.png',
+		"jackpot" = 'icons/ui_icons/achievements/misc/jackpot.png',
+		"meteors" = 'icons/ui_icons/achievements/misc/meteors.png',
+		"timewaste" = 'icons/ui_icons/achievements/misc/timewaste.png',
+		"upgrade" = 'icons/ui_icons/achievements/misc/upgrade.png',
+		"clownking" = 'icons/ui_icons/achievements/misc/clownking.png',
+		"clownthanks" = 'icons/ui_icons/achievements/misc/clownthanks.png',
+		"rule8" = 'icons/ui_icons/achievements/misc/rule8.png',
+		"snail" = 'icons/ui_icons/achievements/misc/snail.png',
+		"ascension" = 'icons/ui_icons/achievements/misc/ascension.png',
+		"ashascend" = 'icons/ui_icons/achievements/misc/ashascend.png',
+		"fleshascend" = 'icons/ui_icons/achievements/misc/fleshascend.png',
+		"rustascend" = 'icons/ui_icons/achievements/misc/rustascend.png',
+		"voidascend" = 'icons/ui_icons/achievements/misc/voidascend.png',
+		"mining" = 'icons/ui_icons/achievements/skills/mining.png',
+		"changeling" = 'icons/ui_icons/achievements/mafia/mafia.png',
+		"chaplain" = 'icons/ui_icons/achievements/mafia/town.png',
+		"clown" = 'icons/ui_icons/achievements/mafia/neutral.png',
+		"basemafia" ='icons/ui_icons/achievements/basemafia.png',
+		"frenching" = 'icons/ui_icons/achievements/misc/frenchingthebubble.png'
 	)
 
 /datum/asset/spritesheet/simple/pills
 	name = "pills"
 	assets = list(
-		"pill1" = 'icons/UI_Icons/Pills/pill1.png',
-		"pill2" = 'icons/UI_Icons/Pills/pill2.png',
-		"pill3" = 'icons/UI_Icons/Pills/pill3.png',
-		"pill4" = 'icons/UI_Icons/Pills/pill4.png',
-		"pill5" = 'icons/UI_Icons/Pills/pill5.png',
-		"pill6" = 'icons/UI_Icons/Pills/pill6.png',
-		"pill7" = 'icons/UI_Icons/Pills/pill7.png',
-		"pill8" = 'icons/UI_Icons/Pills/pill8.png',
-		"pill9" = 'icons/UI_Icons/Pills/pill9.png',
-		"pill10" = 'icons/UI_Icons/Pills/pill10.png',
-		"pill11" = 'icons/UI_Icons/Pills/pill11.png',
-		"pill12" = 'icons/UI_Icons/Pills/pill12.png',
-		"pill13" = 'icons/UI_Icons/Pills/pill13.png',
-		"pill14" = 'icons/UI_Icons/Pills/pill14.png',
-		"pill15" = 'icons/UI_Icons/Pills/pill15.png',
-		"pill16" = 'icons/UI_Icons/Pills/pill16.png',
-		"pill17" = 'icons/UI_Icons/Pills/pill17.png',
-		"pill18" = 'icons/UI_Icons/Pills/pill18.png',
-		"pill19" = 'icons/UI_Icons/Pills/pill19.png',
-		"pill20" = 'icons/UI_Icons/Pills/pill20.png',
-		"pill21" = 'icons/UI_Icons/Pills/pill21.png',
-		"pill22" = 'icons/UI_Icons/Pills/pill22.png',
+		"pill1" = 'icons/ui_icons/pills/pill1.png',
+		"pill2" = 'icons/ui_icons/pills/pill2.png',
+		"pill3" = 'icons/ui_icons/pills/pill3.png',
+		"pill4" = 'icons/ui_icons/pills/pill4.png',
+		"pill5" = 'icons/ui_icons/pills/pill5.png',
+		"pill6" = 'icons/ui_icons/pills/pill6.png',
+		"pill7" = 'icons/ui_icons/pills/pill7.png',
+		"pill8" = 'icons/ui_icons/pills/pill8.png',
+		"pill9" = 'icons/ui_icons/pills/pill9.png',
+		"pill10" = 'icons/ui_icons/pills/pill10.png',
+		"pill11" = 'icons/ui_icons/pills/pill11.png',
+		"pill12" = 'icons/ui_icons/pills/pill12.png',
+		"pill13" = 'icons/ui_icons/pills/pill13.png',
+		"pill14" = 'icons/ui_icons/pills/pill14.png',
+		"pill15" = 'icons/ui_icons/pills/pill15.png',
+		"pill16" = 'icons/ui_icons/pills/pill16.png',
+		"pill17" = 'icons/ui_icons/pills/pill17.png',
+		"pill18" = 'icons/ui_icons/pills/pill18.png',
+		"pill19" = 'icons/ui_icons/pills/pill19.png',
+		"pill20" = 'icons/ui_icons/pills/pill20.png',
+		"pill21" = 'icons/ui_icons/pills/pill21.png',
+		"pill22" = 'icons/ui_icons/pills/pill22.png',
 	)
 
 /datum/asset/spritesheet/simple/condiments
 	name = "condiments"
 	assets = list(
-		CONDIMASTER_STYLE_FALLBACK = 'icons/UI_Icons/Condiments/emptycondiment.png',
-		"enzyme" = 'icons/UI_Icons/Condiments/enzyme.png',
-		"flour" = 'icons/UI_Icons/Condiments/flour.png',
-		"mayonnaise" = 'icons/UI_Icons/Condiments/mayonnaise.png',
-		"milk" = 'icons/UI_Icons/Condiments/milk.png',
-		"blackpepper" = 'icons/UI_Icons/Condiments/peppermillsmall.png',
-		"rice" = 'icons/UI_Icons/Condiments/rice.png',
-		"sodiumchloride" = 'icons/UI_Icons/Condiments/saltshakersmall.png',
-		"soymilk" = 'icons/UI_Icons/Condiments/soymilk.png',
-		"soysauce" = 'icons/UI_Icons/Condiments/soysauce.png',
-		"sugar" = 'icons/UI_Icons/Condiments/sugar.png',
-		"ketchup" = 'icons/UI_Icons/Condiments/ketchup.png',
-		"capsaicin" = 'icons/UI_Icons/Condiments/hotsauce.png',
-		"frostoil" = 'icons/UI_Icons/Condiments/coldsauce.png',
-		"bbqsauce" = 'icons/UI_Icons/Condiments/bbqsauce.png',
-		"cornoil" = 'icons/UI_Icons/Condiments/oliveoil.png',
+		CONDIMASTER_STYLE_FALLBACK = 'icons/ui_icons/condiments/emptycondiment.png',
+		"enzyme" = 'icons/ui_icons/condiments/enzyme.png',
+		"flour" = 'icons/ui_icons/condiments/flour.png',
+		"mayonnaise" = 'icons/ui_icons/condiments/mayonnaise.png',
+		"milk" = 'icons/ui_icons/condiments/milk.png',
+		"blackpepper" = 'icons/ui_icons/condiments/peppermillsmall.png',
+		"rice" = 'icons/ui_icons/condiments/rice.png',
+		"sodiumchloride" = 'icons/ui_icons/condiments/saltshakersmall.png',
+		"soymilk" = 'icons/ui_icons/condiments/soymilk.png',
+		"soysauce" = 'icons/ui_icons/condiments/soysauce.png',
+		"sugar" = 'icons/ui_icons/condiments/sugar.png',
+		"ketchup" = 'icons/ui_icons/condiments/ketchup.png',
+		"capsaicin" = 'icons/ui_icons/condiments/hotsauce.png',
+		"frostoil" = 'icons/ui_icons/condiments/coldsauce.png',
+		"bbqsauce" = 'icons/ui_icons/condiments/bbqsauce.png',
+		"cornoil" = 'icons/ui_icons/condiments/oliveoil.png',
 	)
 
 //this exists purely to avoid meta by pre-loading all language icons.
@@ -432,14 +432,14 @@
 
 /datum/asset/simple/genetics
 	assets = list(
-		"dna_discovered.gif" = 'html/dna_discovered.gif',
-		"dna_undiscovered.gif" = 'html/dna_undiscovered.gif',
-		"dna_extra.gif" = 'html/dna_extra.gif'
+		"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'
 	)
 
 /datum/asset/simple/orbit
 	assets = list(
-		"ghost.png" = 'html/ghost.png'
+		"ghost.png" = 'icons/ui_icons/orbit/ghost.png'
 	)
 
 /datum/asset/simple/vv
@@ -490,7 +490,7 @@
 
 /datum/asset/simple/safe
 	assets = list(
-		"safe_dial.png" = 'html/safe_dial.png'
+		"safe_dial.png" = 'icons/ui_icons/safe/safe_dial.png'
 	)
 
 /datum/asset/spritesheet/fish
@@ -509,31 +509,31 @@
 
 /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_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',
 	)
 
 /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_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',
 	)
 
 /// Removes all non-alphanumerics from the text, keep in mind this can lead to id conflicts
@@ -543,7 +543,7 @@
 
 /datum/asset/simple/tutorial_advisors
 	assets = list(
-		"chem_help_advisor.gif" = 'icons/UI_Icons/Advisors/chem_help_advisor.gif',
+		"chem_help_advisor.gif" = 'icons/ui_icons/advisors/chem_help_advisor.gif',
 	)
 
 /datum/asset/spritesheet/moods
diff --git a/code/modules/mob/dead/new_player/poll.dm b/code/modules/mob/dead/new_player/poll.dm
index 7436fc14c9d..63e9ecc705d 100644
--- a/code/modules/mob/dead/new_player/poll.dm
+++ b/code/modules/mob/dead/new_player/poll.dm
@@ -252,7 +252,7 @@
 	var/list/output = list({"<html><head><meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
 	<script src="[SSassets.transport.get_asset_url("jquery.min.js")]"></script>
-	<script src="[SSassets.transport.get_asset_url("jquery-ui.custom-core-widgit-mouse-sortable-min.js")]"></script>
+	<script src="[SSassets.transport.get_asset_url("jquery-ui.custom-core-widgit-mouse-sortable.min.js")]"></script>
 	<style>
 		#sortable { list-style-type: none; margin: 0; padding: 2em; }
 		#sortable li { min-height: 1em; margin: 0px 1px 1px 1px; padding: 1px; border: 1px solid black; border-radius: 5px; background-color: white; cursor:move;}
diff --git a/html/browser/scannernew.css b/html/browser/scannernew.css
deleted file mode 100644
index ac1c6c24248..00000000000
--- a/html/browser/scannernew.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.dnaBlockNumber
-{
-	font-family: Fixed, monospace;
-	float: left;
-	color: #ffffff;
-	background: #363636;
-	width: 20px;
-	padding: -3px 0 -1px 0;
-	margin: 2px 2px 0 10px;
-	text-align: center;
-}
-.dnaBlock
-{
-	font-family: Fixed, monospace;
-	float: left;
-}
-a.incompleteBlock
-{
-	background: #8a4040;
-}
-a.incompleteBlock:hover
-{
-	color: #40628a;
-	background: #ffffff;
-}
-img.selected
-{
-	border: 1px solid blue;
-}
-img.unselected
-{
-	border: 2px solid black;
-}
-div>table {
-	float: left;
-}
-td
-{
-	text-align: center;
-}
-a.clean
-{
-	background: none;
-	border: none;
-	marging: none;
-}
\ No newline at end of file
diff --git a/html/browser/techwebs.css b/html/browser/techwebs.css
deleted file mode 100644
index 889196cc28d..00000000000
--- a/html/browser/techwebs.css
+++ /dev/null
@@ -1,20 +0,0 @@
-[data-tooltip] {
-    position: relative;
-}
-
-[data-tooltip]:hover::before {
-    position: absolute;
-    z-index: 1;
-    top: 100%;
-    padding: 0 4px;
-    margin-top: 1px;
-    border: 1px solid #40628a;
-    background: black;
-    color: white;
-    content: attr(data-tooltip);
-    min-width: 160px;
-}
-
-.technode {
-    width: 256px;
-}
diff --git a/html/chevron-expand.png b/html/chevron-expand.png
deleted file mode 100644
index cb51973ca6e..00000000000
Binary files a/html/chevron-expand.png and /dev/null differ
diff --git a/html/chevron.png b/html/chevron.png
deleted file mode 100644
index 2da46237e49..00000000000
Binary files a/html/chevron.png and /dev/null differ
diff --git a/html/dna_discovered.gif b/html/dna_discovered.gif
deleted file mode 100644
index 2f9b3573c87..00000000000
Binary files a/html/dna_discovered.gif and /dev/null differ
diff --git a/html/dna_extra.gif b/html/dna_extra.gif
deleted file mode 100644
index 095817662a0..00000000000
Binary files a/html/dna_extra.gif and /dev/null differ
diff --git a/html/dna_undiscovered.gif b/html/dna_undiscovered.gif
deleted file mode 100644
index 707c34668eb..00000000000
Binary files a/html/dna_undiscovered.gif and /dev/null differ
diff --git a/html/IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js b/html/jquery/jquery-ui.custom-core-widgit-mouse-sortable.min.js
similarity index 100%
rename from html/IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js
rename to html/jquery/jquery-ui.custom-core-widgit-mouse-sortable.min.js
diff --git a/html/jquery.min.js b/html/jquery/jquery.min.js
similarity index 100%
rename from html/jquery.min.js
rename to html/jquery/jquery.min.js
diff --git a/html/mapbase1024.png b/html/mapbase1024.png
deleted file mode 100644
index c875f14db1e..00000000000
Binary files a/html/mapbase1024.png and /dev/null differ
diff --git a/icons/PSD files/asteroiddustoverlay.psd b/icons/psd_files/asteroiddustoverlay.psd
similarity index 100%
rename from icons/PSD files/asteroiddustoverlay.psd
rename to icons/psd_files/asteroiddustoverlay.psd
diff --git a/icons/PSD files/door.psd b/icons/psd_files/door.psd
similarity index 100%
rename from icons/PSD files/door.psd
rename to icons/psd_files/door.psd
diff --git a/icons/PSD files/large-stamps.psd b/icons/psd_files/large-stamps.psd
similarity index 100%
rename from icons/PSD files/large-stamps.psd
rename to icons/psd_files/large-stamps.psd
diff --git a/icons/PSD files/locker_template.psd b/icons/psd_files/locker_template.psd
similarity index 100%
rename from icons/PSD files/locker_template.psd
rename to icons/psd_files/locker_template.psd
diff --git a/icons/PSD files/window_spawners.psd b/icons/psd_files/window_spawners.psd
similarity index 100%
rename from icons/PSD files/window_spawners.psd
rename to icons/psd_files/window_spawners.psd
diff --git a/icons/Testing/turf_analysis.dmi b/icons/testing/turf_analysis.dmi
similarity index 100%
rename from icons/Testing/turf_analysis.dmi
rename to icons/testing/turf_analysis.dmi
diff --git a/icons/UI_Icons/Achievements/baseboss.png b/icons/ui_icons/achievements/baseboss.png
similarity index 100%
rename from icons/UI_Icons/Achievements/baseboss.png
rename to icons/ui_icons/achievements/baseboss.png
diff --git a/icons/UI_Icons/Achievements/basemafia.png b/icons/ui_icons/achievements/basemafia.png
similarity index 100%
rename from icons/UI_Icons/Achievements/basemafia.png
rename to icons/ui_icons/achievements/basemafia.png
diff --git a/icons/UI_Icons/Achievements/basemisc.png b/icons/ui_icons/achievements/basemisc.png
similarity index 100%
rename from icons/UI_Icons/Achievements/basemisc.png
rename to icons/ui_icons/achievements/basemisc.png
diff --git a/icons/UI_Icons/Achievements/baseskill.png b/icons/ui_icons/achievements/baseskill.png
similarity index 100%
rename from icons/UI_Icons/Achievements/baseskill.png
rename to icons/ui_icons/achievements/baseskill.png
diff --git a/icons/UI_Icons/Achievements/Boss/bbgum.png b/icons/ui_icons/achievements/boss/bbgum.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Boss/bbgum.png
rename to icons/ui_icons/achievements/boss/bbgum.png
diff --git a/icons/UI_Icons/Achievements/Boss/colossus.png b/icons/ui_icons/achievements/boss/colossus.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Boss/colossus.png
rename to icons/ui_icons/achievements/boss/colossus.png
diff --git a/icons/UI_Icons/Achievements/Boss/drake.png b/icons/ui_icons/achievements/boss/drake.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Boss/drake.png
rename to icons/ui_icons/achievements/boss/drake.png
diff --git a/icons/UI_Icons/Achievements/Boss/hierophant.png b/icons/ui_icons/achievements/boss/hierophant.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Boss/hierophant.png
rename to icons/ui_icons/achievements/boss/hierophant.png
diff --git a/icons/UI_Icons/Achievements/Boss/legion.png b/icons/ui_icons/achievements/boss/legion.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Boss/legion.png
rename to icons/ui_icons/achievements/boss/legion.png
diff --git a/icons/UI_Icons/Achievements/Boss/miner.png b/icons/ui_icons/achievements/boss/miner.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Boss/miner.png
rename to icons/ui_icons/achievements/boss/miner.png
diff --git a/icons/UI_Icons/Achievements/Boss/swarmer.png b/icons/ui_icons/achievements/boss/swarmer.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Boss/swarmer.png
rename to icons/ui_icons/achievements/boss/swarmer.png
diff --git a/icons/UI_Icons/Achievements/Boss/tendril.png b/icons/ui_icons/achievements/boss/tendril.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Boss/tendril.png
rename to icons/ui_icons/achievements/boss/tendril.png
diff --git a/icons/UI_Icons/Achievements/default.png b/icons/ui_icons/achievements/default.png
similarity index 100%
rename from icons/UI_Icons/Achievements/default.png
rename to icons/ui_icons/achievements/default.png
diff --git a/icons/UI_Icons/Achievements/Mafia/hated.png b/icons/ui_icons/achievements/mafia/hated.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Mafia/hated.png
rename to icons/ui_icons/achievements/mafia/hated.png
diff --git a/icons/UI_Icons/Achievements/Mafia/mafia.png b/icons/ui_icons/achievements/mafia/mafia.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Mafia/mafia.png
rename to icons/ui_icons/achievements/mafia/mafia.png
diff --git a/icons/UI_Icons/Achievements/Mafia/neutral.png b/icons/ui_icons/achievements/mafia/neutral.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Mafia/neutral.png
rename to icons/ui_icons/achievements/mafia/neutral.png
diff --git a/icons/UI_Icons/Achievements/Mafia/town.png b/icons/ui_icons/achievements/mafia/town.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Mafia/town.png
rename to icons/ui_icons/achievements/mafia/town.png
diff --git a/icons/UI_Icons/Achievements/Misc/ascension.png b/icons/ui_icons/achievements/misc/ascension.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/ascension.png
rename to icons/ui_icons/achievements/misc/ascension.png
diff --git a/icons/UI_Icons/Achievements/Misc/ashascend.png b/icons/ui_icons/achievements/misc/ashascend.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/ashascend.png
rename to icons/ui_icons/achievements/misc/ashascend.png
diff --git a/icons/UI_Icons/Achievements/Misc/cayenne_disk.png b/icons/ui_icons/achievements/misc/cayenne_disk.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/cayenne_disk.png
rename to icons/ui_icons/achievements/misc/cayenne_disk.png
diff --git a/icons/UI_Icons/Achievements/Misc/chem_tut.png b/icons/ui_icons/achievements/misc/chem_tut.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/chem_tut.png
rename to icons/ui_icons/achievements/misc/chem_tut.png
diff --git a/icons/UI_Icons/Achievements/Misc/clownking.png b/icons/ui_icons/achievements/misc/clownking.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/clownking.png
rename to icons/ui_icons/achievements/misc/clownking.png
diff --git a/icons/UI_Icons/Achievements/Misc/clownthanks.png b/icons/ui_icons/achievements/misc/clownthanks.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/clownthanks.png
rename to icons/ui_icons/achievements/misc/clownthanks.png
diff --git a/icons/UI_Icons/Achievements/Misc/featofstrength.png b/icons/ui_icons/achievements/misc/featofstrength.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/featofstrength.png
rename to icons/ui_icons/achievements/misc/featofstrength.png
diff --git a/icons/UI_Icons/Achievements/Misc/fleshascend.png b/icons/ui_icons/achievements/misc/fleshascend.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/fleshascend.png
rename to icons/ui_icons/achievements/misc/fleshascend.png
diff --git a/icons/UI_Icons/Achievements/Misc/frenchingthebubble.png b/icons/ui_icons/achievements/misc/frenchingthebubble.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/frenchingthebubble.png
rename to icons/ui_icons/achievements/misc/frenchingthebubble.png
diff --git a/icons/UI_Icons/Achievements/Misc/helbital.png b/icons/ui_icons/achievements/misc/helbital.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/helbital.png
rename to icons/ui_icons/achievements/misc/helbital.png
diff --git a/icons/UI_Icons/Achievements/Misc/hotdamn.png b/icons/ui_icons/achievements/misc/hotdamn.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/hotdamn.png
rename to icons/ui_icons/achievements/misc/hotdamn.png
diff --git a/icons/UI_Icons/Achievements/Misc/jackpot.png b/icons/ui_icons/achievements/misc/jackpot.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/jackpot.png
rename to icons/ui_icons/achievements/misc/jackpot.png
diff --git a/icons/UI_Icons/Achievements/Misc/longshift.png b/icons/ui_icons/achievements/misc/longshift.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/longshift.png
rename to icons/ui_icons/achievements/misc/longshift.png
diff --git a/icons/UI_Icons/Achievements/Misc/meteors.png b/icons/ui_icons/achievements/misc/meteors.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/meteors.png
rename to icons/ui_icons/achievements/misc/meteors.png
diff --git a/icons/UI_Icons/Achievements/Misc/rule8.png b/icons/ui_icons/achievements/misc/rule8.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/rule8.png
rename to icons/ui_icons/achievements/misc/rule8.png
diff --git a/icons/UI_Icons/Achievements/Misc/rustascend.png b/icons/ui_icons/achievements/misc/rustascend.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/rustascend.png
rename to icons/ui_icons/achievements/misc/rustascend.png
diff --git a/icons/UI_Icons/Achievements/Misc/snail.png b/icons/ui_icons/achievements/misc/snail.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/snail.png
rename to icons/ui_icons/achievements/misc/snail.png
diff --git a/icons/UI_Icons/Achievements/Misc/timewaste.png b/icons/ui_icons/achievements/misc/timewaste.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/timewaste.png
rename to icons/ui_icons/achievements/misc/timewaste.png
diff --git a/icons/UI_Icons/Achievements/Misc/toolbox_soul.png b/icons/ui_icons/achievements/misc/toolbox_soul.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/toolbox_soul.png
rename to icons/ui_icons/achievements/misc/toolbox_soul.png
diff --git a/icons/UI_Icons/Achievements/Misc/tram_surfer.png b/icons/ui_icons/achievements/misc/tram_surfer.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/tram_surfer.png
rename to icons/ui_icons/achievements/misc/tram_surfer.png
diff --git a/icons/UI_Icons/Achievements/Misc/upgrade.png b/icons/ui_icons/achievements/misc/upgrade.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/upgrade.png
rename to icons/ui_icons/achievements/misc/upgrade.png
diff --git a/icons/UI_Icons/Achievements/Misc/voidascend.png b/icons/ui_icons/achievements/misc/voidascend.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Misc/voidascend.png
rename to icons/ui_icons/achievements/misc/voidascend.png
diff --git a/icons/UI_Icons/Achievements/Skills/mining.png b/icons/ui_icons/achievements/skills/mining.png
similarity index 100%
rename from icons/UI_Icons/Achievements/Skills/mining.png
rename to icons/ui_icons/achievements/skills/mining.png
diff --git a/icons/UI_Icons/adventure/default.png b/icons/ui_icons/adventure/default.png
similarity index 100%
rename from icons/UI_Icons/adventure/default.png
rename to icons/ui_icons/adventure/default.png
diff --git a/icons/UI_Icons/adventure/grue.png b/icons/ui_icons/adventure/grue.png
similarity index 100%
rename from icons/UI_Icons/adventure/grue.png
rename to icons/ui_icons/adventure/grue.png
diff --git a/icons/UI_Icons/adventure/signal_lost.png b/icons/ui_icons/adventure/signal_lost.png
similarity index 100%
rename from icons/UI_Icons/adventure/signal_lost.png
rename to icons/ui_icons/adventure/signal_lost.png
diff --git a/icons/UI_Icons/adventure/trade.png b/icons/ui_icons/adventure/trade.png
similarity index 100%
rename from icons/UI_Icons/adventure/trade.png
rename to icons/ui_icons/adventure/trade.png
diff --git a/icons/UI_Icons/Advisors/chem_help_advisor.gif b/icons/ui_icons/advisors/chem_help_advisor.gif
similarity index 100%
rename from icons/UI_Icons/Advisors/chem_help_advisor.gif
rename to icons/ui_icons/advisors/chem_help_advisor.gif
diff --git a/icons/UI_Icons/Arcade/boss1.gif b/icons/ui_icons/arcade/boss1.gif
similarity index 100%
rename from icons/UI_Icons/Arcade/boss1.gif
rename to icons/ui_icons/arcade/boss1.gif
diff --git a/icons/UI_Icons/Arcade/boss2.gif b/icons/ui_icons/arcade/boss2.gif
similarity index 100%
rename from icons/UI_Icons/Arcade/boss2.gif
rename to icons/ui_icons/arcade/boss2.gif
diff --git a/icons/UI_Icons/Arcade/boss3.gif b/icons/ui_icons/arcade/boss3.gif
similarity index 100%
rename from icons/UI_Icons/Arcade/boss3.gif
rename to icons/ui_icons/arcade/boss3.gif
diff --git a/icons/UI_Icons/Arcade/boss4.gif b/icons/ui_icons/arcade/boss4.gif
similarity index 100%
rename from icons/UI_Icons/Arcade/boss4.gif
rename to icons/ui_icons/arcade/boss4.gif
diff --git a/icons/UI_Icons/Arcade/boss5.gif b/icons/ui_icons/arcade/boss5.gif
similarity index 100%
rename from icons/UI_Icons/Arcade/boss5.gif
rename to icons/ui_icons/arcade/boss5.gif
diff --git a/icons/UI_Icons/Arcade/boss6.gif b/icons/ui_icons/arcade/boss6.gif
similarity index 100%
rename from icons/UI_Icons/Arcade/boss6.gif
rename to icons/ui_icons/arcade/boss6.gif
diff --git a/icons/UI_Icons/chat/chat_icons.dmi b/icons/ui_icons/chat/chat_icons.dmi
similarity index 100%
rename from icons/UI_Icons/chat/chat_icons.dmi
rename to icons/ui_icons/chat/chat_icons.dmi
diff --git a/html/padlock.png b/icons/ui_icons/common/padlock.png
similarity index 100%
rename from html/padlock.png
rename to icons/ui_icons/common/padlock.png
diff --git a/icons/UI_Icons/Condiments/bbqsauce.png b/icons/ui_icons/condiments/bbqsauce.png
similarity index 100%
rename from icons/UI_Icons/Condiments/bbqsauce.png
rename to icons/ui_icons/condiments/bbqsauce.png
diff --git a/icons/UI_Icons/Condiments/coldsauce.png b/icons/ui_icons/condiments/coldsauce.png
similarity index 100%
rename from icons/UI_Icons/Condiments/coldsauce.png
rename to icons/ui_icons/condiments/coldsauce.png
diff --git a/icons/UI_Icons/Condiments/condi_empty.png b/icons/ui_icons/condiments/condi_empty.png
similarity index 100%
rename from icons/UI_Icons/Condiments/condi_empty.png
rename to icons/ui_icons/condiments/condi_empty.png
diff --git a/icons/UI_Icons/Condiments/emptycondiment.png b/icons/ui_icons/condiments/emptycondiment.png
similarity index 100%
rename from icons/UI_Icons/Condiments/emptycondiment.png
rename to icons/ui_icons/condiments/emptycondiment.png
diff --git a/icons/UI_Icons/Condiments/enzyme.png b/icons/ui_icons/condiments/enzyme.png
similarity index 100%
rename from icons/UI_Icons/Condiments/enzyme.png
rename to icons/ui_icons/condiments/enzyme.png
diff --git a/icons/UI_Icons/Condiments/flour.png b/icons/ui_icons/condiments/flour.png
similarity index 100%
rename from icons/UI_Icons/Condiments/flour.png
rename to icons/ui_icons/condiments/flour.png
diff --git a/icons/UI_Icons/Condiments/hotsauce.png b/icons/ui_icons/condiments/hotsauce.png
similarity index 100%
rename from icons/UI_Icons/Condiments/hotsauce.png
rename to icons/ui_icons/condiments/hotsauce.png
diff --git a/icons/UI_Icons/Condiments/ketchup.png b/icons/ui_icons/condiments/ketchup.png
similarity index 100%
rename from icons/UI_Icons/Condiments/ketchup.png
rename to icons/ui_icons/condiments/ketchup.png
diff --git a/icons/UI_Icons/Condiments/mayonnaise.png b/icons/ui_icons/condiments/mayonnaise.png
similarity index 100%
rename from icons/UI_Icons/Condiments/mayonnaise.png
rename to icons/ui_icons/condiments/mayonnaise.png
diff --git a/icons/UI_Icons/Condiments/milk.png b/icons/ui_icons/condiments/milk.png
similarity index 100%
rename from icons/UI_Icons/Condiments/milk.png
rename to icons/ui_icons/condiments/milk.png
diff --git a/icons/UI_Icons/Condiments/oliveoil.png b/icons/ui_icons/condiments/oliveoil.png
similarity index 100%
rename from icons/UI_Icons/Condiments/oliveoil.png
rename to icons/ui_icons/condiments/oliveoil.png
diff --git a/icons/UI_Icons/Condiments/peppermillsmall.png b/icons/ui_icons/condiments/peppermillsmall.png
similarity index 100%
rename from icons/UI_Icons/Condiments/peppermillsmall.png
rename to icons/ui_icons/condiments/peppermillsmall.png
diff --git a/icons/UI_Icons/Condiments/rice.png b/icons/ui_icons/condiments/rice.png
similarity index 100%
rename from icons/UI_Icons/Condiments/rice.png
rename to icons/ui_icons/condiments/rice.png
diff --git a/icons/UI_Icons/Condiments/saltshakersmall.png b/icons/ui_icons/condiments/saltshakersmall.png
similarity index 100%
rename from icons/UI_Icons/Condiments/saltshakersmall.png
rename to icons/ui_icons/condiments/saltshakersmall.png
diff --git a/icons/UI_Icons/Condiments/soymilk.png b/icons/ui_icons/condiments/soymilk.png
similarity index 100%
rename from icons/UI_Icons/Condiments/soymilk.png
rename to icons/ui_icons/condiments/soymilk.png
diff --git a/icons/UI_Icons/Condiments/soysauce.png b/icons/ui_icons/condiments/soysauce.png
similarity index 100%
rename from icons/UI_Icons/Condiments/soysauce.png
rename to icons/ui_icons/condiments/soysauce.png
diff --git a/icons/UI_Icons/Condiments/sugar.png b/icons/ui_icons/condiments/sugar.png
similarity index 100%
rename from icons/UI_Icons/Condiments/sugar.png
rename to icons/ui_icons/condiments/sugar.png
diff --git a/icons/ui_icons/dna/dna_discovered.gif b/icons/ui_icons/dna/dna_discovered.gif
new file mode 100644
index 00000000000..ea630c487c8
Binary files /dev/null and b/icons/ui_icons/dna/dna_discovered.gif differ
diff --git a/icons/ui_icons/dna/dna_extra.gif b/icons/ui_icons/dna/dna_extra.gif
new file mode 100644
index 00000000000..19c2e8d900d
Binary files /dev/null and b/icons/ui_icons/dna/dna_extra.gif differ
diff --git a/icons/ui_icons/dna/dna_undiscovered.gif b/icons/ui_icons/dna/dna_undiscovered.gif
new file mode 100644
index 00000000000..c20868b17ee
Binary files /dev/null and b/icons/ui_icons/dna/dna_undiscovered.gif differ
diff --git a/icons/UI_Icons/inventory/back.png b/icons/ui_icons/inventory/back.png
similarity index 100%
rename from icons/UI_Icons/inventory/back.png
rename to icons/ui_icons/inventory/back.png
diff --git a/icons/UI_Icons/inventory/belt.png b/icons/ui_icons/inventory/belt.png
similarity index 100%
rename from icons/UI_Icons/inventory/belt.png
rename to icons/ui_icons/inventory/belt.png
diff --git a/icons/UI_Icons/inventory/collar.png b/icons/ui_icons/inventory/collar.png
similarity index 100%
rename from icons/UI_Icons/inventory/collar.png
rename to icons/ui_icons/inventory/collar.png
diff --git a/icons/UI_Icons/inventory/ears.png b/icons/ui_icons/inventory/ears.png
similarity index 100%
rename from icons/UI_Icons/inventory/ears.png
rename to icons/ui_icons/inventory/ears.png
diff --git a/icons/UI_Icons/inventory/glasses.png b/icons/ui_icons/inventory/glasses.png
similarity index 100%
rename from icons/UI_Icons/inventory/glasses.png
rename to icons/ui_icons/inventory/glasses.png
diff --git a/icons/UI_Icons/inventory/gloves.png b/icons/ui_icons/inventory/gloves.png
similarity index 100%
rename from icons/UI_Icons/inventory/gloves.png
rename to icons/ui_icons/inventory/gloves.png
diff --git a/icons/UI_Icons/inventory/hand_l.png b/icons/ui_icons/inventory/hand_l.png
similarity index 100%
rename from icons/UI_Icons/inventory/hand_l.png
rename to icons/ui_icons/inventory/hand_l.png
diff --git a/icons/UI_Icons/inventory/hand_r.png b/icons/ui_icons/inventory/hand_r.png
similarity index 100%
rename from icons/UI_Icons/inventory/hand_r.png
rename to icons/ui_icons/inventory/hand_r.png
diff --git a/icons/UI_Icons/inventory/head.png b/icons/ui_icons/inventory/head.png
similarity index 100%
rename from icons/UI_Icons/inventory/head.png
rename to icons/ui_icons/inventory/head.png
diff --git a/icons/UI_Icons/inventory/id.png b/icons/ui_icons/inventory/id.png
similarity index 100%
rename from icons/UI_Icons/inventory/id.png
rename to icons/ui_icons/inventory/id.png
diff --git a/icons/UI_Icons/inventory/mask.png b/icons/ui_icons/inventory/mask.png
similarity index 100%
rename from icons/UI_Icons/inventory/mask.png
rename to icons/ui_icons/inventory/mask.png
diff --git a/icons/UI_Icons/inventory/neck.png b/icons/ui_icons/inventory/neck.png
similarity index 100%
rename from icons/UI_Icons/inventory/neck.png
rename to icons/ui_icons/inventory/neck.png
diff --git a/icons/UI_Icons/inventory/pocket.png b/icons/ui_icons/inventory/pocket.png
similarity index 100%
rename from icons/UI_Icons/inventory/pocket.png
rename to icons/ui_icons/inventory/pocket.png
diff --git a/icons/UI_Icons/inventory/shoes.png b/icons/ui_icons/inventory/shoes.png
similarity index 100%
rename from icons/UI_Icons/inventory/shoes.png
rename to icons/ui_icons/inventory/shoes.png
diff --git a/icons/UI_Icons/inventory/suit.png b/icons/ui_icons/inventory/suit.png
similarity index 100%
rename from icons/UI_Icons/inventory/suit.png
rename to icons/ui_icons/inventory/suit.png
diff --git a/icons/UI_Icons/inventory/suit_storage.png b/icons/ui_icons/inventory/suit_storage.png
similarity index 100%
rename from icons/UI_Icons/inventory/suit_storage.png
rename to icons/ui_icons/inventory/suit_storage.png
diff --git a/icons/UI_Icons/inventory/uniform.png b/icons/ui_icons/inventory/uniform.png
similarity index 100%
rename from icons/UI_Icons/inventory/uniform.png
rename to icons/ui_icons/inventory/uniform.png
diff --git a/html/high_button.png b/icons/ui_icons/notes/high_button.png
similarity index 100%
rename from html/high_button.png
rename to icons/ui_icons/notes/high_button.png
diff --git a/html/medium_button.png b/icons/ui_icons/notes/medium_button.png
similarity index 100%
rename from html/medium_button.png
rename to icons/ui_icons/notes/medium_button.png
diff --git a/html/minor_button.png b/icons/ui_icons/notes/minor_button.png
similarity index 100%
rename from html/minor_button.png
rename to icons/ui_icons/notes/minor_button.png
diff --git a/html/none_button.png b/icons/ui_icons/notes/none_button.png
similarity index 100%
rename from html/none_button.png
rename to icons/ui_icons/notes/none_button.png
diff --git a/html/ghost.png b/icons/ui_icons/orbit/ghost.png
similarity index 100%
rename from html/ghost.png
rename to icons/ui_icons/orbit/ghost.png
diff --git a/icons/UI_Icons/Pills/pill1.png b/icons/ui_icons/pills/pill1.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill1.png
rename to icons/ui_icons/pills/pill1.png
diff --git a/icons/UI_Icons/Pills/pill10.png b/icons/ui_icons/pills/pill10.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill10.png
rename to icons/ui_icons/pills/pill10.png
diff --git a/icons/UI_Icons/Pills/pill11.png b/icons/ui_icons/pills/pill11.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill11.png
rename to icons/ui_icons/pills/pill11.png
diff --git a/icons/UI_Icons/Pills/pill12.png b/icons/ui_icons/pills/pill12.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill12.png
rename to icons/ui_icons/pills/pill12.png
diff --git a/icons/UI_Icons/Pills/pill13.png b/icons/ui_icons/pills/pill13.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill13.png
rename to icons/ui_icons/pills/pill13.png
diff --git a/icons/UI_Icons/Pills/pill14.png b/icons/ui_icons/pills/pill14.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill14.png
rename to icons/ui_icons/pills/pill14.png
diff --git a/icons/UI_Icons/Pills/pill15.png b/icons/ui_icons/pills/pill15.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill15.png
rename to icons/ui_icons/pills/pill15.png
diff --git a/icons/UI_Icons/Pills/pill16.png b/icons/ui_icons/pills/pill16.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill16.png
rename to icons/ui_icons/pills/pill16.png
diff --git a/icons/UI_Icons/Pills/pill17.png b/icons/ui_icons/pills/pill17.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill17.png
rename to icons/ui_icons/pills/pill17.png
diff --git a/icons/UI_Icons/Pills/pill18.png b/icons/ui_icons/pills/pill18.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill18.png
rename to icons/ui_icons/pills/pill18.png
diff --git a/icons/UI_Icons/Pills/pill19.png b/icons/ui_icons/pills/pill19.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill19.png
rename to icons/ui_icons/pills/pill19.png
diff --git a/icons/UI_Icons/Pills/pill2.png b/icons/ui_icons/pills/pill2.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill2.png
rename to icons/ui_icons/pills/pill2.png
diff --git a/icons/UI_Icons/Pills/pill20.png b/icons/ui_icons/pills/pill20.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill20.png
rename to icons/ui_icons/pills/pill20.png
diff --git a/icons/UI_Icons/Pills/pill21.png b/icons/ui_icons/pills/pill21.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill21.png
rename to icons/ui_icons/pills/pill21.png
diff --git a/icons/UI_Icons/Pills/pill22.png b/icons/ui_icons/pills/pill22.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill22.png
rename to icons/ui_icons/pills/pill22.png
diff --git a/icons/UI_Icons/Pills/pill3.png b/icons/ui_icons/pills/pill3.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill3.png
rename to icons/ui_icons/pills/pill3.png
diff --git a/icons/UI_Icons/Pills/pill4.png b/icons/ui_icons/pills/pill4.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill4.png
rename to icons/ui_icons/pills/pill4.png
diff --git a/icons/UI_Icons/Pills/pill5.png b/icons/ui_icons/pills/pill5.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill5.png
rename to icons/ui_icons/pills/pill5.png
diff --git a/icons/UI_Icons/Pills/pill6.png b/icons/ui_icons/pills/pill6.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill6.png
rename to icons/ui_icons/pills/pill6.png
diff --git a/icons/UI_Icons/Pills/pill7.png b/icons/ui_icons/pills/pill7.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill7.png
rename to icons/ui_icons/pills/pill7.png
diff --git a/icons/UI_Icons/Pills/pill8.png b/icons/ui_icons/pills/pill8.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill8.png
rename to icons/ui_icons/pills/pill8.png
diff --git a/icons/UI_Icons/Pills/pill9.png b/icons/ui_icons/pills/pill9.png
similarity index 100%
rename from icons/UI_Icons/Pills/pill9.png
rename to icons/ui_icons/pills/pill9.png
diff --git a/html/safe_dial.png b/icons/ui_icons/safe/safe_dial.png
similarity index 100%
rename from html/safe_dial.png
rename to icons/ui_icons/safe/safe_dial.png
diff --git a/icons/UI_Icons/tgui/ntosradar_background.png b/icons/ui_icons/tgui/ntosradar_background.png
similarity index 100%
rename from icons/UI_Icons/tgui/ntosradar_background.png
rename to icons/ui_icons/tgui/ntosradar_background.png
diff --git a/icons/UI_Icons/tgui/ntosradar_pointer.png b/icons/ui_icons/tgui/ntosradar_pointer.png
similarity index 100%
rename from icons/UI_Icons/tgui/ntosradar_pointer.png
rename to icons/ui_icons/tgui/ntosradar_pointer.png
diff --git a/icons/UI_Icons/tgui/ntosradar_pointer_S.png b/icons/ui_icons/tgui/ntosradar_pointer_S.png
similarity index 100%
rename from icons/UI_Icons/tgui/ntosradar_pointer_S.png
rename to icons/ui_icons/tgui/ntosradar_pointer_S.png