diff --git a/materials/vgui/logos/build icons/hud_obj_status_sapper.vtf b/materials/vgui/logos/build icons/hud_obj_status_sapper.vtf
index 30f77b2..db2c6ee 100644
Binary files a/materials/vgui/logos/build icons/hud_obj_status_sapper.vtf and b/materials/vgui/logos/build icons/hud_obj_status_sapper.vtf differ
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_ammo.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_ammo.vtf
index 040ac72..d7a848d 100644
Binary files a/materials/vgui/replay/thumbnails/game/buildingstatus_ammo.vtf and b/materials/vgui/replay/thumbnails/game/buildingstatus_ammo.vtf differ
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_charge.vmt b/materials/vgui/replay/thumbnails/game/buildingstatus_charge.vmt
new file mode 100644
index 0000000..e0696ce
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/game/buildingstatus_charge.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$baseTexture"				"vgui/replay/thumbnails/game/buildingstatus_charge"
+	"$vertexalpha"				"1"
+	"$alpha"					"1"
+	"$translucent"				"1"
+	"$vertexcolor"				"1"
+	"$no_fullbright"			"1"
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_charge.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_charge.vtf
new file mode 100644
index 0000000..ac1278c
Binary files /dev/null and b/materials/vgui/replay/thumbnails/game/buildingstatus_charge.vtf differ
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_kills.vmt b/materials/vgui/replay/thumbnails/game/buildingstatus_kills.vmt
new file mode 100644
index 0000000..44262bf
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/game/buildingstatus_kills.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$baseTexture"				"vgui/replay/thumbnails/game/buildingstatus_kills"
+	"$vertexalpha"				"1"
+	"$alpha"					"1"
+	"$translucent"				"1"
+	"$vertexcolor"				"1"
+	"$no_fullbright"			"1"
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_kills.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_kills.vtf
new file mode 100644
index 0000000..39d2b90
Binary files /dev/null and b/materials/vgui/replay/thumbnails/game/buildingstatus_kills.vtf differ
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_kills.vtf.bak b/materials/vgui/replay/thumbnails/game/buildingstatus_kills.vtf.bak
new file mode 100644
index 0000000..7422442
Binary files /dev/null and b/materials/vgui/replay/thumbnails/game/buildingstatus_kills.vtf.bak differ
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_rockets.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_rockets.vtf
index fcdb813..85d4fd9 100644
Binary files a/materials/vgui/replay/thumbnails/game/buildingstatus_rockets.vtf and b/materials/vgui/replay/thumbnails/game/buildingstatus_rockets.vtf differ
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_supply.vmt b/materials/vgui/replay/thumbnails/game/buildingstatus_supply.vmt
new file mode 100644
index 0000000..23d989a
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/game/buildingstatus_supply.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$baseTexture"				"vgui/replay/thumbnails/game/buildingstatus_supply"
+	"$vertexalpha"				"1"
+	"$alpha"					"1"
+	"$translucent"				"1"
+	"$vertexcolor"				"1"
+	"$no_fullbright"			"1"
+}
\ No newline at end of file
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_supply.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_supply.vtf
new file mode 100644
index 0000000..25b12e7
Binary files /dev/null and b/materials/vgui/replay/thumbnails/game/buildingstatus_supply.vtf differ
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_teleports.vmt b/materials/vgui/replay/thumbnails/game/buildingstatus_teleports.vmt
new file mode 100644
index 0000000..f9cb191
--- /dev/null
+++ b/materials/vgui/replay/thumbnails/game/buildingstatus_teleports.vmt
@@ -0,0 +1,9 @@
+"UnlitGeneric"
+{
+	"$baseTexture"				"vgui/replay/thumbnails/game/buildingstatus_teleports"
+	"$vertexalpha"				"1"
+	"$alpha"					"1"
+	"$translucent"				"1"
+	"$vertexcolor"				"1"
+	"$no_fullbright"			"1"
+}
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_teleports.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_teleports.vtf
new file mode 100644
index 0000000..786a097
Binary files /dev/null and b/materials/vgui/replay/thumbnails/game/buildingstatus_teleports.vtf differ
diff --git a/materials/vgui/replay/thumbnails/game/buildingstatus_upgrade.vtf b/materials/vgui/replay/thumbnails/game/buildingstatus_upgrade.vtf
index fc5dfc2..0a923ae 100644
Binary files a/materials/vgui/replay/thumbnails/game/buildingstatus_upgrade.vtf and b/materials/vgui/replay/thumbnails/game/buildingstatus_upgrade.vtf differ
diff --git a/resource/chat_english.txt b/resource/chat_english.txt
index ffdc77a..bde88cd 100644
Binary files a/resource/chat_english.txt and b/resource/chat_english.txt differ
diff --git a/resource/ui/hud_obj_dispenser.res b/resource/ui/hud_obj_dispenser.res
index 41bb703..d09eedc 100644
--- a/resource/ui/hud_obj_dispenser.res
+++ b/resource/ui/hud_obj_dispenser.res
@@ -183,16 +183,16 @@
 			"xpos"									"3"
 			"ypos"									"3"
 			"zpos"									"10"
