Added Hypnotize's Icons

- Updated to Hypnotize's icon pack.
- Updated multiple files, removed unused code.

26 files changed, 1041 insertions, 1259 deletions

diff --git a/resource/ui/econ/backpackpanel.res b/resource/ui/econ/backpackpanel.res
index 67398f6..bd95d7a 100644
--- a/resource/ui/econ/backpackpanel.res
+++ b/resource/ui/econ/backpackpanel.res
@@ -2,70 +2,70 @@
 {
 	"backpack_panel"
 	{
-		"ControlName"		"Frame"
-		"fieldName"			"backpack_panel"
-		"xpos"				"0"
-		"ypos"				"0"
-		"wide"				"f0"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
+		"ControlName"			"Frame"
+		"fieldName"				"backpack_panel"
+		"xpos"					"0"
+		"ypos"					"0"
+		"wide"					"f0"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
 		"settitlebarvisible"	"0"
 		"PaintBackgroundType"	"0"
 		"bgcolor_override"				"DarkGrey"
 		"infocus_bgcolor_override"		"DarkGrey"
 		"outoffocus_bgcolor_override" 	"DarkGrey"
 
-		"item_xpos_offcenter_a"	"-310"
-		"item_xpos_offcenter_b"	"165"
-		"item_ypos"				"60"
-		"item_ydelta"			"80"
-		"item_mod_wide"			"40"
+		"item_xpos_offcenter_a"			"-310"
+		"item_xpos_offcenter_b"			"165"
+		"item_ypos"						"60"
+		"item_ydelta"					"80"
+		"item_mod_wide"					"40"
 
-		"item_backpack_offcenter_x"	"-288"
-		"item_backpack_xdelta"		"4"
-		"item_backpack_ydelta"		"3"
+		"item_backpack_offcenter_x"		"-288"
+		"item_backpack_xdelta"			"4"
+		"item_backpack_ydelta"			"3"
 
-		"button_xpos_offcenter"		"175"
-		"button_ypos"				"85"
-		"button_ydelta"				"80"
-		"button_override_delete_xpos" "0"
+		"button_xpos_offcenter"			"175"
+		"button_ypos"					"85"
+		"button_ydelta"					"80"
+		"button_override_delete_xpos"	"0"
 
-		"page_button_y"			"288"
-		"page_button_x_delta"	"3"
-		"page_button_y_delta"	"3"
-		"page_button_per_row"	"20"
-		"page_button_height"	"13"
+		"page_button_y"					"288"
+		"page_button_x_delta"			"3"
+		"page_button_y_delta"			"3"
+		"page_button_per_row"			"20"
+		"page_button_height"			"13"
 
 		"pagebuttons_kv"
 		{
-			"ControlName"		"EditablePanel"
-			"wide"				"10"
-			"tall"				"10"
-			"visible"			"0"
-			"bgcolor_override"	"Transparent"
-			"noitem_textcolor"	"TextColor"
+			"ControlName"			"EditablePanel"
+			"wide"					"10"
+			"tall"					"10"
+			"visible"				"0"
+			"bgcolor_override"		"Transparent"
+			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
 			"paintborder"			"1"
 
 			"Button"
 			{
-				"fieldName"			"Button"
-				"ControlName"		"CExButton"
-				"wide"				"25"
-				"tall"				"13"
-				"visible"			"1"
-				"bgcolor_override"	"Transparent"
-				"noitem_textcolor"	"TextColor"
+				"fieldName"				"Button"
+				"ControlName"			"CExButton"
+				"wide"					"25"
+				"tall"					"13"
+				"visible"				"1"
+				"bgcolor_override"		"Transparent"
+				"noitem_textcolor"		"TextColor"
 				"PaintBackgroundType"	"2"
-				"paintborder"		"1"
-				"textAlignment"		"center"
-				"labelText"			"%page%"
-				"font"				"HudFontSmallest"
-				"sound_depressed"	"UI/buttonclick.wav"
-				"sound_released"	"UI/buttonclickrelease.wav"
+				"paintborder"			"1"
+				"textAlignment"			"center"
+				"labelText"				"%page%"
+				"font"					"HudFontSmallest"
+				"sound_depressed"		"UI/buttonclick.wav"
+				"sound_released"		"UI/buttonclickrelease.wav"
 			}
 
 			"New"
@@ -95,27 +95,27 @@
 
 		"modelpanels_kv"
 		{
-			"ControlName"	"CItemModelPanel"
-			"xpos"			"c-70"
-			"ypos"			"270"
-			"wide"			"54"
-			"tall"			"42"
-			"visible"		"0"
+			"ControlName"			"CItemModelPanel"
+			"xpos"					"c-70"
+			"ypos"					"270"
+			"wide"					"54"
+			"tall"					"42"
+			"visible"				"0"
 			"bgcolor_override"		"Transparent"
 			"noitem_textcolor"		"TextColor"
 			"PaintBackgroundType"	"2"
-			"paintborder"	"1"
+			"paintborder"			"1"
 
-			"model_xpos"	"2"
-			"model_ypos"	"5"
-			"model_wide"	"50"
-			"model_tall"	"35"
-			"text_ypos"		"60"
-			"text_center"	"1"
-			"name_only"		"1"
+			"model_xpos"			"2"
+			"model_ypos"			"5"
+			"model_wide"			"50"
+			"model_tall"			"35"
+			"text_ypos"				"60"
+			"text_center"			"1"
+			"name_only"				"1"
 
-			"inset_eq_x"	"2"
-			"inset_eq_y"	"2"
+			"inset_eq_x"			"2"
+			"inset_eq_y"			"2"
 
 			"itemmodelpanel"
 			{
@@ -126,27 +126,27 @@
 
 			"New"
 			{
-				"ControlName"	"CExLabel"
-				"fieldName"		"New"
-				"font"			"FontStorePrice"
-				"textAlignment"	"east"
-				"xpos"			"rs1"
-				"ypos"			"0"
-				"zpos"			"15"
-				"wide"			"25"
-				"tall"			"12"
-				"textinsetx"	"8"
-				"autoResize"	"0"
+				"ControlName"		"CExLabel"
+				"fieldName"			"New"
+				"font"				"FontStorePrice"
+				"textAlignment"		"east"
+				"xpos"				"rs1"
+				"ypos"				"0"
+				"zpos"				"15"
+				"wide"				"25"
+				"tall"				"12"
+				"textinsetx"		"8"
+				"autoResize"		"0"
 				"skip_autoresize"	"1"
-				"pinCorner"		"0"
-				"visible"		"0"
-				"enabled"		"1"
-				"labelText"		"#Store_Price_New"
+				"pinCorner"			"0"
+				"visible"			"0"
+				"enabled"			"1"
+				"labelText"			"#Store_Price_New"
 				"mouseinputenabled" "0"
 				"paintbackground"	"0"
 				"proportionaltoparent"	"1"
-				"border"		"StoreNewBorder"
-				"fgcolor"		"10 10 10 255"
+				"border"			"StoreNewBorder"
+				"fgcolor"			"10 10 10 255"
 			}
 
 			"use_item_sounds"	"1"
@@ -531,6 +531,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"canceltool"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 		"bgcolor_override"	"DarkerGrey"
@@ -621,37 +622,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PositionLabel"
@@ -795,37 +780,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
@@ -1016,37 +985,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override" "TanDarker"
-			"armedFgColor_override" "LightRed"
-			"depressedFgColor_override" "TanDarker"
-			"image_drawcolor"	"TextColor"
-			"image_armedcolor"	"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
@@ -1238,37 +1191,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TextColor"
-			"image_armedcolor"			"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
@@ -1459,37 +1396,21 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"tabPosition"	"0"
-			"labeltext"		""
-			"font"			"HudFontSmallBold"
+			"labeltext"		"("
+			"font"			"CustomIcons"
 			"textAlignment"	"center"
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"sound_depressed"	"UI/buttonclick.wav"
-			"sound_released"	"UI/buttonclickrelease.wav"
 			"Command"			"close"
 			"paintbackground"	"0"
-
-			"defaultFgColor_override"	"TanDarker"
-			"armedFgColor_override"		"LightRed"
-			"depressedFgColor_override"	"TanDarker"
-			"image_drawcolor"			"TextColor"
-			"image_armedcolor"			"LightRed"
-
-			"SubImage"
-			{
-				"ControlName"	"ImagePanel"
-				"fieldName"		"SubImage"
-				"xpos"			"0"
-				"ypos"			"0"
-				"zpos"			"1"
-				"wide"			"14"
-				"tall"			"14"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"replay/thumbnails/close"
-				"scaleImage"	"1"
-			}
+			
+			"sound_depressed"	"UI/buttonclick.wav"
+			"sound_released"	"UI/buttonclickrelease.wav"
+			
+			"defaultFgColor_override" 	"White"
+			"armedFgColor_override" 	"LightRed"
+			"depressedFgColor_override" "White"
 		}
 
 		"PrevButton"
diff --git a/resource/ui/econ/comboboxbackpackoverlaydialog.res b/resource/ui/econ/comboboxbackpackoverlaydialog.res
index 0771a93..94f76d3 100644
--- a/resource/ui/econ/comboboxbackpackoverlaydialog.res
+++ b/resource/ui/econ/comboboxbackpackoverlaydialog.res
@@ -17,46 +17,46 @@
 
 	"TitleLabel"
 	{
-		"ControlName"		"CExLabel"
-		"fieldName"			"TitleLabel"
-		"font"				"HudFontMediumBold"
-		"labelText"			"#TF_Item_SelectStyle"
-		"textAlignment"		"center"
-		"xpos"				"0"
-		"ypos"				"0"
-		"zpos"				"0"
-		"wide"				"280"
-		"tall"				"60"
-		"autoResize"		"1"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"centerwrap"		"1"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TitleLabel"
+		"font"					"HudFontMediumBold"
+		"labelText"				"#TF_Item_SelectStyle"
+		"textAlignment"			"center"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"0"
+		"wide"					"280"
+		"tall"					"60"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"centerwrap"			"1"
 	}
 
 	"preview_model"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"preview_model"
-		"xpos"				"60"
-		"ypos"				"40"
-		"zpos"				"1"
-		"wide"				"160"
-		"tall"				"120"
-		"visible"			"1"
-		"enabled"			"1"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"preview_model"
+		"xpos"					"60"
+		"ypos"					"40"
+		"zpos"					"1"
+		"wide"					"160"
+		"tall"					"120"
+		"visible"				"1"
+		"enabled"				"1"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"		"1"
-		"model_xpos"		"2"
-		"model_ypos"		"5"
-		"model_wide"		"160"
-		"model_tall"		"120"
-		"text_ypos"			"120"		// Hide it off the bottom
-		"text_center"		"1"
-		"name_only"			"1"
-		"paint_icon_hide"	"1"
+		"paintborder"			"1"
+		"model_xpos"			"2"
+		"model_ypos"			"5"
+		"model_wide"			"160"
+		"model_tall"			"120"
+		"text_ypos"				"120"		// Hide it off the bottom
+		"text_center"			"1"
+		"name_only"				"1"
+		"paint_icon_hide"		"1"
 
 		"itemmodelpanel"
 		{
@@ -69,81 +69,81 @@
 
 	"ComboBox"
 	{
-		"ControlName"		"ComboBox"
-		"fieldName"			"ComboBox"
-		"Font"				"HudFontSmallest"
-		"xpos"				"30"
-		"ypos"				"170"
-		"zpos"				"1"
-		"wide"				"220"
-		"tall"				"15"
-		"autoResize"		"0"
-		"pinCorner"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"1"
-		"textHidden"		"0"
-		"editable"			"0"
-		"maxchars"			"-1"
-		"NumericInputOnly"	"0"
-		"unicode"			"0"
-
-		"fgcolor_override"	"White"
-		"bgcolor_override"	"Black"
-		"disabledFgColor_override" "White"
-		"disabledBgColor_override" "Black"
-		"selectionColor_override" "Black"
-		"selectionTextColor_override" "White"
-		"defaultSelectionBG2Color_override" "Black"
+		"ControlName"			"ComboBox"
+		"fieldName"				"ComboBox"
+		"Font"					"HudFontSmallest"
+		"xpos"					"30"
+		"ypos"					"170"
+		"zpos"					"1"
+		"wide"					"220"
+		"tall"					"15"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"1"
+		"textHidden"			"0"
+		"editable"				"0"
+		"maxchars"				"-1"
+		"NumericInputOnly"		"0"
+		"unicode"				"0"
+		
+		"fgcolor_override"					"White"
+		"bgcolor_override"					"Black"
+		"disabledFgColor_override"			"White"
+		"disabledBgColor_override"			"Black"
+		"selectionColor_override"			"Black"
+		"selectionTextColor_override" 		"White"
+		"defaultSelectionBG2Color_override"	"Black"
 	}
 
 	"CancelButton"
 	{
-		"ControlName"		"CExButton"
-		"fieldName"			"CancelButton"
-		"xpos"				"60"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"70"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#Cancel"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"0"
-		"Command"			"cancel"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"CancelButton"
+		"xpos"					"60"
+		"ypos"					"200"
+		"zpos"					"1"
+		"wide"					"70"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"3"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#Cancel"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"0"
+		"Command"				"cancel"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 
 	"OkButton"
 	{
-		"ControlName"		"CExButton"
-		"fieldName"			"OkButton"
-		"xpos"				"150"
-		"ypos"				"200"
-		"zpos"				"1"
-		"wide"				"70"
-		"tall"				"20"
-		"autoResize"		"0"
-		"pinCorner"			"3"
-		"visible"			"1"
-		"enabled"			"1"
-		"tabPosition"		"0"
-		"labelText"			"#TF_OK"
-		"font"				"HudFontSmall"
-		"textAlignment"		"center"
-		"dulltext"			"0"
-		"brighttext"		"0"
-		"default"			"1"
-		"Command"			"apply"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"OkButton"
+		"xpos"					"150"
+		"ypos"					"200"
+		"zpos"					"1"
+		"wide"					"70"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"3"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#TF_OK"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"apply"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/confirmapplygiftwrapdialog.res b/resource/ui/econ/confirmapplygiftwrapdialog.res
index ea7e427..219c190 100644
--- a/resource/ui/econ/confirmapplygiftwrapdialog.res
+++ b/resource/ui/econ/confirmapplygiftwrapdialog.res
@@ -123,6 +123,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
diff --git a/resource/ui/econ/confirmapplypaintcandialog.res b/resource/ui/econ/confirmapplypaintcandialog.res
index 20a49e1..1870e0f 100644
--- a/resource/ui/econ/confirmapplypaintcandialog.res
+++ b/resource/ui/econ/confirmapplypaintcandialog.res
@@ -17,103 +17,103 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"mouseoveritempanel"
-		"xpos"			"c-70"
-		"ypos"			"270"
-		"zpos"			"100"
-		"wide"			"300"
-		"tall"			"300"
-		"visible"		"0"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"mouseoveritempanel"
+		"xpos"					"c-70"
+		"ypos"					"270"
+		"zpos"					"100"
+		"wide"					"300"
+		"tall"					"300"
+		"visible"				"0"
 		"bgcolor_override"		"Transparent"
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"		"1"
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"1"
-		"resize_to_text"	"1"
-		"padding_height"	"15"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
-			"font"			"ItemFontAttribLarge"
-			"xpos"			"0"
-			"ypos"			"30"
-			"zpos"			"2"
-			"wide"			"140"
-			"tall"			"60"
-			"autoResize"	"0"
-			"pinCorner"		"0"
-			"visible"		"1"
-			"enabled"		"1"
-			"labelText"		"%attriblist%"
-			"textAlignment"	"center"
-			"fgcolor"		"TextColor"
-			"centerwrap"	"1"
+			"font"				"ItemFontAttribLarge"
+			"xpos"				"0"
+			"ypos"				"30"
+			"zpos"				"2"
+			"wide"				"140"
+			"tall"				"60"
+			"autoResize"		"0"
+			"pinCorner"			"0"
+			"visible"			"1"
+			"enabled"			"1"
+			"labelText"			"%attriblist%"
+			"textAlignment"		"center"
+			"fgcolor"			"TextColor"
+			"centerwrap"		"1"
 		}
 	}
 
 	"TitleLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"TitleLabel"
-		"font"			"HudFontMediumBold"
-		"labelText"		"dynamic"
-		"textAlignment"	"center"
-		"xpos"			"100"
-		"ypos"			"10"
-		"zpos"			"0"
-		"wide"			"200"
-		"tall"			"60"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"centerwrap"	"1"
+		"ControlName"			"CExLabel"
+		"fieldName"				"TitleLabel"
+		"font"					"HudFontMediumBold"
+		"labelText"				"dynamic"
+		"textAlignment"			"center"
+		"xpos"					"100"
+		"ypos"					"10"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"60"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"centerwrap"			"1"
 	}
 
 	"ToolBG"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ToolBG"
-		"font"			"HudFontSmallBold"
-		"labelText"		""
-		"textAlignment"	"east"
-		"xpos"			"10"
-		"ypos"			"10"
-		"zpos"			"-1"
-		"wide"			"84"
-		"tall"			"64"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"paintbackground" "0"
-		"border"		"BackpackItemBorder_SelfMade"
+		"ControlName"			"CExLabel"
+		"fieldName"				"ToolBG"
+		"font"					"HudFontSmallBold"
+		"labelText"				""
+		"textAlignment"			"east"
+		"xpos"					"10"
+		"ypos"					"10"
+		"zpos"					"-1"
+		"wide"					"84"
+		"tall"					"64"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"paintbackground"		"0"
+		"border"				"BackpackItemBorder_SelfMade"
 	}
 	"tool_modelpanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"tool_modelpanel"
-		"xpos"			"10"
-		"ypos"			"10"
-		"zpos"			"1"
-		"wide"			"84"
-		"tall"			"64"
-		"visible"		"1"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"tool_modelpanel"
+		"xpos"					"10"
+		"ypos"					"10"
+		"zpos"					"1"
+		"wide"					"84"
+		"tall"					"64"
+		"visible"				"1"
 		"bgcolor_override"		"Transparent"
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"	"0"
-		"model_xpos"	"2"
-		"model_ypos"	"5"
-		"model_wide"	"80"
-		"model_tall"	"54"
-		"text_ypos"		"100"
-		"text_center"	"1"
-		"name_only"		"1"
-		"paint_icon_hide" "1"
+		"paintborder"			"0"
+		"model_xpos"			"2"
+		"model_ypos"			"5"
+		"model_wide"			"80"
+		"model_tall"			"54"
+		"text_ypos"				"100"
+		"text_center"			"1"
+		"name_only"				"1"
+		"paint_icon_hide"		"1"
 
 		"itemmodelpanel"
 		{
@@ -122,169 +122,173 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"SubjectBG"
-		"font"			"HudFontSmallBold"
-		"labelText"		""
-		"textAlignment"	"east"
-		"xpos"			"300"
-		"ypos"			"10"
-		"zpos"			"-1"
-		"wide"			"84"
-		"tall"			"64"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"paintbackground" "0"
-		"border"		"BackpackItemBorder_Vintage"
+		"ControlName"			"CExLabel"
+		"fieldName"				"SubjectBG"
+		"font"					"HudFontSmallBold"
+		"labelText"				""
+		"textAlignment"			"east"
+		"xpos"					"300"
+		"ypos"					"10"
+		"zpos"					"-1"
+		"wide"					"84"
+		"tall"					"64"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"paintbackground"		"0"
+		"border"				"BackpackItemBorder_Vintage"
 	}
 	"subject_modelpanel"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"subject_modelpanel"
-		"xpos"			"300"
-		"ypos"			"10"
-		"zpos"			"1"
-		"wide"			"84"
-		"tall"			"64"
-		"visible"		"1"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"subject_modelpanel"
+		"xpos"					"300"
+		"ypos"					"10"
+		"zpos"					"1"
+		"wide"					"84"
+		"tall"					"64"
+		"visible"				"1"
 		"bgcolor_override"		"Transparent"
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"	"0"
-		"model_xpos"	"2"
-		"model_ypos"	"5"
-		"model_wide"	"80"
-		"model_tall"	"54"
-		"text_ypos"		"100"
-		"text_center"	"1"
-		"name_only"		"1"
+		"paintborder"			"0"
+		"model_xpos"			"2"
+		"model_ypos"			"5"
+		"model_wide"			"80"
+		"model_tall"			"54"
+		"text_ypos"				"100"
+		"text_center"			"1"
+		"name_only"				"1"
 
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
 			"allow_rot"				"0"
+			"inventory_image_type"	"1"
 		}
 	}
 
 	"ConfirmLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"ConfirmLabel"
-		"font"			"HudFontSmall"
-		"labelText"		"#ToolPaintConfirm"
-		"textAlignment"	"center"
-		"xpos"			"20"
-		"ypos"			"80"
-		"zpos"			"0"
-		"wide"			"360"
-		"tall"			"20"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor_override" "Yellow"
+		"ControlName"			"CExLabel"
+		"fieldName"				"ConfirmLabel"
+		"font"					"HudFontSmall"
+		"labelText"				"#ToolPaintConfirm"
+		"textAlignment"			"center"
+		"xpos"					"20"
+		"ypos"					"80"
+		"zpos"					"0"
+		"wide"					"360"
+		"tall"					"20"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"fgcolor_override"		"Yellow"
 	}
 
 	"paint_model"
 	{
-		"ControlName"	"CItemModelPanel"
-		"fieldName"		"paint_model"
-		"xpos"			"150"
-		"ypos"			"95"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"100"
-		"visible"		"1"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"paint_model"
+		"xpos"					"150"
+		"ypos"					"95"
+		"zpos"					"1"
+		"wide"					"100"
+		"tall"					"100"
+		"visible"				"1"
 		"bgcolor_override"		"Transparent"
 		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"	"0"
-		"model_xpos"	"2"
-		"model_ypos"	"5"
-		"model_wide"	"100"
-		"model_tall"	"100"
-		"text_ypos"		"100"
-		"text_center"	"1"
-		"name_only"		"1"
-		"paint_icon_hide" "1"
+		"paintborder"			"0"
+		"model_xpos"			"2"
+		"model_ypos"			"5"
+		"model_wide"			"100"
+		"model_tall"			"100"
+		"text_ypos"				"100"
+		"text_center"			"1"
+		"name_only"				"1"
+		"paint_icon_hide"		"1"
+		
 		"itemmodelpanel"
 		{
 			"force_use_model"		"1"
 			"use_item_rendertarget" "1"
 			"allow_rot"				"1"
+			"inventory_image_type"	"1"
 		}
 	}
 
 	"WarningLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"WarningLabel"
