diff --git a/OpenRA.Game/Settings.cs b/OpenRA.Game/Settings.cs
index c8a5169011..e5240e58d4 100644
--- a/OpenRA.Game/Settings.cs
+++ b/OpenRA.Game/Settings.cs
@@ -211,6 +211,7 @@ namespace OpenRA
 		public Hotkey ProductionTypeNavalKey = new Hotkey(Keycode.I, Modifiers.None);
 		public Hotkey ProductionTypeTankKey = new Hotkey(Keycode.I, Modifiers.None);
 		public Hotkey ProductionTypeMerchantKey = new Hotkey(Keycode.O, Modifiers.None);
+		public Hotkey ProductionTypeUpgradeKey = new Hotkey(Keycode.R, Modifiers.None);
 
 		public Hotkey SupportPower01Key = new Hotkey(Keycode.UNKNOWN, Modifiers.None);
 		public Hotkey SupportPower02Key = new Hotkey(Keycode.UNKNOWN, Modifiers.None);
diff --git a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
index a5afc008da..2e02fa6634 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
@@ -425,7 +425,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 					{ "ProductionTypeAircraftKey", "Aircraft Tab" },
 					{ "ProductionTypeNavalKey", "Naval Tab" },
 					{ "ProductionTypeTankKey", "Tank Tab" },
-					{ "ProductionTypeMerchantKey", "Starport Tab" }
+					{ "ProductionTypeMerchantKey", "Starport Tab" },
+					{ "ProductionTypeUpgradeKey", "Upgrade Tab" }
 				};
 
 				for (var i = 1; i <= 24; i++)
diff --git a/mods/d2k/audio/notifications.yaml b/mods/d2k/audio/notifications.yaml
index 70a6658a2d..c83bab1abf 100644
--- a/mods/d2k/audio/notifications.yaml
+++ b/mods/d2k/audio/notifications.yaml
@@ -37,6 +37,7 @@ Speech:
 		EnemyUnitsDetected: ENEMY_DETECTED
 		UnitRepaired: GANEW
 		CannotDeploy: DPLOY
+		Upgrading: UPGRD
 
 Sounds:
 	DefaultVariant: .WAV
diff --git a/mods/d2k/chrome.yaml b/mods/d2k/chrome.yaml
index 135b297c9a..88d61b2aae 100644
--- a/mods/d2k/chrome.yaml
+++ b/mods/d2k/chrome.yaml
@@ -45,6 +45,9 @@ production-icons: chrome.png
 	building: 430,0,16,16
 	building-disabled: 446,0,16,16
 	building-alert: 462,0,16,16
+	upgrade: 430,224,16,16
+	upgrade-disabled: 446,224,16,16
+	upgrade-alert: 462,224,16,16
 	infantry: 430,32,16,16
 	infantry-disabled: 446,32,16,16
 	infantry-alert: 462,32,16,16
diff --git a/mods/d2k/chrome/ingame-player.yaml b/mods/d2k/chrome/ingame-player.yaml
index bc351a325d..6f16d44610 100644
--- a/mods/d2k/chrome/ingame-player.yaml
+++ b/mods/d2k/chrome/ingame-player.yaml
@@ -243,7 +243,7 @@ Container@PLAYER_WIDGETS:
 					IconSize: 58, 48
 					IconMargin: 2, 0
 					IconSpriteOffset: 0, 0
-					MinimumRows: 4
+					MinimumRows: 5
 					MaximumRows: 6
 				Container@PALETTE_FOREGROUND:
 					X: 64
@@ -259,7 +259,7 @@ Container@PLAYER_WIDGETS:
 					X: 6
 					Y: 2
 					Width: 25
-					Height: 243
+					Height: 274
 					Children:
 						ProductionTypeButton@BUILDING:
 							Width: 25
@@ -275,12 +275,27 @@ Container@PLAYER_WIDGETS:
 									X: 5
 									Y: 5
 									ImageCollection: production-icons