-			"wide"									"25"
-			"tall"									"25"
+			"wide"									"24"
+			"tall"									"24"
 			"visible"								"0"
 			"enabled"								"1"
-			"scaleImage"							"1"
-			"icon"									"obj_status_icon_sapper"
+			"scaleImage"								"1"
+			"icon"									"obj_status_sapper"
 			"iconColor"								"Black"
-			"paintbackground"						"1"
-			"bgcolor_override"						"Red"
-			"proportionaltoparent"					"1"
+			"paintbackground"							"1"
+			"bgcolor_override"							"Red"
+			"proportionaltoparent"							"1"
 		}
 
 		"Health"
@@ -200,9 +200,9 @@
 			"ControlName"							"CBuildingHealthBar"
 			"fieldName"								"Health"
 			"xpos"									"rs1-3"
-			"ypos"									"cs-0.5-1"
+			"ypos"									"cs-0.5"
 			"wide"									"6"
-			"tall"									"28"
+			"tall"									"25"
 			"visible"								"1"
 			"enabled"								"1"
 			"proportionaltoparent"					"1"
@@ -211,12 +211,48 @@
 		"BuildingPanel"
 		{
 			"ControlName"							"EditablePanel"
-			"fieldName"								"BuildingPanel"
-			"wide"									"0"
-			"tall"									"0"
-			"visible"								"0"
+			"fieldName"							"BuildingPanel"
+			"xpos"								"0"
+			"ypos"								"0"
+			"wide"								"f0"
+			"tall"								"f0"
+			"visible"							"0"
+			"proportionaltoparent"						"1"
+				
+			"BuildingProgress"
+			{	
+				"ControlName"							"ContinuousProgressBar"
+				"fieldName"							"BuildingProgress"				
+				"xpos"								"32"
+				"ypos"								"cs-0.5"
+				"wide"								"0"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"bgcolor_override"						"130 130 130 255"
+				"proportionaltoparent"						"1"
+			}
+
+			"BuildingLabel"
+			{
+				"ControlName"							"Label"
+				"fieldName"							"BuildingLabel"
+				"font"								"Size 7"
+				"xpos"								"0"
+				"ypos"								"0"
+				"zpos"								"1"
+				"wide"								"30"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"labelText"							"BUILDING"
+				"textAlignment"							"center"
+				"proportionaltoparent"						"1"
+				"pin_to_sibling" 						"BuildingProgress"
+			}
 		}
 
+
 		"RunningPanel"
 		{
 			"ControlName"							"EditablePanel"
@@ -248,12 +284,12 @@
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"1"
-				"wide"								"25"
+				"wide"								"24"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
 				"scaleImage"						"1"
-				"image"								"replay/thumbnails/game/buildingstatus_ammo"
+				"image"								"replay/thumbnails/game/buildingstatus_supply"
 				"drawcolor"							"Black"
 
 				"pin_to_sibling" 					"Ammo"
@@ -282,7 +318,7 @@
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"3"
-				"wide"								"25"
+				"wide"								"24"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
diff --git a/resource/ui/hud_obj_sapper.res b/resource/ui/hud_obj_sapper.res
index bfa781b..1bd865e 100644
--- a/resource/ui/hud_obj_sapper.res
+++ b/resource/ui/hud_obj_sapper.res
@@ -56,7 +56,7 @@
 		"enabled"									"1"
 		"proportionaltoparent"						"1"
 		"scaleImage"								"1"	
-		"icon"										"obj_status_icon_sapper"
+		"icon"										"obj_status_sapper"
 		"iconColor"									"Red"
 
 		"pin_to_sibling" 							"IconBackgound"
diff --git a/resource/ui/hud_obj_sentrygun.res b/resource/ui/hud_obj_sentrygun.res
index e63e24f..6d4f968 100644
--- a/resource/ui/hud_obj_sentrygun.res
+++ b/resource/ui/hud_obj_sentrygun.res
@@ -225,16 +225,16 @@
 			"xpos"									"3"
 			"ypos"									"3"
 			"zpos"									"10"
-			"wide"									"25"
-			"tall"									"25"
+			"wide"									"24"
+			"tall"									"24"
 			"visible"								"0"
 			"enabled"								"1"
-			"scaleImage"							"1"
-			"icon"									"obj_status_icon_sapper"
+			"scaleImage"								"1"
+			"icon"									"obj_status_sapper"
 			"iconColor"								"Black"
-			"paintbackground"						"1"
-			"bgcolor_override"						"Red"
-			"proportionaltoparent"					"1"
+			"paintbackground"							"1"
+			"bgcolor_override"							"Red"
+			"proportionaltoparent"							"1"
 		}
 
 		"Health"