-		"font"			"HudFontSmall"
-		"labelText"		"#ToolPaintConfirmWarning"
-		"textAlignment"	"center"
-		"xpos"			"0"
-		"ypos"			"170"
-		"zpos"			"0"
-		"wide"			"400"
-		"tall"			"20"
-		"autoResize"	"1"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"fgcolor_override" "Yellow"
+		"ControlName"			"CExLabel"
+		"fieldName"				"WarningLabel"
+		"font"					"HudFontSmall"
+		"labelText"				"#ToolPaintConfirmWarning"
+		"textAlignment"			"center"
+		"xpos"					"0"
+		"ypos"					"170"
+		"zpos"					"0"
+		"wide"					"400"
+		"tall"					"20"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"fgcolor_override"		"Yellow"
 	}
 
 	"CancelButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"CancelButton"
-		"xpos"			"50"
-		"ypos"			"200"
-		"zpos"			"1"
-		"wide"			"130"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#Cancel"
-		"font"			"HudFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"0"
-		"Command"		"cancel"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"CancelButton"
+		"xpos"					"50"
+		"ypos"					"200"
+		"zpos"					"1"
+		"wide"					"130"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"3"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#Cancel"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"0"
+		"Command"				"cancel"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 
 	"OkButton"
 	{
-		"ControlName"	"CExButton"
-		"fieldName"		"OkButton"
-		"xpos"			"220"
-		"ypos"			"200"
-		"zpos"			"1"
-		"wide"			"130"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#CraftNameConfirm"
-		"font"			"HudFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"Command"		"apply"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExButton"
+		"fieldName"				"OkButton"
+		"xpos"					"220"
+		"ypos"					"200"
+		"zpos"					"1"
+		"wide"					"130"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"3"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#CraftNameConfirm"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"apply"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
index 92d0343..e1a9cc2 100644
--- a/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
+++ b/resource/ui/econ/confirmapplystrangepartapplicationdialog.res
@@ -17,23 +17,23 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"mouseoveritempanel"
+		"xpos"					"c-70"
+		"ypos"					"270"
+		"zpos"					"100"
+		"wide"					"300"
+		"tall"					"300"
+		"visible"				"0"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"		"1"
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"1"
-		"resize_to_text"	"1"
-		"padding_height"	"15"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
@@ -122,6 +122,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
@@ -159,15 +160,15 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
 
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
 			"inventory_image_type"	"1"
+			"allow_rot"				"0"
 		}
 	}
 
diff --git a/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res b/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res
index 16edfa4..c9a1397 100644
--- a/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res
+++ b/resource/ui/econ/confirmapplystrangerestrictionapplicationdialog.res
@@ -17,23 +17,23 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"mouseoveritempanel"
+		"xpos"					"c-70"
+		"ypos"					"270"
+		"zpos"					"100"
+		"wide"					"300"
+		"tall"					"300"
+		"visible"				"0"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"		"1"
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"1"
-		"resize_to_text"	"1"
-		"padding_height"	"15"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
@@ -110,11 +110,11 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
 		"paint_icon_hide" "1"
-
+		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
@@ -122,6 +122,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
@@ -160,15 +161,15 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
-
+		
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
 			"inventory_image_type"	"1"
+			"allow_rot"				"0"
 		}
 	}
 
diff --git a/resource/ui/econ/confirmapplystrangifierdialog.res b/resource/ui/econ/confirmapplystrangifierdialog.res
index b31c461..a20c064 100644
--- a/resource/ui/econ/confirmapplystrangifierdialog.res
+++ b/resource/ui/econ/confirmapplystrangifierdialog.res
@@ -17,23 +17,23 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"mouseoveritempanel"
+		"xpos"					"c-70"
+		"ypos"					"270"
+		"zpos"					"100"
+		"wide"					"300"
+		"tall"					"300"
+		"visible"				"0"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"		"1"
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"1"
-		"resize_to_text"	"1"
-		"padding_height"	"15"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
@@ -110,7 +110,7 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
 		"paint_icon_hide" "1"
@@ -122,6 +122,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
@@ -160,15 +161,15 @@
 		"model_ypos"	"5"
 		"model_wide"	"80"
 		"model_tall"	"54"
-		"text_ypos"		"100"
+		"text_ypos"		"100"		// Hide it off the bottom
 		"text_center"	"1"
 		"name_only"		"1"
 
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
-			"allow_rot"				"0"
 			"inventory_image_type"	"1"
+			"allow_rot"				"0"
 		}
 	}
 
diff --git a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
index a088d91..7093e68 100644
--- a/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
+++ b/resource/ui/econ/confirmapplyteamcolorpaintcandialog.res
@@ -17,23 +17,23 @@
 
 	"mouseoveritempanel"
 	{
-		"ControlName"		"CItemModelPanel"
-		"fieldName"			"mouseoveritempanel"
-		"xpos"				"c-70"
-		"ypos"				"270"
-		"zpos"				"100"
-		"wide"				"300"
-		"tall"				"300"
-		"visible"			"0"
-		"bgcolor_override"	"Transparent"
-		"noitem_textcolor"	"TextColor"
+		"ControlName"			"CItemModelPanel"
+		"fieldName"				"mouseoveritempanel"
+		"xpos"					"c-70"
+		"ypos"					"270"
+		"zpos"					"100"
+		"wide"					"300"
+		"tall"					"300"
+		"visible"				"0"
+		"bgcolor_override"		"Transparent"
+		"noitem_textcolor"		"TextColor"
 		"PaintBackgroundType"	"2"
-		"paintborder"		"1"
-		"text_ypos"			"20"
-		"text_center"		"1"
-		"model_hide"		"1"
-		"resize_to_text"	"1"
-		"padding_height"	"15"
+		"paintborder"			"1"
+		"text_ypos"				"20"
+		"text_center"			"1"
+		"model_hide"			"1"
+		"resize_to_text"		"1"
+		"padding_height"		"15"
 
 		"attriblabel"
 		{
@@ -122,6 +122,7 @@
 			"inventory_image_type"	"1"
 		}
 	}
+	
 	"SubjectBG"
 	{
 		"ControlName"	"CExLabel"
@@ -216,6 +217,7 @@
 		{
 			"force_use_model"		"1"
 			"use_item_rendertarget" "1"
+			"inventory_image_type"	"1"
 			"allow_rot"				"1"
 		}
 	}
@@ -246,6 +248,7 @@
 		{
 			"force_use_model"		"1"
 			"use_item_rendertarget" "1"
+			"inventory_image_type"	"1"
 			"allow_rot"				"1"
 		}
 	}
diff --git a/resource/ui/econ/confirmcustomizetexturedialog.res b/resource/ui/econ/confirmcustomizetexturedialog.res
index b5e3696..ded340c 100644
--- a/resource/ui/econ/confirmcustomizetexturedialog.res
+++ b/resource/ui/econ/confirmcustomizetexturedialog.res
@@ -184,6 +184,7 @@
 		"itemmodelpanel"
 		{
 			"use_item_rendertarget" "0"
+			"inventory_image_type"	"1"
 			"allow_rot"				"0"
 		}
 	}
@@ -212,9 +213,11 @@
 		//"name_only"		"1"
 		"model_only"		"1"
 		"paint_icon_hide" "1"
+		
 		"itemmodelpanel"
 		{
 			"force_use_model"		"1"
+			"inventory_image_type"	"1"
 			"use_item_rendertarget" "0"
 			"allow_rot"				"1"
 		}
@@ -302,60 +305,60 @@
 
 			"ForBestResultsLabel"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"	"CExLabel"
 				"fieldName"		"ForBestResultsLabel"
 				"font"			"HudFontSmall"
-				"xpos"		"40"
-				"ypos"		"140"
-				"wide"		"300"
-				"tall"		"40"
+				"xpos"			"40"
+				"ypos"			"140"
+				"wide"			"300"
+				"tall"			"40"
 				"labelText"		"#ToolCustomizeTextureBestResults"
 				"textAlignment"	"north-west"
-				"wrap" "1"
+				"wrap" 			"1"
 			}
 		}
 
 		"PreviewImageGroupBox"
 		{
 			"ControlName"		"EditablePanel"
-			"fieldName"		"PreviewImageGroupBox"
-			"xpos"		"360"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"180"
-			"tall"		"200"
-			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"fieldName"			"PreviewImageGroupBox"
+			"xpos"				"360"
+			"ypos"				"25"
+			"zpos"				"-1"
+			"wide"				"180"
+			"tall"				"200"
+			"border"			"GrayDialogBorder"
+			"bgcolor_override"	"DarkGrey"
 
 			"PreviewCroppedImage"
 			{
 				"ControlName"		"CRGBAImagePanel"
-				"fieldName"		"PreviewCroppedImage"
-				"xpos"		"20"
-				"ypos"		"20"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"140"
+				"fieldName"			"PreviewCroppedImage"
+				"xpos"				"20"
+				"ypos"				"20"
+				"zpos"				"-1"
+				"wide"				"140"
+				"tall"				"140"
 			}
 
 			"SquarizeComboBox"
 			{
 				"ControlName"		"ComboBox"
-				"fieldName"		"SquarizeComboBox"
-				"xpos"		"20"
-				"ypos"		"170"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"15"
-				"editable"		"0"
-				"font"			"HudFontSmall"
-
-				//"fgcolor_override"	"235 226 202 255"
-				"bgcolor_override"	"0 0 0 255"
-				//"disabledFgColor_override" "235 226 202 255"
-				"disabledBgColor_override" "0 0 0 255"
-				"selectionColor_override" "0 0 0 255"
-				"selectionTextColor_override" "235 226 202 255"
+				"fieldName"			"SquarizeComboBox"
+				"xpos"				"20"
+				"ypos"				"170"
+				"zpos"				"-1"
+				"wide"				"140"
+				"tall"				"15"
+				"editable"			"0"
+				"font"				"HudFontSmall"
+
+				//"fgcolor_override"				"235 226 202 255"
+				"bgcolor_override"					"0 0 0 255"
+				//"disabledFgColor_override" 		"235 226 202 255"
+				"disabledBgColor_override" 			"0 0 0 255"
+				"selectionColor_override" 			"0 0 0 255"
+				"selectionTextColor_override" 		"235 226 202 255"
 				"defaultSelectionBG2Color_override" "0 0 0 0"
 			}
 		}
@@ -364,7 +367,7 @@
 		{
 			"ControlName"	"CExButton"
 			"fieldName"		"CancelButton"
-			"xpos"			"00"
+			"xpos"			"0"
 			"ypos"			"230"
 			"zpos"			"1"
 			"wide"			"130"
@@ -424,70 +427,70 @@
 		"FilterOptionsGroupBox"
 		{
 			"ControlName"		"EditablePanel"
-			"fieldName"		"SelectFilterGroupBox"
-			"Font"		"HudFontSmallestBold"
-			"xpos"		"0"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"160"
-			"tall"		"200"
-			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"fieldName"			"SelectFilterGroupBox"
+			"Font"				"HudFontSmallestBold"
+			"xpos"				"0"
+			"ypos"				"25"
+			"zpos"				"-1"
+			"wide"				"160"
+			"tall"				"200"
+			"border"			"GrayDialogBorder"
+			"bgcolor_override"	"DarkGrey"
 
 			"FilterLabel"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"	"CExLabel"
 				"fieldName"		"FilterLabel"
 				"font"			"HudFontSmallBold"
-				"xpos"		"10"
-				"ypos"		"10"
-				"wide"		"140"
-				"tall"		"20"
+				"xpos"			"10"
+				"ypos"			"10"
+				"wide"			"140"
+				"tall"			"20"
 				"labelText"		"Filter:" // !FIXME! Localize
 				"textAlignment"	"north-west"
-				"visible"	"0"
+				"visible"		"0"
 			}
 
 			"FilterComboBox"
 			{
-				"ControlName"		"ComboBox"
+				"ControlName"	"ComboBox"
 				"fieldName"		"FilterComboBox"
-				"xpos"		"10"
-				"ypos"		"30"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"15"
+				"xpos"			"10"
+				"ypos"			"30"
+				"zpos"			"-1"
+				"wide"			"140"
+				"tall"			"15"
 				"editable"		"0"
 				"font"			"HudFontSmall"
-				"visible"	"0"
-
-				//"fgcolor_override"	"235 226 202 255"
-				"bgcolor_override"	"0 0 0 255"
-				//"disabledFgColor_override" "235 226 202 255"
-				"disabledBgColor_override" "0 0 0 255"
-				"selectionColor_override" "0 0 0 255"
-				"selectionTextColor_override" "235 226 202 255"
+				"visible"		"0"
+
+				//"fgcolor_override"				"235 226 202 255"
+				"bgcolor_override"					"0 0 0 255"
+				//"disabledFgColor_override" 		"235 226 202 255"
+				"disabledBgColor_override" 			"0 0 0 255"
+				"selectionColor_override" 			"0 0 0 255"
+				"selectionTextColor_override" 		"235 226 202 255"
 				"defaultSelectionBG2Color_override" "0 0 0 0"
 			}
 
 			"PainterlyOptions"
 			{
-				"ControlName"		"EditablePanel"
+				"ControlName"	"EditablePanel"
 				"fieldName"		"PainterlyOptions"
-				"xpos"		"10"
-				"ypos"		"50"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"150"
+				"xpos"			"10"
+				"ypos"			"50"
+				"zpos"			"-1"
+				"wide"			"140"
+				"tall"			"150"
 
 				"FilterDescriptionLabel"
 				{
-					"ControlName"		"CExLabel"
+					"ControlName"	"CExLabel"
 					"fieldName"		"FilterDescriptionLabel"
-					"xpos"		"0"
-					"ypos"		"0"
-					"wide"		"140"
-					"tall"		"80"
+					"xpos"			"0"
+					"ypos"			"0"
+					"wide"			"140"
+					"tall"			"80"
 					"labelText"		"#ToolCustomizeTexturePainterlyDescription"
 					"textAlignment"	"north-west"
 					"font"			"HudFontSmall"
@@ -497,37 +500,37 @@
 
 			"StencilOptions"
 			{
-				"ControlName"		"EditablePanel"
+				"ControlName"	"EditablePanel"
 				"fieldName"		"StencilOptions"
-				"xpos"		"10"
-				"ypos"		"50"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"150"
+				"xpos"			"10"
+				"ypos"			"50"
+				"zpos"			"-1"
+				"wide"			"140"
+				"tall"			"150"
 
 				"FilterDescriptionLabel"
 				{
-					"ControlName"		"CExLabel"
+					"ControlName"	"CExLabel"
 					"fieldName"		"FilterDescriptionLabel"
-					"xpos"		"0"
-					"ypos"		"0"
-					"wide"		"120"
-					"tall"		"60"
+					"xpos"			"0"
+					"ypos"			"0"
+					"wide"			"120"
+					"tall"			"60"
 					"labelText"		"#ToolCustomizeTextureStencilDescription"
 					"textAlignment"	"north-west"
 					"font"			"HudFontSmall"
 					"wrap"			"1"
-					"visible"	"0"
+					"visible"		"0"
 				}
 
 				"ColorPaletteLabel"
 				{
-					"ControlName"		"CExLabel"
+					"ControlName"	"CExLabel"
 					"fieldName"		"ColorPaletteLabel"
-					"xpos"		"0"
-					"ypos"		"60"
-					"wide"		"140"
-					"tall"		"15"
+					"xpos"			"0"
+					"ypos"			"60"
+					"wide"			"140"
+					"tall"			"15"
 					"labelText"		"#ToolCustomizeTextureColorPalette"
 					"textAlignment"	"north-west"
 					"font"			"HudFontSmallBold"
@@ -580,22 +583,22 @@
 
 				"StencilModeComboBox"
 				{
-					"ControlName"		"ComboBox"
+					"ControlName"	"ComboBox"
 					"fieldName"		"StencilModeComboBox"
-					"xpos"		"0"
-					"ypos"		"125"
-					"zpos"		"-1"
-					"wide"		"140"
-					"tall"		"15"
+					"xpos"			"0"
+					"ypos"			"125"
+					"zpos"			"-1"
+					"wide"			"140"
+					"tall"			"15"
 					"editable"		"0"
 					"font"			"HudFontSmall"
 
-					//"fgcolor_override"	"235 226 202 255"
-					"bgcolor_override"	"0 0 0 255"
-					//"disabledFgColor_override" "235 226 202 255"
-					"disabledBgColor_override" "0 0 0 255"
-					"selectionColor_override" "0 0 0 255"
-					"selectionTextColor_override" "235 226 202 255"
+					//"fgcolor_override"				"235 226 202 255"
+					"bgcolor_override"					"0 0 0 255"
+					//"disabledFgColor_override" 		"235 226 202 255"
+					"disabledBgColor_override" 			"0 0 0 255"
+					"selectionColor_override" 			"0 0 0 255"
+					"selectionTextColor_override" 		"235 226 202 255"
 					"defaultSelectionBG2Color_override" "0 0 0 0"
 				}
 			}
@@ -603,39 +606,39 @@
 
 		"PreviewImageGroupBox"
 		{
-			"ControlName"		"EditablePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"PreviewImageGroupBox"
-			"xpos"		"170"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"180"
-			"tall"		"200"
+			"xpos"			"170"
+			"ypos"			"25"
+			"zpos"			"-1"
+			"wide"			"180"
+			"tall"			"200"
 			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"bgcolor_override"	"DarkGrey"
 
 			"PreviewFilteredImage"
 			{
-				"ControlName"		"CRGBAImagePanel"
+				"ControlName"	"CRGBAImagePanel"
 				"fieldName"		"PreviewFilteredImage"
-				"xpos"		"20"
-				"ypos"		"30"
-				"zpos"		"-1"
-				"wide"		"140"
-				"tall"		"140"
+				"xpos"			"20"
+				"ypos"			"30"
+				"zpos"			"-1"
+				"wide"			"140"
+				"tall"			"140"
 			}
 		}
 
 		"PreviewModelGroupBox"
 		{
-			"ControlName"		"EditablePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"PreviewModelGroupBox"
-			"xpos"		"360"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"180"
-			"tall"		"200"
+			"xpos"			"360"
+			"ypos"			"25"
+			"zpos"			"-1"
+			"wide"			"180"
+			"tall"			"200"
 			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"bgcolor_override"	"DarkGrey"
 
 			"GradientBgPanel"
 			{
@@ -652,7 +655,7 @@
 				"image"			"loadout_bottom_gradient"
 				"border"		"ButtonBorder"
 				"paintbackgroundtype"	"2"
-				"paintbackground"	"1"
+				"paintbackground"		"1"
 			}
 
 			"DragToRotateLabel"
@@ -749,43 +752,43 @@
 
 		"WarningTextGroupBox"
 		{
-			"ControlName"		"EditablePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"WarningTextGroupBox"
-			"Font"		"HudFontSmallestBold"
-			"xpos"		"0"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"350"
-			"tall"		"200"
+			"Font"			"HudFontSmallestBold"
+			"xpos"			"0"
+			"ypos"			"25"
+			"zpos"			"-1"
+			"wide"			"350"
+			"tall"			"200"
 			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"bgcolor_override"	"DarkGrey"
 
 			"WarningText"
 			{
-				"ControlName"		"CExLabel"
+				"ControlName"	"CExLabel"
 				"fieldName"		"WarningText"
 				"font"			"HudFontSmall"
-				"xpos"		"10"
-				"ypos"		"10"
-				"wide"		"330"
-				"tall"		"180"
-				"labelText"		 "#ToolCustomizeTextureConfirmWarning"
+				"xpos"			"10"
+				"ypos"			"10"
+				"wide"			"330"
+				"tall"			"180"
+				"labelText"		"#ToolCustomizeTextureConfirmWarning"
 				"textAlignment"	"west"
-				"wrap"	"1"
+				"wrap"			"1"
 			}
 		}
 
 		"PreviewModelGroupBox"
 		{
-			"ControlName"		"EditablePanel"
+			"ControlName"	"EditablePanel"
 			"fieldName"		"PreviewModelGroupBox"
-			"xpos"		"360"
-			"ypos"		"25"
-			"zpos"		"-1"
-			"wide"		"180"
-			"tall"		"200"
+			"xpos"			"360"
+			"ypos"			"25"
+			"zpos"			"-1"
+			"wide"			"180"
+			"tall"			"200"
 			"border"		"GrayDialogBorder"
-			"bgcolor_override"		"DarkGrey"
+			"bgcolor_override"	"DarkGrey"
 
 			"GradientBgPanel"
 			{
@@ -802,7 +805,7 @@
 				"image"			"loadout_bottom_gradient"
 				"border"		"ButtonBorder"
 				"paintbackgroundtype"	"2"
-				"paintbackground"	"1"
+				"paintbackground"		"1"
 			}
 
 			"DragToRotateLabel"
diff --git a/resource/ui/econ/genericwaitingdialog.res b/resource/ui/econ/genericwaitingdialog.res
index b09ec91..fa122eb 100644
--- a/resource/ui/econ/genericwaitingdialog.res
+++ b/resource/ui/econ/genericwaitingdialog.res
@@ -14,91 +14,91 @@
 		"settitlebarvisible"	"0"
 		"border"				"NoBorder"
 	}
-
+	
 	"TitleLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"TitleLabel"
-		"font"			"HudFontMediumSmall"
-		"xpos"			"0"
-		"ypos"			"8"
-		"zpos"			"0"
-		"wide"			"200"
-		"tall"			"42"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"0"
-		"centerwrap"	"1"
-		"labelText"		"%updatetext%"
-		"textAlignment"		"center"
-		"fgcolor_override" 	"255 255 255 255"
-		"bgcolor_override" 	"Transparent"
+		"ControlName"			"Label"
+		"fieldName"				"TitleLabel"
+		"font"					"HudFontMediumSmall"
+		"xpos"					"0"
+		"ypos"					"8"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"42"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"wrap"					"0"
+		"centerwrap"			"1"
+		"labelText"				"%updatetext%"
+		"textAlignment"			"center"
+		"fgcolor_override" 		"White"
+		"bgcolor_override" 		"Transparent"
 	}
-
+	
 	"EllipsesLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"EllipsesLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"0"
-		"ypos"			"42"
-		"zpos"			"0"
-		"wide"			"200"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%ellipses%"
-		"textAlignment"		"north"
-		"fgcolor_override" "255 255 255 255"
-		"bgcolor_override" "Transparent"
+		"ControlName"			"Label"
+		"fieldName"				"EllipsesLabel"
+		"font"					"HudFontSmallest"
+		"xpos"					"0"
+		"ypos"					"42"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"labelText"				"%ellipses%"
+		"textAlignment"			"north"
+		"fgcolor_override"		"White"
+		"bgcolor_override"		"Transparent"
 	}
-
+	
 	"DurationLabel"
 	{
-		"ControlName"	"Label"
-		"fieldName"		"DurationLabel"
-		"font"			"HudFontSmallest"
-		"xpos"			"0"
-		"ypos"			"52"
-		"zpos"			"0"
-		"wide"			"200"
-		"tall"			"60"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		"%duration%"
-		"textAlignment"		"north"
-		"fgcolor_override" "255 255 255 255"
-		"bgcolor_override" "Transparent"
+		"ControlName"			"Label"
+		"fieldName"				"DurationLabel"
+		"font"					"HudFontSmallest"
+		"xpos"					"0"
+		"ypos"					"52"
+		"zpos"					"0"
+		"wide"					"200"
+		"tall"					"60"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"labelText"				"%duration%"
+		"textAlignment"			"north"
+		"fgcolor_override"		"White"
+		"bgcolor_override"		"Transparent"
 	}
-
+	
 	"CloseButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"CloseButton"
-		"xpos"			"50"
-		"ypos"			"70"
-		"zpos"			"1"
-		"wide"			"100"
-		"tall"			"25"
-		"autoResize"	"0"
-		"pinCorner"		"3"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		"#Cancel"
-		"font"			"HudFontSmallest"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"Command"		"user_close"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
+		"ControlName"			"CExImageButton"
+		"fieldName"				"CloseButton"
+		"xpos"					"50"
+		"ypos"					"70"
+		"zpos"					"1"
+		"wide"					"100"
+		"tall"					"25"
+		"autoResize"			"0"
+		"pinCorner"				"3"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#Cancel"
+		"font"					"HudFontSmallest"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"user_close"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
index dc4a79f..3c42ff4 100644
--- a/resource/ui/econ/inspectionpanel.res
+++ b/resource/ui/econ/inspectionpanel.res
@@ -361,7 +361,7 @@
 
 			"fixed_paintkit"
 			{
-				"ypos"		"10"
+				"ypos"			"10"
 			}
 
 			"zpos"				"100"
@@ -609,8 +609,8 @@
 
 			"defaultFgColor_override"	"White"
 			"defaultBgColor_override"	"72 103 32 255"
-			"armedFgColor_override"		"White"
-			"armedBgColor_override"		"72 133 32 255"
+			"selectedFgColor_override"	"White"
+			"selectedBgColor_override"	"72 133 32 255"
 
 			"sound_armed"		"ui/item_info_mouseover.wav"
 			"sound_depressed"	"UI/buttonclick.wav"
diff --git a/resource/ui/econ/inspectionpanel_cosmetic.res b/resource/ui/econ/inspectionpanel_cosmetic.res
index 79fae37..e2796e5 100644
--- a/resource/ui/econ/inspectionpanel_cosmetic.res
+++ b/resource/ui/econ/inspectionpanel_cosmetic.res
@@ -123,9 +123,10 @@
 				"dulltext"		"0"
 				"brighttext"	"0"
 				"default"		"0"
+				"Command"			"zoom_toggle"
+				
 				"sound_depressed"	"UI/buttonclick.wav"
 				"sound_released"	"UI/buttonclickrelease.wav"
-				"Command"			"zoom_toggle"
 				"paintbackground"	"0"
 				"image_drawcolor"	"118 107 94 200"
 				"image_armedcolor"	"246 247 213 255"
@@ -1023,35 +1024,21 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			""
+		"labeltext"		"("
+		"font"			"CustomIcons"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
+		"Command"			"closex"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"closex"	// Intentionally using "closex" instead of "close" for stats
-		"paintbackground"	"0"
-
-		"image_drawcolor"	"118 107 94 255"
-		"image_armedcolor"	"246 247 213 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"cs-0.5"
-			"zpos"			"1"
-			"wide"			"9"
-			"tall"			"9"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-			"proportionaltoparent"	"1"
-		}
+		
+		"defaultFgColor_override" 	"118 107 94 255"
+		"armedFgColor_override" 	"246 247 213 255"
+		"depressedFgColor_override" "118 107 94 255"
 	}
 
 	"mouseoveritempanel"
diff --git a/resource/ui/econ/itemmodelpanel.res b/resource/ui/econ/itemmodelpanel.res
index 4f6ed8d..18dcc4d 100644
--- a/resource/ui/econ/itemmodelpanel.res
+++ b/resource/ui/econ/itemmodelpanel.res
@@ -2,14 +2,14 @@
 {
 	"mouseoveritempanel"
 	{
-		"fieldName"				"mouseoveritempanel"
-		"collection_list_xpos"	"250"
-		"is_mouseover"			"1"
-		"text_xpos_collection"	"0"
-		"text_ypos"				"15"
-		"text_forcesize" 		"0"
-		"text_xpos"				"15"
-		"text_wide"				"270"
+		"fieldName"					"mouseoveritempanel"
+		"collection_list_xpos"		"250"
+		"is_mouseover"				"1"
+		"text_xpos_collection"		"0"
+		"text_ypos"					"15"
+		"text_forcesize" 			"0"
+		"text_xpos"					"15"
+		"text_wide"					"270"
 		//"model_xpos_collection"	"77"
 		//"model_ypos_collection"	"20"
 		//"model_wide_collection"	"156"
@@ -18,32 +18,32 @@
 
 	"LoadingSpinner"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"LoadingSpinner"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"f0"
-		"tall"			"f0"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"paintborder"	"0"
-		"image"			"animated/tf2_logo_hourglass"
-		"scaleImage"	"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"LoadingSpinner"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"1"
+		"wide"				"f0"
+		"tall"				"f0"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"0"
+		"enabled"			"1"
+		"paintborder"		"0"
+		"image"				"animated/tf2_logo_hourglass"
+		"scaleImage"		"1"
 	}
 
 	"MainContentsContainer"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"MainContentsContainer"
-		"xpos"			"0"
-		"ypos"			"0"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"1"
-		"bgcolor_override"		"Transparent"
+		"ControlName"		"EditablePanel"
+		"fieldName"			"MainContentsContainer"
+		"xpos"				"0"
+		"ypos"				"0"
+		"wide"				"f0"
+		"tall"				"f0"
+		"visible"			"1"
+		"bgcolor_override"	"Transparent"
 
 		"itemmodelpanel"
 		{
diff --git a/resource/ui/econ/itempickuppanel.res b/resource/ui/econ/itempickuppanel.res
index cbc303d..512c0ba 100644
--- a/resource/ui/econ/itempickuppanel.res
+++ b/resource/ui/econ/itempickuppanel.res
@@ -270,14 +270,12 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"discarditem"
+		"paintbackground"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 
-		"defaultBgColor_override" "Transparent"
-		"armedBgColor_override" "Transparent"
-		"depressedBgColor_override" "Transparent"
-		"image_drawcolor"	"TanLight"
-		"image_armedcolor"	"ColorCyan"
+		"defaultFgColor_override"	"TanLight"
+		"armedFgColor_override"		"ColorCyan"
 
 		"SubImage"
 		{
diff --git a/resource/ui/econ/notificationtoastcontainer.res b/resource/ui/econ/notificationtoastcontainer.res
index 6f78626..38ec259 100644
--- a/resource/ui/econ/notificationtoastcontainer.res
+++ b/resource/ui/econ/notificationtoastcontainer.res
@@ -2,38 +2,38 @@
 {
 	"NotificationToastContainer"
 	{
-		"ControlName"	"CNotificationToastControl"
-		"fieldName"		"NotificationToastContainer"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"150"
-		"tall"			"50"
-		"visible"		"1"
-		"enabled"		"1"
+		"ControlName"		"CNotificationToastControl"
+		"fieldName"			"NotificationToastContainer"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"1"
+		"wide"				"150"
+		"tall"				"50"
+		"visible"			"1"
+		"enabled"			"1"
 		"bgcolor_override"	"DarkGrey"
 		"border"			"CyanBorder"
 	}
-
+	
 	"HelpTextLabel"
 	{
-		"ControlName"	"CExLabel"
-		"fieldName"		"HelpTextLabel"
-		"fgcolor"		"RedSolid"
-		"xpos"			"5"
-		"ypos"			"0"
-		"zpos"			"2"
-		"wide"			"140"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"wrap"			"1"
-		"labelText"		""
-		"textAlignment"	"North"
-		"font"			"TeamMenu"
-		"textinsetx"	"2"
-		"textinsety"	"7"
+		"ControlName"		"CExLabel"
+		"fieldName"			"HelpTextLabel"
+		"fgcolor"			"RedSolid"
+		"xpos"				"5"
+		"ypos"				"0"
+		"zpos"				"2"
+		"wide"				"140"
+		"tall"				"38"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"wrap"				"1"
+		"labelText"			""
+		"textAlignment"		"North"
+		"font"				"Cerbetica14"
+		"textinsetx"		"2"
+		"textinsety"		"7"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/notificationtoastcontrol.res b/resource/ui/econ/notificationtoastcontrol.res
index ad6f35d..380323e 100644
--- a/resource/ui/econ/notificationtoastcontrol.res
+++ b/resource/ui/econ/notificationtoastcontrol.res
@@ -2,16 +2,16 @@
 {
 	"NotificationToastControl"
 	{
-		"ControlName"	"CNotificationToastControl"
-		"fieldName"		"NotificationToastControl"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"1"
-		"wide"			"190"
-		"tall"			"30"
-		"visible"		"1"
-		"enabled"		"1"
-		"border"		"NoBorder"
+		"ControlName"			"CNotificationToastControl"
+		"fieldName"				"NotificationToastControl"
+		"xpos"					"0"
+		"ypos"					"0"
+		"zpos"					"1"
+		"wide"					"190"
+		"tall"					"30"
+		"visible"				"1"
+		"enabled"				"1"
+		"border"				"NoBorder"
 		"paintborder"			"1"
 		"paintbackground"		"1"
 		"PaintBackgroundType"	"0"
@@ -21,173 +21,127 @@
 
 	"DeleteButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"DeleteButton"
-		"xpos"			"165"
-		"ypos"			"5"
-		"zpos"			"10"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"TFFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"			"delete"
-		"armedBgColor_override"	"LightRed"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-		}
+		"ControlName"			"CExImageButton"
+		"fieldName"				"DeleteButton"
+		"xpos"					"165"
+		"ypos"					"5"
+		"zpos"					"10"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labeltext"				"("
+		"font"					"CustomIcons"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"delete"
+		"paintbackground"		"1"
+		
+		"defaultBgColor_override" 	"Black"
+		"armedBgColor_override" 	"LightRed"
+		"depressedBgColor_override" "Black"
 	}
 
 	"TriggerButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"TriggerButton"
-		"xpos"			"144"
+		"ControlName"			"CExImageButton"
+		"fieldName"				"TriggerButton"
+		"xpos"					"144"
 		"if_one_button"
 		{
-			"xpos"		"165"
-		}
-		"ypos"			"5"
-		"zpos"			"10"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"TFFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"			"trigger"
-		"armedBgColor_override"	"CreditsGreen"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"glyph_view"
-			"scaleImage"	"1"
+			"xpos"				"165"
 		}
+		"ypos"					"5"
+		"zpos"					"10"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labeltext"				"s"
+		"font"					"CustomIcons"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"trigger"
+		"paintbackground"		"1"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		
+		"defaultBgColor_override" 	"Black"
+		"armedBgColor_override" 	"CreditsGreen"
+		"depressedBgColor_override" "Black"
 	}
 
 	"AcceptButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"AcceptButton"
-		"xpos"			"144"
+		"ControlName"			"CExImageButton"
+		"fieldName"				"AcceptButton"
+		"xpos"					"144"
 		"if_one_button"
 		{
-			"xpos"		"165"
-		}
-		"ypos"			"5"
-		"zpos"			"10"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"TFFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"			"accept"
-		"armedBgColor_override"	"CreditsGreen"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"glyph_view"
-			"scaleImage"	"1"
+			"xpos"				"165"
 		}
+		"ypos"					"5"
+		"zpos"					"10"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labeltext"				"s"
+		"font"					"CustomIcons"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"accept"
+		"paintbackground"		"1"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		
+		"defaultBgColor_override" 	"Black"
+		"armedBgColor_override"		"CreditsGreen"
+		"depressedBgColor_override" "Black"
 	}
 
 	"DeclineButton"
 	{
-		"ControlName"	"CExImageButton"
-		"fieldName"		"DeclineButton"
-		"xpos"			"165"
-		"ypos"			"5"
-		"zpos"			"10"
-		"wide"			"20"
-		"tall"			"20"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"TFFontSmall"
-		"textAlignment"	"center"
-		"dulltext"		"0"
-		"brighttext"	"0"
-		"default"		"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"			"decline"
-		"armedBgColor_override"	"LightRed"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"2"
-			"ypos"			"2"
-			"zpos"			"1"
-			"wide"			"16"
-			"tall"			"16"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-		}
+		"ControlName"			"CExImageButton"
+		"fieldName"				"DeclineButton"
+		"xpos"					"165"
+		"ypos"					"5"
+		"zpos"					"10"
+		"wide"					"20"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"0"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labeltext"				"("
+		"font"					"CustomIcons"
+		"textAlignment"			"center"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"default"				"1"
+		"Command"				"decline"
+		"paintbackground"		"1"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		
+		"defaultBgColor_override" 	"Black"
+		"armedBgColor_override" 	"LightRed"
+		"depressedBgColor_override" "Black"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/paintkitconsumedialog.res b/resource/ui/econ/paintkitconsumedialog.res
index f338514..24f6186 100644
--- a/resource/ui/econ/paintkitconsumedialog.res
+++ b/resource/ui/econ/paintkitconsumedialog.res
@@ -2,13 +2,13 @@
 {
 	"PaintkitConsume"
 	{
-		"fieldName"	"PaintkitConsume"
-		"xpos"		"cs-0.5"
-		"ypos"		"cs-0.5"
-		"wide"		"400"
-		"tall"		"400"
-		"visible"	"1"
-		"zpos"		"1000"
+		"fieldName"		"PaintkitConsume"
+		"xpos"			"cs-0.5"
+		"ypos"			"cs-0.5"
+		"wide"			"400"
+		"tall"			"400"
+		"visible"		"1"
+		"zpos"			"1000"
 	}
 
 	"Title"
@@ -250,14 +250,8 @@
 		"brighttext"	"0"
 		"Command"		"cancel"
 		"proportionaltoparent"	"1"
-		"sound_depressed"			"UI/buttonclick.wav"
-		"sound_released"			"UI/buttonclickrelease.wav"
-		"border_default"			"Econ.Button.Border.Default"
-		"border_armed"				"Econ.Button.Border.Armed"
-		"armedBgColor_override"		"Econ.Button.ArmedBgColor"
-		"armedFgColor_override"		"Econ.Button.ArmedFgColor"
-		"depressedBgColor_override"	"Econ.Button.DepressedBgColor"
-		"depressedFgColor_override"	"Econ.Button.DepressedFgColor"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 
 	"ConfirmButton"
@@ -283,13 +277,7 @@
 		"brighttext"	"0"
 		"Command"		"accept"
 		"proportionaltoparent"	"1"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
-		"border_default"			"Econ.Button.Border.Default"
-		"border_armed"				"Econ.Button.Border.Armed"
-		"armedBgColor_override"		"Econ.Button.ArmedBgColor"
-		"armedFgColor_override"		"Econ.Button.ArmedFgColor"
-		"depressedBgColor_override"	"Econ.Button.DepressedBgColor"
-		"depressedFgColor_override"	"Econ.Button.DepressedFgColor"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/questnotificationpanel_base.res b/resource/ui/econ/questnotificationpanel_base.res
index 8031c06..27ff26f 100644
--- a/resource/ui/econ/questnotificationpanel_base.res
+++ b/resource/ui/econ/questnotificationpanel_base.res
@@ -2,18 +2,17 @@
 {
 	"QuestNotificationPanel"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"QuestNotificationPanel"
-		"xpos"			"0"
-		"ypos"			"100"
-		"zpos"			"2"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"0"
+		"ControlName"			"EditablePanel"
+		"fieldName"				"QuestNotificationPanel"
+		"xpos"					"0"
+		"ypos"					"100"
+		"zpos"					"2"
+		"wide"					"f0"
+		"tall"					"f0"
+		"visible"				"0"
 		"proportionaltoparent"	"1"
-
-		"output_step" "50"
-
+		"output_step"			"50"
+		
 		"MainContainer"
 		{
 			"ControlName"			"EditablePanel"
@@ -24,41 +23,40 @@
 			"tall"					"20"
 			"visible"				"1"
 			"proportionaltoparent"	"1"
-
-			"border"	"NoBorder"	//QuestStatusBorder
-			"paintborder"	"2"
-
+			"border"				"NoBorder"	//QuestStatusBorder
+			"paintborder"			"2"
+			
 			"ItemName"
 			{
-				"ControlName"	"Label"
-				"fieldName"		"ItemName"
-				"labeltext"		"#QuestNotification_Incoming"
-				"xpos"			"0"
-				"ypos"			"cs-0.5"
-				"wide"			"f0"
-				"tall"			"18"
-				"zpos"			"4"
-				"textinsetx"	"5"
+				"ControlName"			"Label"
+				"fieldName"				"ItemName"
+				"labeltext"				"#QuestNotification_Incoming"
+				"xpos"					"0"
+				"ypos"					"cs-0.5"
+				"wide"					"f0"
+				"tall"					"18"
+				"zpos"					"4"
+				"textinsetx"			"5"
 				"fgcolor_override"		"255 255 255 255"	//235 226 202 255
-				"font"			"AchievementTracker_Name"
-				//"wrap"			"1"
-				"TextAlignment"		"east"
-				"proportionaltoparent" "1"
+				"font"					"AchievementTracker_Name"
+				//"wrap"				"1"
+				"TextAlignment"			"east"
+				"proportionaltoparent"	"1"
 			}
-
+			
 			"CharacterImage"
 			{
-				"ControlName"	"CTFImagePanel"
-				"fieldName"		"CharacterImage"
-				"xpos"			"3"
-				"ypos"			"cs-0.5"
-				"zpos"			"0"
-				"wide"			"o1"
-				"tall"			"p0.8"
-				"visible"		"1"
-				"enabled"		"1"
-				"image"			"animated/tf2_speaker_icon"
-				"scaleImage"	"1"
+				"ControlName"			"CTFImagePanel"
+				"fieldName"				"CharacterImage"
+				"xpos"					"3"
+				"ypos"					"cs-0.5"
+				"zpos"					"0"
+				"wide"					"o1"
+				"tall"					"p0.8"
+				"visible"				"1"
+				"enabled"				"1"
+				"image"					"animated/tf2_speaker_icon"
+				"scaleImage"			"1"
 				"proportionaltoparent"	"1"
 			}
 		}
diff --git a/resource/ui/econ/store/v2/storehome_base.res b/resource/ui/econ/store/v2/storehome_base.res
index 7a02259..4830e2f 100644
--- a/resource/ui/econ/store/v2/storehome_base.res
+++ b/resource/ui/econ/store/v2/storehome_base.res
@@ -211,58 +211,14 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"SaxtonBackgroundPanel"
-		"xpos"			"c-415"
-		"ypos"			"10"
-		"zpos"			"-1"
-		"wide"			"300"
-		"tall"			"300"
-		"visible"		"1"
-		"enabled"		"1"
-
-		"MannCoImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"MannCoImage"
-			"xpos"			"15"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"420"
-			"tall"			"220"
-			"visible"		"0"
-			"enabled"		"1"
-			"image"			"store/saxton_welcome"
-			"scaleImage"	"1"
-		}
+		"xpos"			"9999"
 	}
 
 	"StoreBackgroundPanel"
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"StoreBackgroundPanel"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"-1"
-		"wide"			"f0"
-		"tall"			"f0"
-		"visible"		"0"
-		"enabled"		"0"
-		"proportiontoparent"	"1"
-
-		"StoreBackgroundImage"
-		{
-			"ControlName"	"ScalableImagePanel"
-			"fieldName"		"StoreBackgroundImage"
-			"xpos"			"0"
-			"ypos"			"0"
-			"zpos"			"0"
-			"wide"			"f0"
-			"tall"			"f0"
-			"visible"		"1"
-			"enable"		"1"
-			"image"			"store/store_bg001"
-			"scale_image"	"1"
-			"proportiontoparent"	"1"
-		}
+		"xpos"			"9999"
 	}
 
 	"ReloadSchemeButton"
diff --git a/resource/ui/econ/store/v2/storehome_premium.res b/resource/ui/econ/store/v2/storehome_premium.res
index d5fab06..ad7fb17 100644
--- a/resource/ui/econ/store/v2/storehome_premium.res
+++ b/resource/ui/econ/store/v2/storehome_premium.res
@@ -6,26 +6,6 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"PremiumCallout"
-		"xpos"			"c-323"
-		"ypos"			"c-45"
-		"zpos"			"-1"
-		"wide"			"300"
-		"tall"			"300"
-		"visible"		"1"
-		"enabled"		"1"
-
-		"MannCoImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"MannCoImage"
-			"wide"			"420"
-			"tall"			"220"
-			"visible"		"0"
-			"enabled"		"1"
-			"scaleImage"	"1"
-			"xpos"			"15"
-			"ypos"			"0"
-			"zpos"			"0"
-		}
+		"xpos"			"9999"
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/store/v2/storepanel.res b/resource/ui/econ/store/v2/storepanel.res
index 202b658..e1b48d0 100644
--- a/resource/ui/econ/store/v2/storepanel.res
+++ b/resource/ui/econ/store/v2/storepanel.res
@@ -105,14 +105,14 @@
 
 	"Sheet"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"Sheet"
-		"tabxindent"	"80"
-		"tabxdelta"		"10"
-		"tabxfittotext"	"1"
-		"tabheight"		"20"
-		"yoffset"		"14"
-		"transition_time" "0"
+		"ControlName"		"EditablePanel"
+		"fieldName"			"Sheet"
+		"tabxindent"		"80"
+		"tabxdelta"			"10"
+		"tabxfittotext"		"1"
+		"tabheight"			"20"
+		"yoffset"			"14"
+		"transition_time"	"0"
 
 		"HeaderLine"
 		{
@@ -139,11 +139,11 @@
 			"selectedcolor"		"TanLight"
 			"unselectedcolor"	"TanDark"
 			"defaultBgColor_override"	"DarkGrey"
-			"paintbackground"		"1"
-			"activeborder_override"	"CyanBorderTabs"
-			"normalborder_override" "CyanBorderTabsInactive"
-			"unselectedBgColor_override"	"10 10 10 255"
-			"depressedBgColor_override"		"10 10 10 255"
+			"paintbackground"			"1"
+			"activeborder_override"		"CyanBorderTabs"
+			"normalborder_override" 	"CyanBorderTabsInactive"
+			"armedBgColor_override"		"10 10 10 255"
+			"selectedBgColor_override"	"10 10 10 255"
 		}
 	}
 
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel.res b/resource/ui/econ/store/v2/storepreviewitempanel.res
index 89c57b5..498f376 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel.res
@@ -958,9 +958,10 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"command"		"icons_right"
+		"paintbackground"	"0"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
+
 		"defaultFgColor_override"	"118 107 94 255"
 		"armedFgColor_override"		"128 117 104 255"
 		"depressedFgColor_override"	"236 227 203 255"
@@ -1009,9 +1010,11 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"-1"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
+
 		"defaultFgColor_override"	"118 107 94 255"
 		"armedFgColor_override"		"128 117 104 255"
 		"depressedFgColor_override"	"236 227 203 255"
@@ -1038,9 +1041,11 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"Command"		"1"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"paintbackground"	"0"
+
 		"defaultFgColor_override"	"118 107 94 255"
 		"armedFgColor_override"		"128 117 104 255"
 		"depressedFgColor_override"	"236 227 203 255"
@@ -1088,10 +1093,12 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
 		"Command"		"gofullscreen"
 		"paintbackground"	"0"
+		
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+
 		"image_drawcolor"		"118 107 94 200"
 		"image_armedcolor"		"128 117 104 255"
 
@@ -1131,10 +1138,12 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
 		"Command"			"zoom_toggle"
 		"paintbackground"	"0"
+		
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+
 		"image_drawcolor"		"118 107 94 200"
 		"image_armedcolor"		"128 117 104 255"
 
@@ -1371,38 +1380,21 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			""
+		"labeltext"		"("
+		"font"			"CustomIcons"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
+		"Command"			"closex"
+		"paintbackground"	"0"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
-		"Command"		"closex"	// Intentionally using "closex" instead of "close" for stats
-		"paintbackground"	"0"
-
-		"defaultFgColor_override" "Blank"
-		"armedFgColor_override" "Blank"
-		"depressedFgColor_override" "Blank"
-		"image_drawcolor"	"White"
-		"image_armedcolor"	"255 0 0 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"cs-0.5"
-			"zpos"			"1"
-			"wide"			"9"
-			"tall"			"9"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-			"proportionaltoparent"	"1"
-		}
+		
+		"defaultFgColor_override" 	"TanLight"
+		"armedFgColor_override" 	"255 0 0 255"
+		"depressedFgColor_override" "TanLight"
 	}
 
 	"BackButton"