-						ProductionTypeButton@INFANTRY:
+						ProductionTypeButton@UPGRADE:
 							Y: 31
 							Width: 25
 							Height: 25
 							VisualHeight: 0
 							Background: sidebar-button
+							TooltipText: Upgrades
+							TooltipContainer: TOOLTIP_CONTAINER
+							ProductionGroup: Upgrade
+							HotkeyName: ProductionTypeUpgradeKey
+							Children:
+								Image@ICON:
+									X: 5
+									Y: 5
+									ImageCollection: production-icons
+						ProductionTypeButton@INFANTRY:
+							Y: 62
+							Width: 25
+							Height: 25
+							VisualHeight: 0
+							Background: sidebar-button
 							TooltipText: Infantry
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Infantry
@@ -291,12 +306,12 @@ Container@PLAYER_WIDGETS:
 									Y: 5
 									ImageCollection: production-icons
 						ProductionTypeButton@VEHICLE:
-							Y: 62
+							Y: 93
 							Width: 25
 							Height: 25
 							VisualHeight: 0
 							Background: sidebar-button
-							TooltipText: Vehicles
+							TooltipText: Light Vehicles
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Vehicle
 							HotkeyName: ProductionTypeVehicleKey
@@ -306,12 +321,12 @@ Container@PLAYER_WIDGETS:
 									Y: 5
 									ImageCollection: production-icons
 						ProductionTypeButton@TANKS:
-							Y: 93
+							Y: 124
 							Width: 25
 							Height: 25
 							VisualHeight: 0
 							Background: sidebar-button
-							TooltipText: Tanks
+							TooltipText: Heavy Vehicles
 							TooltipContainer: TOOLTIP_CONTAINER
 							ProductionGroup: Armor
 							HotkeyName: ProductionTypeTankKey
@@ -321,7 +336,7 @@ Container@PLAYER_WIDGETS:
 									Y: 5
 									ImageCollection: production-icons
 						ProductionTypeButton@AIRCRAFT:
-							Y: 124
+							Y: 155
 							Width: 25
 							Height: 25
 							VisualHeight: 0
@@ -336,7 +351,7 @@ Container@PLAYER_WIDGETS:
 									Y: 5
 									ImageCollection: production-icons
 						ProductionTypeButton@STARPORT:
-							Y: 155
+							Y: 186
 							Width: 25
 							Height: 25
 							VisualHeight: 0
@@ -351,7 +366,7 @@ Container@PLAYER_WIDGETS:
 									Y: 5
 									ImageCollection: production-icons
 						Button@SCROLL_UP_BUTTON:
-							Y: 186
+							Y: 217
 							Width: 25
 							Height: 25
 							VisualHeight: 0
@@ -365,7 +380,7 @@ Container@PLAYER_WIDGETS:
 									ImageCollection: scrollbar
 									ImageName: up_arrow
 						Button@SCROLL_DOWN_BUTTON:
-							Y: 217
+							Y: 248
 							Width: 25
 							Height: 25
 							VisualHeight: 0
diff --git a/mods/d2k/rules/player.yaml b/mods/d2k/rules/player.yaml
index 9c34dffb12..733f333293 100644
--- a/mods/d2k/rules/player.yaml
+++ b/mods/d2k/rules/player.yaml
@@ -6,6 +6,12 @@ Player:
 		QueuedAudio: Building
 		ReadyAudio: BuildingReady
 		BlockedAudio: NoRoom
+	ClassicProductionQueue@Upgrade:
+		Type: Upgrade
+		LowPowerSlowdown: 3
+		QueuedAudio: Upgrading
+		ReadyAudio: NewOptions
+		BlockedAudio: NoRoom
 	ClassicProductionQueue@Infantry:
 		Type: Infantry
 		LowPowerSlowdown: 2
diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml
index 01550694de..36054ca3e1 100644
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -52,7 +52,9 @@ conyard:
 	RevealsShroud:
 		Range: 10c0
 	Production:
-		Produces: Building
+		Produces: Building, Upgrade
+		MoveIntoWorld: false
+	Exit:
 	Valued:
 		Cost: 2000
 	Tooltip: