diff --git a/package/Resources/ClientDefinitions.ini b/package/Resources/ClientDefinitions.ini
index ae1b92243..65abf09e7 100644
--- a/package/Resources/ClientDefinitions.ini
+++ b/package/Resources/ClientDefinitions.ini
@@ -52,6 +52,7 @@ MaxNameLength=12
 Quickmatch=Qt\CnCNetQM.exe
 LauncherExe=CnCNetYRLauncher.exe
 DiscordAppId=830497958034145300
+ShowGameIconInGameList=false
 DisallowJoiningIncompatibleGames=true
 ; 15 minutes until warning
 InactiveHostWarningMessageSeconds=900
diff --git a/package/Resources/GameLobbyBase.ini b/package/Resources/GameLobbyBase.ini
index 3b16b3917..3863be0e3 100644
--- a/package/Resources/GameLobbyBase.ini
+++ b/package/Resources/GameLobbyBase.ini
@@ -290,6 +290,8 @@ $CC-G099=btnSaveLoadGameOptions:XNAClientButton
 Text=Short Game
 SpawnIniOption=ShortGame
 Checked=True
+BroadcastToLobby=true
+ShowInFilters=true
 ToolTip=Players win when all enemy buildings are destroyed.
 $X=EMPTY_SPACE_SIDES
 $Y=EMPTY_SPACE_TOP
@@ -298,6 +300,8 @@ $Y=EMPTY_SPACE_TOP
 Text=MCV Repacks
 SpawnIniOption=MCVRedeploy
 Checked=True
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=Players have the ability to move their command center after it's deployed.
 $X=getX(chkShortGame)
 $Y=getBottom(chkShortGame) + GAME_OPTION_ROW_SPACING
@@ -306,6 +310,8 @@ $Y=getBottom(chkShortGame) + GAME_OPTION_ROW_SPACING
 Text=Auto Repair
 CustomIniPath=INI\Game Options\Auto Repair.ini
 Checked=False
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=Buildings will automatically repair themselves.
 $X=getX(chkShortGame)
 $Y=getBottom(chkRedeplMCV) + GAME_OPTION_ROW_SPACING
@@ -313,6 +319,8 @@ $Y=getBottom(chkRedeplMCV) + GAME_OPTION_ROW_SPACING
 [chkMultiEng]
 SpawnIniOption=MultiEngineer
 Checked=False
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=Capturing a structure requires three Engineers instead of one.
 Text=Multi Engineer
 $X=getX(chkShortGame)
@@ -323,6 +331,8 @@ Text=Ingame Allying
 SpawnIniOption=AlliesAllowed
 CustomIniPath=INI\Game Options\Allies Allowed.ini
 Checked=True
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=Players can form and break alliances in game.
 $X=getX(chkShortGame)
 $Y=getBottom(chkMultiEng) + GAME_OPTION_ROW_SPACING
@@ -334,6 +344,8 @@ $Y=getBottom(chkMultiEng) + GAME_OPTION_ROW_SPACING
 [chkDestrBridges]
 SpawnIniOption=BridgeDestroy
 Checked=True
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=You can destroy low bridges by force-firing on them.
 Text=Destroyable Bridges
 $X=getX(chkShortGame) + 135
@@ -342,6 +354,8 @@ $Y=EMPTY_SPACE_TOP
 [chkBuildOffAlly]
 SpawnIniOption=BuildOffAlly
 Checked=True
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=Check to allow players to build near their allies' construction yards.
 Text=Build By Ally
 $X=getX(chkDestrBridges)
@@ -350,6 +364,13 @@ $Y=getBottom(chkDestrBridges) + GAME_OPTION_ROW_SPACING
 [chkRA2Mode]
 SpawnIniOption=Ra2Mode
 DefaultValue=False
+BroadcastToLobby=true
+ShowInFilters=true
+ShowInGameList=true
+EnabledIcon=ra2mode_on.png
+DisabledIcon=ra2mode_off.png
+ShowInGameInformationPanel=true
+ShowInGameInformationPanelAsIconOnly=true
 ToolTip=Red Alert 2 Classic Mode will turn gameplay into Red Alert 2.
 Text=Red Alert 2
 DisallowedSideIndex=9
@@ -359,6 +380,8 @@ $Y=getBottom(chkBuildOffAlly) + GAME_OPTION_ROW_SPACING
 [chkBalancePatch]
 CustomIniPath=INI\Game Options\Yuri Rebalance Patch.ini
 DefaultValue=False
+BroadcastToLobby=true
+ShowInFilters=true
 ToolTip=Yuri's Revenge Rebalance 2.0@Patch notes: https://forums.cncnet.org/topic/11738-yuris-revenge-rebalanced-20/
 Text=YR Rebalance
 $X=getX(chkDestrBridges)
@@ -367,6 +390,8 @@ $Y=getBottom(chkRA2Mode) + GAME_OPTION_ROW_SPACING
 [chkNoSpawnPreviews]
 CustomIniPath=INI\Game Options\No Spawn Previews.ini
 DefaultValue=False
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=Start locations for players won't be shown in the loading screen.
 Text=Blind Start
 $X=getX(chkDestrBridges)
@@ -375,6 +400,8 @@ $Y=getBottom(chkBalancePatch) + GAME_OPTION_ROW_SPACING
 [chkDisableGameSpeed]
 SpawnIniOption=DisableGameSpeed
 DefaultValue=False
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=Disable game speed adjustment in game.
 Text=Lock Game Speed
 $X=getX(chkDestrBridges)
@@ -387,6 +414,12 @@ $Y=getBottom(chkNoSpawnPreviews) + GAME_OPTION_ROW_SPACING
 [chkNoYuri]
 CustomIniPath=INI\Game Options\No_Yuri.ini
 DefaultValue=False
+BroadcastToLobby=true
+ShowInFilters=true
+ShowInGameInformationPanel=true
+ShowInGameInformationPanelAsIconOnly=true
+EnabledIcon=no_Yuriicon.png
+DisabledIcon=Yuriicon.png
 ToolTip=Yuri is disabled
 Text=No Yuri
 DisallowedSideIndices=9
@@ -396,6 +429,12 @@ $Y=EMPTY_SPACE_TOP
 [chkNoFrance]
 CustomIniPath=INI\Game Options\No_France.ini
 DefaultValue=False
+BroadcastToLobby=true
+ShowInFilters=true
+ShowInGameInformationPanel=true
+ShowInGameInformationPanelAsIconOnly=true
+EnabledIcon=no_Franceicon.png
+DisabledIcon=Franceicon.png
 ToolTip=France is disabled
 Text=No France
 DisallowedSideIndices=2
@@ -405,6 +444,8 @@ $Y=getBottom(chkNoYuri) + GAME_OPTION_ROW_SPACING
 [chkNoSpy]
 CustomIniPath=INI\Game Options\No_Spy.ini
 DefaultValue=False
+BroadcastToLobby=true
+ShowInFilters=true
 ToolTip=Spies are disabled
 Text=No Spy
 $X=getX(chkNoYuri)
@@ -413,6 +454,8 @@ $Y=getBottom(chkNoFrance) + GAME_OPTION_ROW_SPACING
 [chkNoStolenTech]
 CustomIniPath=INI\Game Options\No Stolen Tech.ini
 Checked=False
+BroadcastToLobby=true
+ShowInFilters=true
 ToolTip=Stolen Tech is disabled
 Text=No Stolen Tech
 DataWriteMode=MapCode
@@ -422,6 +465,8 @@ $Y=getBottom(chkNoSpy) + GAME_OPTION_ROW_SPACING
 [chkNoDogEngiEat]
 CustomIniPath=INI\Game Options\No Dog Engi Eat.ini
 Checked=False
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=Dogs will be unable to kill Engineers.
 Text=Engi Dog Immune
 $X=getX(chkNoYuri)
@@ -430,6 +475,14 @@ $Y=getBottom(chkNoStolenTech) + GAME_OPTION_ROW_SPACING
 [chkCrates]
 SpawnIniOption=Crates
 Checked=False
+BroadcastToLobby=true
+ShowInFilters=true
+EnabledIcon=crates_on.png
+DisabledIcon=crates_off.png
+ShowInGameInformationPanel=true
+ShowInGameInformationPanelAsIconOnly=true
+ShowInGameList=true
+ShowInGameListOnRight=true
 ToolTip=Random Power-Up Crates will appear.
 Text=Crates Appear
 $X=getX(chkNoYuri)
@@ -476,6 +529,8 @@ Items=100000,30000,20000,15000,12500,10000,7500,5000,2500
 DefaultIndex=5
 SpawnIniOption=Credits
 DataWriteMode=String
+BroadcastToLobby=true
+ShowInFilters=true
 ToolTip=Credits at the start of the game.
 $Width=112
 $Height=GAME_OPTION_DD_HEIGHT
@@ -495,6 +550,8 @@ Items=10,9,8,7,6,5,4,3,2,1,0
 DefaultIndex=10
 SpawnIniOption=UnitCount
 DataWriteMode=String
+BroadcastToLobby=false
+ShowInFilters=false
 DistanceFromRightBorder=51
 $X=getX(lblStartingUnits)
 $Y=getBottom(lblStartingUnits) + GAME_OPTION_ROW_SPACING
@@ -508,11 +565,18 @@ $X=getX(chkDestrBridges)
 $Y=getBottom(cmbStartingUnits) + GAME_OPTION_GAP
 
 [cmbSuperWeaponsModifier]
-OptionName=SuperWeapon Settings:
+OptionName=SuperWeapons:
 Items=INI\Game Options\SuperWeapons\All.ini,INI\Game Options\SuperWeapons\Offensive.ini,INI\Game Options\SuperWeapons\Defensive.ini,INI\Game Options\SuperWeapons\Disabled.ini
 DefaultIndex=0
 SpawnIniOption=String
 DataWriteMode=MapCode
+BroadcastToLobby=true
+ShowInFilters=true
+ShowInGameInformationPanel=true
+ShowInGameInformationPanelAsIconOnly=true
+ShowInGameList=true
+ShowInGameListOnRight=true
+Icons=sw_all.png,sw_offensive.png,sw_defensive.png,sw_disabled.png
 ToolTip=Super Weapons Settings
 ItemLabels=All,Strategic,Tactical,None
 $X=getX(lblSuperWeapons)
@@ -532,6 +596,8 @@ Items=INI\Game Options\Crates\Minimal.ini,INI\Game Options\Crates\Normal.ini,INI
 DefaultIndex=1
 SpawnIniOption=String
 DataWriteMode=MapCode
+BroadcastToLobby=true
+ShowInFilters=true
 ToolTip=Adjust the number of crates. This setting is pointless without Crate check box Enabled.
 ItemLabels=Minimal Crates,Normal Crates,Increased Crates,Extreme Crates
 $Width=112
@@ -551,6 +617,8 @@ Items=INI\Game Options\AI\No Change.ini,INI\Game Options\AI\Brutal AI.ini,INI\Ga
 DefaultIndex=0
 SpawnIniOption=String
 DataWriteMode=MapCode
+BroadcastToLobby=false
+ShowInFilters=false
 ToolTip=Set the behaviour of the Computer AI.
 ItemLabels=Vanilla AI,Brutal AI,Extreme AI,Nightmare AI (Beta)
 $X=getX(lblAIModifier)
diff --git a/package/Resources/MultiplayerGameLobby.ini b/package/Resources/MultiplayerGameLobby.ini
index 77c077c6d..051188e24 100644
--- a/package/Resources/MultiplayerGameLobby.ini
+++ b/package/Resources/MultiplayerGameLobby.ini
@@ -94,3 +94,5 @@ $CC-GODD03=cmbGameSpeedCapMultiplayer:GameLobbyDropDown
 [cmbGameSpeedCapMultiplayer]
 $BaseSection=cmbGameSpeedCap
 Items=60 FPS,45 FPS,30 FPS,20 FPS,15 FPS,12 FPS,10 FPS
+BroadcastToLobby=true
+ShowInFilters=true
diff --git a/package/Resources/crates_off.png b/package/Resources/crates_off.png
new file mode 100644
index 000000000..4d5456765
Binary files /dev/null and b/package/Resources/crates_off.png differ
diff --git a/package/Resources/crates_on.png b/package/Resources/crates_on.png
new file mode 100644
index 000000000..0ae018380
Binary files /dev/null and b/package/Resources/crates_on.png differ
diff --git a/package/Resources/no_Franceicon.png b/package/Resources/no_Franceicon.png
new file mode 100644
index 000000000..a49a954c7
Binary files /dev/null and b/package/Resources/no_Franceicon.png differ
diff --git a/package/Resources/no_Yuriicon.png b/package/Resources/no_Yuriicon.png
new file mode 100644
index 000000000..58db9b6a0
Binary files /dev/null and b/package/Resources/no_Yuriicon.png differ
diff --git a/package/Resources/ra2mode_off.png b/package/Resources/ra2mode_off.png
new file mode 100644
index 000000000..e6746ac91
Binary files /dev/null and b/package/Resources/ra2mode_off.png differ
diff --git a/package/Resources/ra2mode_on.png b/package/Resources/ra2mode_on.png
new file mode 100644
index 000000000..21f7cf0ff
Binary files /dev/null and b/package/Resources/ra2mode_on.png differ
diff --git a/package/Resources/sw_all.png b/package/Resources/sw_all.png
new file mode 100644
index 000000000..62ed8c257
Binary files /dev/null and b/package/Resources/sw_all.png differ
diff --git a/package/Resources/sw_defensive.png b/package/Resources/sw_defensive.png
new file mode 100644
index 000000000..7c7b45292
Binary files /dev/null and b/package/Resources/sw_defensive.png differ
diff --git a/package/Resources/sw_disabled.png b/package/Resources/sw_disabled.png
new file mode 100644
index 000000000..98e7b54fa
Binary files /dev/null and b/package/Resources/sw_disabled.png differ
diff --git a/package/Resources/sw_offensive.png b/package/Resources/sw_offensive.png
new file mode 100644
index 000000000..0775a48f2
Binary files /dev/null and b/package/Resources/sw_offensive.png differ