@@ -1425,6 +1417,7 @@
 		"brighttext"	"0"
 		"default"		"1"
 		"Command"		"close"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -1449,6 +1442,7 @@
 		"brighttext"	"0"
 		"default"		"1"
 		"Command"		"tryitout"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
@@ -1473,6 +1467,7 @@
 		"brighttext"	"0"
 		"default"		"1"
 		"Command"		"addtocart"
+		
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"
 	}
diff --git a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
index 18c7440..f8eaf13 100644
--- a/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
+++ b/resource/ui/econ/store/v2/storepreviewitempanel_maps.res
@@ -496,35 +496,21 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"tabPosition"	"0"
-		"labeltext"		""
-		"font"			"HudFontSmallBold"
+		"labeltext"		"("
+		"font"			"CustomIcons"
 		"textAlignment"	"center"
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"0"
-		"sound_depressed"	"UI/buttonclick.wav"
-		"sound_released"	"UI/buttonclickrelease.wav"
 		"Command"			"close"
 		"paintbackground"	"0"
-
-		"image_drawcolor"	"White"
-		"image_armedcolor"	"255 0 0 255"
-
-		"SubImage"
-		{
-			"ControlName"	"ImagePanel"
-			"fieldName"		"SubImage"
-			"xpos"			"cs-0.5"
-			"ypos"			"cs-0.5"
-			"zpos"			"1"
-			"wide"			"9"
-			"tall"			"9"
-			"visible"		"1"
-			"enabled"		"1"
-			"image"			"replay/thumbnails/close"
-			"scaleImage"	"1"
-			"proportionaltoparent"	"1"
-		}
+		
+		"sound_depressed"	"UI/buttonclick.wav"
+		"sound_released"	"UI/buttonclickrelease.wav"
+		
+		"defaultFgColor_override" 	"White"
+		"armedFgColor_override" 	"255 0 0 255"
+		"depressedFgColor_override" "White"
 	}
 
 	"BackButton"