@@ -242,9 +242,9 @@
 			"ControlName"							"CBuildingHealthBar"
 			"fieldName"								"Health"
 			"xpos"									"rs1-3"
-			"ypos"									"cs-0.5-1"
+			"ypos"									"cs-0.5"
 			"wide"									"6"
-			"tall"									"28"
+			"tall"									"25"
 			"visible"								"1"
 			"enabled"								"1"
 			"proportionaltoparent"					"1"
@@ -253,10 +253,45 @@
 		"BuildingPanel"
 		{
 			"ControlName"							"EditablePanel"
-			"fieldName"								"BuildingPanel"
-			"wide"									"0"
-			"tall"									"0"
-			"visible"								"0"
+			"fieldName"							"BuildingPanel"
+			"xpos"								"0"
+			"ypos"								"0"
+			"wide"								"f0"
+			"tall"								"f0"
+			"visible"							"0"
+			"proportionaltoparent"						"1"
+				
+			"BuildingProgress"
+			{	
+				"ControlName"							"ContinuousProgressBar"
+				"fieldName"							"BuildingProgress"				
+				"xpos"								"32"
+				"ypos"								"cs-0.5"
+				"wide"								"0"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"bgcolor_override"						"130 130 130 255"
+				"proportionaltoparent"						"1"
+			}
+
+			"BuildingLabel"
+			{
+				"ControlName"							"Label"
+				"fieldName"							"BuildingLabel"
+				"font"								"Size 7"
+				"xpos"								"0"
+				"ypos"								"0"
+				"zpos"								"1"
+				"wide"								"30"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"labelText"							"BUILDING"
+				"textAlignment"							"center"
+				"proportionaltoparent"						"1"
+				"pin_to_sibling" 						"BuildingProgress"
+			}
 		}
 
 		"RunningPanel"
@@ -275,10 +310,10 @@
 				"ControlName"						"CExLabel"
 				"fieldName"							"KillsLabel"
 				"font"								"Size 10"
-				"xpos"								"32"
+				"xpos"								"42"
 				"ypos"								"3"
 				"wide"								"200"
-				"tall"								"8"
+				"tall"								"7"
 				"visible"							"1"
 				"enabled"							"1"
 				"labelText"							"#Building_hud_sentry_kills_assists"
@@ -286,6 +321,22 @@
 				"drawcolor"							"White"
 				"proportionaltoparent"				"1"
 			}
+			"KillIcon"
+			{
+				"ControlName"								"ImagePanel"
+				"fieldName"								"KillIcon"			
+				"xpos"									"32"
+				"ypos"									"3"
+				"zpos"									"10"
+				"wide"									"8"
+				"tall"									"8"
+				"visible"								"1"
+				"enabled"								"1"
+				"scaleImage"								"1"
+				"image"									"replay/thumbnails/game/buildingstatus_kills"
+				"drawcolor" 								"White"
+				"proportionaltoparent"							"1"
+			}
 
 			"Shells"
 			{
@@ -307,7 +358,7 @@
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"1"
-				"wide"								"25"
+				"wide"								"24"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
@@ -340,7 +391,7 @@
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"1"
-				"wide"								"25"
+				"wide"								"24"
 				"tall"								"6"
 				"visible"							"0"
 				"enabled"							"1"
@@ -373,7 +424,7 @@
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"3"
-				"wide"								"25"
+				"wide"								"24"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
@@ -386,12 +437,6 @@
 				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
 			}
 
-			"KillIcon"
-			{
-				"ControlName"						"ImagePanel"
-				"fieldName"							"KillIcon"
-				"xpos"								"9999"
-			}
 		}
 	}
 
diff --git a/resource/ui/hud_obj_sentrygun_disp.res b/resource/ui/hud_obj_sentrygun_disp.res
index 8d7fc21..960202a 100644
--- a/resource/ui/hud_obj_sentrygun_disp.res
+++ b/resource/ui/hud_obj_sentrygun_disp.res
@@ -183,12 +183,12 @@
 			"xpos"									"3"
 			"ypos"									"3"
 			"zpos"									"10"
-			"wide"									"25"
-			"tall"									"25"
+			"wide"									"24"
+			"tall"									"24"
 			"visible"								"0"
 			"enabled"								"1"
 			"scaleImage"							"1"
-			"icon"									"obj_status_icon_sapper"
+			"icon"									"obj_status_sapper"
 			"iconColor"								"Black"
 			"paintbackground"						"1"
 			"bgcolor_override"						"Red"
@@ -200,9 +200,9 @@
 			"ControlName"							"CBuildingHealthBar"
 			"fieldName"								"Health"
 			"xpos"									"rs1-3"
-			"ypos"									"cs-0.5-1"
+			"ypos"									"cs-0.5"
 			"wide"									"6"
-			"tall"									"28"
+			"tall"									"25"
 			"visible"								"1"
 			"enabled"								"1"
 			"proportionaltoparent"					"1"
@@ -211,10 +211,45 @@
 		"BuildingPanel"
 		{
 			"ControlName"							"EditablePanel"
-			"fieldName"								"BuildingPanel"
-			"wide"									"0"
-			"tall"									"0"
-			"visible"								"0"
+			"fieldName"							"BuildingPanel"
+			"xpos"								"0"
+			"ypos"								"0"
+			"wide"								"f0"
+			"tall"								"f0"
+			"visible"							"0"
+			"proportionaltoparent"						"1"
+				
+			"BuildingProgress"
+			{	
+				"ControlName"							"ContinuousProgressBar"
+				"fieldName"							"BuildingProgress"				
+				"xpos"								"32"
+				"ypos"								"cs-0.5"
+				"wide"								"0"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"bgcolor_override"						"130 130 130 255"
+				"proportionaltoparent"						"1"
+			}
+
+			"BuildingLabel"
+			{
+				"ControlName"							"Label"
+				"fieldName"							"BuildingLabel"
+				"font"								"Size 7"
+				"xpos"								"0"
+				"ypos"								"0"
+				"zpos"								"1"
+				"wide"								"30"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"labelText"							"BUILDING"
+				"textAlignment"							"center"
+				"proportionaltoparent"						"1"
+				"pin_to_sibling" 						"BuildingProgress"
+			}
 		}
 
 		"RunningPanel"
@@ -233,10 +268,10 @@
 				"ControlName"						"CExLabel"
 				"fieldName"							"KillsLabel"
 				"font"								"Size 10"
-				"xpos"								"32"
+				"xpos"								"42"
 				"ypos"								"3"
 				"wide"								"200"
-				"tall"								"8"
+				"tall"								"7"
 				"visible"							"1"
 				"enabled"							"1"
 				"labelText"							"#Building_hud_sentry_kills_assists"
@@ -244,6 +279,22 @@
 				"drawcolor"							"White"
 				"proportionaltoparent"				"1"
 			}
+			"KillIcon"
+			{
+				"ControlName"								"ImagePanel"
+				"fieldName"								"KillIcon"			
+				"xpos"									"32"
+				"ypos"									"3"
+				"zpos"									"10"
+				"wide"									"8"
+				"tall"									"8"
+				"visible"								"1"
+				"enabled"								"1"
+				"scaleImage"								"1"
+				"image"									"replay/thumbnails/game/buildingstatus_kills"
+				"drawcolor" 								"White"
+				"proportionaltoparent"							"1"
+			}
 
 			"Shells"
 			{
@@ -265,7 +316,7 @@
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"1"
-				"wide"								"25"
+				"wide"								"24"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
@@ -278,12 +329,6 @@
 				"pin_to_sibling_corner"				"PIN_CENTER_TOP"
 			}
 
-			"KillIcon"
-			{
-				"ControlName"						"ImagePanel"
-				"fieldName"							"KillIcon"
-				"xpos"								"9999"
-			}
 		}
 	}
 
diff --git a/resource/ui/hud_obj_tele_entrance.res b/resource/ui/hud_obj_tele_entrance.res
index ad300c7..8686c26 100644
--- a/resource/ui/hud_obj_tele_entrance.res
+++ b/resource/ui/hud_obj_tele_entrance.res
@@ -183,12 +183,12 @@
 			"xpos"									"3"
 			"ypos"									"3"
 			"zpos"									"10"
-			"wide"									"25"
-			"tall"									"25"
+			"wide"									"24"
+			"tall"									"24"
 			"visible"								"0"
 			"enabled"								"1"
 			"scaleImage"							"1"
-			"icon"									"obj_status_icon_sapper"
+			"icon"									"obj_status_sapper"
 			"iconColor"								"Black"
 			"paintbackground"						"1"
 			"bgcolor_override"						"Red"
@@ -200,9 +200,9 @@
 			"ControlName"							"CBuildingHealthBar"
 			"fieldName"								"Health"
 			"xpos"									"rs1-3"
-			"ypos"									"cs-0.5-1"
+			"ypos"									"cs-0.5"
 			"wide"									"6"
-			"tall"									"28"
+			"tall"									"25"
 			"visible"								"1"
 			"enabled"								"1"
 			"proportionaltoparent"					"1"
@@ -211,10 +211,45 @@
 		"BuildingPanel"
 		{
 			"ControlName"							"EditablePanel"
-			"fieldName"								"BuildingPanel"
-			"wide"									"0"
-			"tall"									"0"
-			"visible"								"0"
+			"fieldName"							"BuildingPanel"
+			"xpos"								"0"
+			"ypos"								"0"
+			"wide"								"f0"
+			"tall"								"f0"
+			"visible"							"0"
+			"proportionaltoparent"						"1"
+				
+			"BuildingProgress"
+			{	
+				"ControlName"							"ContinuousProgressBar"
+				"fieldName"							"BuildingProgress"				
+				"xpos"								"32"
+				"ypos"								"cs-0.5"
+				"wide"								"0"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"bgcolor_override"						"130 130 130 255"
+				"proportionaltoparent"						"1"
+			}
+
+			"BuildingLabel"
+			{
+				"ControlName"							"Label"
+				"fieldName"							"BuildingLabel"
+				"font"								"Size 7"
+				"xpos"								"0"
+				"ypos"								"0"
+				"zpos"								"1"
+				"wide"								"30"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"labelText"							"BUILDING"
+				"textAlignment"							"center"
+				"proportionaltoparent"						"1"
+				"pin_to_sibling" 						"BuildingProgress"
+			}
 		}
 
 		"RunningPanel"
@@ -232,50 +267,80 @@
 			{
 				"ControlName"						"ImagePanel"
 				"fieldName"							"TeleportedIcon"
-				"xpos"								"9999"
+					"xpos"									"32"
+					"ypos"									"3"
+					"zpos"									"10"
+					"wide"									"8"
+					"tall"									"8"
+					"visible"								"1"
+					"enabled"								"1"
+					"scaleImage"								"1"
+					"image"									"replay/thumbnails/game/buildingstatus_teleports"
+					"drawcolor" 								"White"
+					"proportionaltoparent"							"1"
 			}
 
 			"ChargingPanel"
 			{
 				"ControlName"						"EditablePanel"
 				"fieldName"							"ChargingPanel"
-				"xpos"								"32"
-				"ypos"								"cs-0.5"
-				"wide"								"30"
-				"tall"								"6"
+				"xpos"								"0"
+				"ypos"								"0"
+				"wide"								"f0"
+				"tall"								"f0"
 				"visible"							"0"
 				"proportionaltoparent"				"1"
 
+				"DummyTimesUsedLabel"
+				{
+					"ControlName"					"CExLabel"
+					"fieldName"						"DummyTimesUsedLabel"
+					"font"							"Size 10"
+					"xpos"							"42"
+					"ypos"							"1"
+					"wide"							"200"
+					"tall"							"7"
+					"autoResize"					"0"
+					"pinCorner"						"0"
+					"visible"						"1"
+					"enabled"						"1"
+					"labelText"						"..."
+					"textAlignment"					"west"
+					"drawcolor"						"White"
+					"proportionaltoparent"			"1"
+				}
+
 				"Recharge"
 				{
 					"ControlName"					"ContinuousProgressBar"
 					"fieldName"						"Recharge"
-					"xpos"							"0"
-					"ypos"							"0"
-					"wide"							"f0"
-					"tall"							"f0"
+					"xpos"							"32"
+					"ypos"							"cs-0.5+1"
+					"wide"							"30"
+					"tall"							"6"
 					"visible"						"1"
 					"enabled"						"1"
 					"proportionaltoparent"			"1"
 					"bgcolor_override"				"130 130 130 255"
 				}
-				"RechargeLabel"
+				"RechargeIcon"
 				{
-					"ControlName"					"CExLabel"
-					"fieldName"						"RechargeLabel"
-					"font"							"Size 7"
-					"xpos"							"0"
-					"ypos"							"0"
-					"zpos"							"0"
-					"wide"							"30"
-					"tall"							"6"
-					"visible"						"1"
-					"enabled"						"1"
-					"labelText"						"CHARGE"
-					"textAlignment"					"center"
-					"fgcolor"						"Black"
-					"AllCaps"						"1"
-					"proportionaltoparent"			"1"
+					"ControlName"						"ImagePanel"
+					"fieldName"							"RechargeIcon"
+					"xpos"								"0"
+					"ypos"								"0"
+					"zpos"								"3"
+					"wide"								"24"
+					"tall"								"6"
+					"visible"							"1"
+					"enabled"							"1"
+					"scaleImage"						"1"
+					"image"								"replay/thumbnails/game/buildingstatus_charge"
+					"drawcolor"							"Black"
+	
+					"pin_to_sibling" 					"Recharge"
+					"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+					"pin_to_sibling_corner"				"PIN_CENTER_TOP"
 				}
 			}
 
@@ -283,42 +348,22 @@
 			{
 				"ControlName"						"EditablePanel"
 				"fieldName"							"FullyChargedPanel"
-				"xpos"								"32"
-				"ypos"								"3"
-				"wide"								"48"
-				"tall"								"10"
+				"xpos"								"0"
+				"ypos"								"0"
+				"wide"								"f0"
+				"tall"								"f0"
 				"visible"							"0"
 				"proportionaltoparent"				"1"
 
-				"Used"
-				{
-					"ControlName"					"CExLabel"
-					"fieldName"						"Used"
-					"font"							"Size 10"
-					"xpos"							"0"
-					"ypos"							"0"
-					"wide"							"40"
-					"tall"							"10"
-					"autoResize"					"0"
-					"pinCorner"						"0"
-					"visible"						"1"
-					"enabled"						"1"
-					"labelText"						"used:"
-					"textAlignment"					"west"
-					"drawcolor"						"White"
-					"AllCaps"						"1"
-					"proportionaltoparent"			"1"
-				}
-
 				"TimesUsedLabel"
 				{
 					"ControlName"					"CExLabel"
 					"fieldName"						"TimesUsedLabel"
 					"font"							"Size 10"
-					"xpos"							"25"
-					"ypos"							"0"
-					"wide"							"20"
-					"tall"							"10"
+					"xpos"							"42"
+					"ypos"							"3"
+					"wide"							"200"
+					"tall"							"7"
 					"autoResize"					"0"
 					"pinCorner"						"0"
 					"visible"						"1"
@@ -328,6 +373,40 @@
 					"drawcolor"						"White"
 					"proportionaltoparent"			"1"
 				}
+
+				"DummyRecharge"
+				{
+					"ControlName"					"ContinuousProgressBar"
+					"fieldName"						"DummyRecharge"
+					"xpos"							"32"
+					"ypos"							"cs-0.5+1"
+					"wide"							"30"
+					"tall"							"6"
+					"visible"						"1"
+					"enabled"						"1"
+					"proportionaltoparent"			"1"
+					"bgcolor_override"				"White"
+				}
+				"DummyRechargeIcon"
+				{
+					"ControlName"						"ImagePanel"
+					"fieldName"							"DummyRechargeIcon"
+					"xpos"								"0"
+					"ypos"								"0"
+					"zpos"								"3"
+					"wide"								"24"
+					"tall"								"6"
+					"visible"							"1"
+					"enabled"							"1"
+					"scaleImage"						"1"
+					"image"								"replay/thumbnails/game/buildingstatus_charge"
+					"drawcolor"							"Black"
+	
+					"pin_to_sibling" 					"DummyRecharge"
+					"pin_corner_to_sibling" 			"PIN_CENTER_TOP"
+					"pin_to_sibling_corner"				"PIN_CENTER_TOP"
+				}
+
 			}
 
 			"Upgrade"