diff --git a/resource/ui/econ/store/v2/storeviewcartpanel.res b/resource/ui/econ/store/v2/storeviewcartpanel.res
index 0d2b1c3..94e6b50 100644
--- a/resource/ui/econ/store/v2/storeviewcartpanel.res
+++ b/resource/ui/econ/store/v2/storeviewcartpanel.res
@@ -331,6 +331,7 @@
 				}
 
 				"nobuttons"		"1"
+				
 				"UpButton"
 				{
 					"ControlName"	"Button"
diff --git a/resource/ui/econ/strangecounttransferdialog.res b/resource/ui/econ/strangecounttransferdialog.res
index 4c16925..3fb462f 100644
--- a/resource/ui/econ/strangecounttransferdialog.res
+++ b/resource/ui/econ/strangecounttransferdialog.res
@@ -91,6 +91,7 @@
 			"name_only"		"1"
 			"paint_icon_hide" "1"
 			"actionsignallevel"	"2"
+			
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
@@ -98,6 +99,7 @@
 				"inventory_image_type"	"1"
 			}
 		}
+		
 		"SubjectBG"
 		{
 			"ControlName"	"CExLabel"
@@ -117,6 +119,7 @@
 			"paintbackground" "0"
 			"border"		"BackpackItemBorder_Vintage"
 		}
+		
 		"TargetItem"
 		{
 			"ControlName"	"CItemModelPanel"
@@ -139,6 +142,7 @@
 			"text_center"	"1"
 			"name_only"		"1"
 			"actionsignallevel"	"2"
+			
 			"itemmodelpanel"
 			{
 				"use_item_rendertarget" "0"
@@ -187,10 +191,10 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"0"
-			"Command"		"cancel"
+			"actionsignallevel"	"2"
+			"Command"			"cancel"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"actionsignallevel"	"2"
 		}
 
 		"OkButton"
@@ -213,10 +217,10 @@
 			"dulltext"		"0"
 			"brighttext"	"0"
 			"default"		"1"
-			"Command"		"apply"
+			"actionsignallevel"	"2"
+			"Command"			"apply"
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
-			"actionsignallevel"	"2"
 		}
 	}
 }
\ No newline at end of file
diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res
index ff6f033..a192e77 100644
--- a/resource/ui/econ/tradingstartdialog.res
+++ b/resource/ui/econ/tradingstartdialog.res
@@ -16,10 +16,10 @@
 
 		"button_kv"
 		{
-			"xpos"			"10"
-			"ypos"			"0"
-			"wide"			"350"
-			"tall"			"30"
+			"xpos"				"10"
+			"ypos"				"0"
+			"wide"				"350"
+			"tall"				"30"
 
 			"button"
 			{