@@ -351,7 +430,7 @@
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"3"
-				"wide"								"25"
+				"wide"								"24"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
diff --git a/resource/ui/hud_obj_tele_exit.res b/resource/ui/hud_obj_tele_exit.res
index 482298d..f040916 100644
--- a/resource/ui/hud_obj_tele_exit.res
+++ b/resource/ui/hud_obj_tele_exit.res
@@ -183,12 +183,12 @@
 			"xpos"									"3"
 			"ypos"									"3"
 			"zpos"									"10"
-			"wide"									"25"
-			"tall"									"25"
+			"wide"									"24"
+			"tall"									"24"
 			"visible"								"0"
 			"enabled"								"1"
 			"scaleImage"							"1"
-			"icon"									"obj_status_icon_sapper"
+			"icon"									"obj_status_sapper"
 			"iconColor"								"Black"
 			"paintbackground"						"1"
 			"bgcolor_override"						"Red"
@@ -200,9 +200,9 @@
 			"ControlName"							"CBuildingHealthBar"
 			"fieldName"								"Health"
 			"xpos"									"rs1-3"
-			"ypos"									"cs-0.5-1"
+			"ypos"									"cs-0.5"
 			"wide"									"6"
-			"tall"									"28"
+			"tall"									"25"
 			"visible"								"1"
 			"enabled"								"1"
 			"proportionaltoparent"					"1"
@@ -211,10 +211,45 @@
 		"BuildingPanel"
 		{
 			"ControlName"							"EditablePanel"
-			"fieldName"								"BuildingPanel"
-			"wide"									"0"
-			"tall"									"0"
-			"visible"								"0"
+			"fieldName"							"BuildingPanel"
+			"xpos"								"0"
+			"ypos"								"0"
+			"wide"								"f0"
+			"tall"								"f0"
+			"visible"							"0"
+			"proportionaltoparent"						"1"
+				
+			"BuildingProgress"
+			{	
+				"ControlName"							"ContinuousProgressBar"
+				"fieldName"							"BuildingProgress"				
+				"xpos"								"32"
+				"ypos"								"cs-0.5"
+				"wide"								"0"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"bgcolor_override"						"130 130 130 255"
+				"proportionaltoparent"						"1"
+			}
+
+			"BuildingLabel"
+			{
+				"ControlName"							"Label"
+				"fieldName"							"BuildingLabel"
+				"font"								"Size 7"
+				"xpos"								"0"
+				"ypos"								"0"
+				"zpos"								"1"
+				"wide"								"30"
+				"tall"								"6"
+				"visible"							"1"
+				"enabled"							"1"
+				"labelText"							"BUILDING"
+				"textAlignment"							"center"
+				"proportionaltoparent"						"1"
+				"pin_to_sibling" 						"BuildingProgress"
+			}
 		}
 
 		"RunningPanel"
@@ -249,7 +284,7 @@
 				"xpos"								"0"
 				"ypos"								"0"
 				"zpos"								"3"
-				"wide"								"25"
+				"wide"								"24"
 				"tall"								"6"
 				"visible"							"1"
 				"enabled"							"1"
diff --git a/scripts/mod_textures.txt b/scripts/mod_textures.txt
index 1a99e61..f0e13cf 100644
--- a/scripts/mod_textures.txt
+++ b/scripts/mod_textures.txt
@@ -1618,8 +1618,8 @@
 			"file"	"vgui/logos/build icons/hud_obj_status_sapper"
 			"x"		"0"
 			"y"		"0"
-			"width"		"64"
-			"height"	"64"
+			"width"		"128"
+			"height"	"128"
 		}
 
 		"cappoint_progressbar_teardrop"
@@ -2061,16 +2061,13 @@
 			"height"	"128"
 		}
 
-
-
-
 		"ico_metal"
 		{
 			"file"		"vgui\replay\thumbnails\game\buildingstatus_upgrade"
 			"x"		"0"
 			"y"		"0"
-			"width"		"64"
-			"height"	"16"
+			"width"		"128"
+			"height"	"32"
 		}
 
 		"ico_demolish"