Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -346,6 +346,9 @@
 cursorblinkrate = 0.5             ; Cursor blink rate in seconds (0.0 to disable blinking)
 scale = 1.0                       ; GUI scaling factor, for improved compatibility with 4K displays
 
+[gui.lobby]
+morebuttonsbar = "hiding"         ; Show more buttons bar below chat input "disabled", "hiding" or "visible".
+
 [gui.gamesetup]
 enabletips = true                 ; Enable/Disable tips during gamesetup (for newcomers)
 assignplayers = everyone          ; Whether to assign joining clients to free playerslots. Possible values: everyone, buddies, disabled.
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -188,14 +188,14 @@
 
 			<!-- Chat window -->
 			<object name="chatPanel" size="24 355 100%-440 100%-58" type="image" sprite="ModernDarkBoxGold">
-				<object name="chatText" size="2 2 100%-2 100%-26" type="text" style="ChatPanel"/>
+				<object name="chatText" size="2 2 100%-2 100%-28" type="text" style="ChatPanel"/>
 
-				<object name="chatInput" size="4 100%-24 100%-76 100%-4" type="input" style="ModernInput">
+				<object name="chatInput" size="4 100%-26 100%-76 100%-4" type="input" style="ModernInput">
 					<action on="Press">submitChatInput();</action>
 					<action on="Tab">autoCompleteNick(this, g_Autocomplete);</action>
 				</object>
 
-				<object size="100%-72 100%-24 100%-4 100%-4" type="button" style="StoneButton">
+				<object size="100%-72 100%-26 100%-4 100%-4" type="button" style="StoneButton">
 					<translatableAttribute id="caption">Send</translatableAttribute>
 					<action on="Press">submitChatInput();</action>
 				</object>
Index: binaries/data/mods/public/gui/lobby/lobby.js
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby.js
+++ binaries/data/mods/public/gui/lobby/lobby.js
@@ -111,6 +111,19 @@
 var g_Kicked = false;
 
 /**
+ * List of more buttons bar shown below chat input, when mouse hovering there.
+ */
+var g_MoreButtonsBar = [
+	{ "text": "Replays",       "func": () => Engine.SwitchGuiPage("page_replaymenu.xml")  },
+	{ "text": "Last Summary",  "func": () => lastSummary()                                },
+	{ "text": "Civilizations", "func": () => Engine.PushGuiPage("page_structree.xml")     },
+	{ "text": "Options",       "func": () => Engine.PushGuiPage("page_options.xml", {
+		"selectedCategory": "Lobby",
+		"callback": "initConfigurables"
+	})}
+];
+
+/**
  * Processing of notifications sent by XmppClient.cpp.
  *
  * @returns true if the playerlist GUI must be updated.
@@ -393,7 +406,7 @@
 	Engine.LobbyClearPresenceUpdates();
 	updatePlayerList();
 	updateSubject(Engine.LobbyGetRoomSubject());
-	updateLobbyColumns();
+	initConfigurables();
 
 	updateToggleBuddy();
 	Engine.GetGUIObjectByName("chatInput").tooltip = colorizeAutocompleteHotkey();
@@ -403,6 +416,47 @@
 		g_NetMessageTypes[msg.type][msg.level](msg);
 }
 
+function initConfigurables()
+{
+	updateLobbyColumns();
+	initMoreButtonsBar();
+}
+
+function initMoreButtonsBar()
+{
+	let showConfig = Engine.ConfigDB_GetValue("user", "gui.lobby.morebuttonsbar");
+
+	Engine.GetGUIObjectByName("moreOptionsBarActionHide").onmouseenter =
+		showConfig == "hiding" ? () => setMoreButtonsBarVisibility(false) : () => true;
+	Engine.GetGUIObjectByName("moreOptionsBarActionShow").onmouseenter =
+		showConfig == "hiding" ? () => setMoreButtonsBarVisibility(true) : () => true;
+
+	setMoreButtonsBarVisibility(showConfig == "visible");
+
+	if (showConfig == "disabled")
+		return;
+
+	let buttonWidthPercentton = (1 / g_MoreButtonsBar.length) * 100;
+
+	for (let i in g_MoreButtonsBar)
+	{
+		let button = Engine.GetGUIObjectByName("moreButtons[" + i + "]");
+		button.hidden = false;
+		// Let gap "+2" between buttons and calculate size to fit space
+		button.size = i * buttonWidthPercentton + "%" + (i > 0 ? "+2" : "") + " 100%-25 " +
+			((+i + 1) * buttonWidthPercentton) + "%" + " 100%";
+		button.caption = g_MoreButtonsBar[i].text;
+		button.onpress = g_MoreButtonsBar[i].func;
+	}
+}
+
+function setMoreButtonsBarVisibility(show)
+{
+	Engine.GetGUIObjectByName("moreOptionsBarActionHide").hidden = !show;
+	Engine.GetGUIObjectByName("chatPanel").size = show ? "0 49% 100% 100%-29" : "0 49% 100% 100%"
+	Engine.GetGUIObjectByName("moreButtons").hidden = !show;
+}
+
 function updateLobbyColumns()
 {
 	let gameRating = Engine.ConfigDB_GetValue("user", "lobby.columns.gamerating") == "true";
Index: binaries/data/mods/public/gui/lobby/lobby_panels.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/lobby_panels.xml
+++ binaries/data/mods/public/gui/lobby/lobby_panels.xml
@@ -7,7 +7,7 @@
 	</action>
 
 	<!-- Left panel: Player list. -->
-	<object name="leftPanel" size="20 30 20% 100%-310">
+	<object name="leftPanel" size="20 38 20% 100%-315">
 		<object name="playersBox"
 			style="ModernSortedList"
 			selected_column="name"
@@ -41,7 +41,7 @@
 		</object>
 	</object>
 
-	<object name="profilePanel" size="20 100%-305 20% 100%-110">
+	<object name="profilePanel" size="20 100%-310 20% 100%-104">
 		<object name="profileBox" type="image" sprite="ModernDarkBoxGold" size="0 0 100% 100%">
 			<object name="profileArea" size="0 0 100% 100%" hidden="true">
 				<object name="usernameText" size="0 0 100% 45" type="text" style="ModernLabelText" font="sans-bold-16" />
@@ -75,12 +75,12 @@
 	</object>
 
 	<object name="leftButtonPanel" size="20 100%-105 20% 100%-20">
-		<object name="toggleBuddyButton" type="button" style="ModernButtonRed" size="0 100%-85 100% 100%-60">
+		<object name="toggleBuddyButton" type="button" style="ModernButtonRed" size="0 100%-79 100% 100%-54">
 			<action on="Press">
 				toggleBuddy();
 			</action>
 		</object>
-		<object name="leaderboardButton" type="button" style="ModernButtonRed" size="0 100%-55 100% 100%-30">
+		<object name="leaderboardButton" type="button" style="ModernButtonRed" size="0 100%-52 100% 100%-27">
 			<translatableAttribute id="caption">Leaderboard</translatableAttribute>
 			<action on="Press">
 				setLeaderboardVisibility(true);
@@ -95,14 +95,14 @@
 	</object>
 
 	<!-- Right panel: Game details. -->
-	<object name="rightPanel" size="100%-250 30 100%-20 100%-20" >
-		<object name="gameInfoEmpty" size="0 0 100% 100%-60" type="image" sprite="ModernDarkBoxGold" hidden="false">
+	<object name="rightPanel" size="100%-250 38 100%-20 100%-20" >
+		<object name="gameInfoEmpty" size="0 0 100% 100%-54" type="image" sprite="ModernDarkBoxGold" hidden="false">
 			<object name="logo" size="50%-110 40 50%+110 140" type="image" sprite="logo"/>
 			<object name="subjectBox" type="image" sprite="ModernDarkBoxWhite" size="3% 180 97% 99%">
 				<object name="subject" size="5 5 100%-5 100%-5" type="text" style="ModernText" text_align="center"/>
 			</object>
 		</object>
-		<object name="gameInfo" size="0 0 100% 100%-90" type="image" sprite="ModernDarkBoxGold" hidden="true">
+		<object name="gameInfo" size="0 0 100% 100%-84" type="image" sprite="ModernDarkBoxGold" hidden="true">
 
 			<!-- Map Name -->
 			<object name="sgMapName" size="0 5 100% 20" type="text" style="ModernLabelText"/>
@@ -151,13 +151,13 @@
 				<object name="sgPlayersNames" size="0 0 100% 100%" type="text" style="MapPlayerList"/>
 			</object>
 		</object>
-		<object name="joinGameButton" type="button" style="ModernButtonRed" size="0 100%-85 100% 100%-60" hidden="true">
+		<object name="joinGameButton" type="button" style="ModernButtonRed" size="0 100%-79 100% 100%-54" hidden="true">
 			<translatableAttribute id="caption" comment="Join the game currently selected in the list.">Join Game</translatableAttribute>
 			<action on="Press">
 				joinButton();
 			</action>
 		</object>
-		<object name="hostButton" type="button" style="ModernButtonRed" size="0 100%-55 100% 100%-30">
+		<object name="hostButton" type="button" style="ModernButtonRed" size="0 100%-52 100% 100%-27">
 			<translatableAttribute id="caption">Host Game</translatableAttribute>
 			<action on="Press">
 				hostGame();
@@ -171,7 +171,7 @@
 	</object>
 
 	<!-- Middle panel: Filters, game list, chat box. -->
-	<object name="middlePanel" size="20%+5 5% 100%-255 97.2%">
+	<object name="middlePanel" size="20%+5 38 100%-255 100%-20">
 		<object name="gamesBox"
 			style="ModernSortedList"
 			selected_column="name"
@@ -255,16 +255,29 @@
 		</object>
 
 		<object name="chatPanel" size="0 49% 100% 100%" type="image" sprite="ModernDarkBoxGold">
-			<object name="chatText" size="0 0 100% 94%" type="text" style="ChatPanel" font="sans-13"/>
-			<object name="chatInput" size="0 94% 100% 100%" type="input" style="ModernInput" font="sans-13">
+			<object name="chatText" size="0 0 100% 100%-28" type="text" style="ChatPanel" font="sans-13"/>
+			<object name="chatInput" size="0 100%-26 100%-72 100%-4" type="input" style="ModernInput" font="sans-13">
 				<action on="Press">submitChatInput();</action>
 				<action on="Tab">
 					autoCompleteNick(this, Engine.GetPlayerList().map(player => player.name));
 				</action>
 			</object>
+			<object size="100%-72 100%-26 100%-4 100%-4" type="button" style="StoneButton">
+				<translatableAttribute id="caption">Send</translatableAttribute>
+				<action on="Press">submitChatInput();</action>
+			</object>
+		</object>
+
+		<object name="moreButtons" size="0 100%-25 100% 100%" hidden="true" type="image" z="101" >
+			<repeat count="8">
+				<object name="moreButtons[n]" type="button" style="ModernButtonRed" size="0 100%-25 33%-2 100%" hidden="true" />
+			</repeat>
 		</object>
 	</object>
 
+	<object name="moreOptionsBarActionHide" type="image" size="0 0 100% 100%-85" z="100" hidden="true" />
+	<object name="moreOptionsBarActionShow" type="image" size="0 100%-20 100% 100%" z="101" />
+
 	<!-- Translucent black background -->
 	<object hidden="true" name="fade" type="image" z="100" sprite="ModernFade"/>
 
Index: binaries/data/mods/public/gui/options/options.js
===================================================================
--- binaries/data/mods/public/gui/options/options.js
+++ binaries/data/mods/public/gui/options/options.js
@@ -137,9 +137,13 @@
 function init(data, hotloadData)
 {
 	g_HasCallback = hotloadData && hotloadData.callback || data && data.callback;
-	g_TabCategorySelected = hotloadData ? hotloadData.tabCategorySelected : 0;
+	g_TabCategorySelected = hotloadData ? hotloadData.tabCategorySelected : data && data.selectedCategory ? data.selectedCategory : 0;
 
 	g_Options = Engine.ReadJSONFile("gui/options/options.json");
+
+	if (data && data.selectedCategory)
+		g_Options.find((opt, index) => opt.label == data.selectedCategory && (g_TabCategorySelected = index))
+
 	translateObjectKeys(g_Options, ["label", "tooltip"]);
 	deepfreeze(g_Options);
 
Index: binaries/data/mods/public/gui/options/options.json
===================================================================
--- binaries/data/mods/public/gui/options/options.json
+++ binaries/data/mods/public/gui/options/options.json
@@ -423,6 +423,17 @@
 				"label": "Game Rating Column",
 				"tooltip": "Show the average rating of the participating players in a column of the gamelist.",
 				"config": "lobby.columns.gamerating"
+			},
+			{
+				"type": "dropdown",
+				"label": "Show More Buttons Bar",
+				"tooltip": "Show more buttons bar below chat input not, hidden or always.",
+				"config": "gui.lobby.morebuttonsbar",
+				"list": [
+					{ "value": "disabled", "label": "Disabled" },
+					{ "value": "hiding", "label": "Hiding" },
+					{ "value": "visible", "label": "Visible" }
+				]
 			}
 		]
 	},
Index: binaries/data/mods/public/gui/page_lobby.xml
===================================================================
--- binaries/data/mods/public/gui/page_lobby.xml
+++ binaries/data/mods/public/gui/page_lobby.xml
@@ -6,6 +6,7 @@
 
 	<include>common/global.xml</include>
 	<include>common/styles.xml</include>
+	<include>common/sprites.xml</include>
 
 	<include>lobby/lobby.xml</include>
 </page>
Index: binaries/data/mods/public/gui/replaymenu/replay_actions.js
===================================================================
--- binaries/data/mods/public/gui/replaymenu/replay_actions.js
+++ binaries/data/mods/public/gui/replaymenu/replay_actions.js
@@ -138,6 +138,14 @@
 	loadReplays(selected > -1 ? createReplaySelectionData(g_ReplaysFiltered[selected].directory) : "", true);
 }
 
+function close()
+{
+	if (Engine.HasXmppClient())
+		Engine.SwitchGuiPage("page_lobby.xml");
+	else
+		Engine.SwitchGuiPage("page_pregame.xml");
+}
+
 /**
  * Callback.
  */
Index: binaries/data/mods/public/gui/replaymenu/replay_menu.js
===================================================================
--- binaries/data/mods/public/gui/replaymenu/replay_menu.js
+++ binaries/data/mods/public/gui/replaymenu/replay_menu.js
@@ -64,7 +64,7 @@
 		return;
 	}
 
-	loadReplays(data && data.replaySelectionData, false);
+	loadReplays(data && data.replaySelectionData || null, false);
 
 	if (!g_Replays)
 	{
@@ -77,6 +77,20 @@
 
 	if (data && data.summarySelectedData)
 		g_SummarySelectedData = data.summarySelectedData;
+
+	if (Engine.HasXmppClient())
+	{
+		Engine.GetGUIObjectByName("closeButton").caption = translate("Lobby");
+		convertToDialogWindow();
+	}
+}
+
+function convertToDialogWindow()
+{
+	let window = Engine.GetGUIObjectByName("replayWindow");
+	window.sprite = "ModernDialog";
+	window.size = "16 24 100%-16 100%-24";
+	Engine.GetGUIObjectByName("replayWindowTitle").size = "50%-128 -16 50%+128 16";
 }
 
 /**
Index: binaries/data/mods/public/gui/replaymenu/replay_menu.xml
===================================================================
--- binaries/data/mods/public/gui/replaymenu/replay_menu.xml
+++ binaries/data/mods/public/gui/replaymenu/replay_menu.xml
@@ -9,7 +9,7 @@
 	<object type="image" style="ModernWindow" size="0 0 100% 100%" name="replayWindow">
 
 		<!-- Title -->
-		<object style="ModernLabelText" type="text" size="50%-128 4 50%+128 36">
+		<object style="ModernLabelText" type="text" size="50%-128 4 50%+128 36" name="replayWindowTitle">
 			<translatableAttribute id="caption">Replay Games</translatableAttribute>
 		</object>
 
@@ -220,9 +220,9 @@
 		<object name="bottomPanel" size="25 100%-55 100%-5 100%-25" >
 
 			<!-- Main Menu Button -->
-			<object type="button" style="StoneButton" size="25 0 17%+25 100%">
+			<object name="closeButton" type="button" style="StoneButton" size="25 0 17%+25 100%">
 				<translatableAttribute id="caption">Main Menu</translatableAttribute>
-				<action on="Press">Engine.SwitchGuiPage("page_pregame.xml");</action>
+				<action on="Press">close();</action>
 			</object>
 
 			<!-- Delete Button -->
Index: binaries/data/mods/public/gui/summary/summary.js
===================================================================
--- binaries/data/mods/public/gui/summary/summary.js
+++ binaries/data/mods/public/gui/summary/summary.js
@@ -418,20 +418,6 @@
 		updateCountersTeam(teamCounterFn, panelInfo.counters, panelInfo.headings, index);
 }
 
-function confirmStartReplay()
-{
-	if (Engine.HasXmppClient())
-		messageBox(
-			400, 200,
-			translate("Are you sure you want to quit the lobby?"),
-			translate("Confirmation"),
-			[translate("No"), translate("Yes")],
-			[null, startReplay]
-		);
-	else
-		startReplay();
-}
-
 function continueButton()
 {
 	let summarySelectedData = {
@@ -456,9 +442,6 @@
 
 function startReplay()
 {
-	if (Engine.HasXmppClient())
-		Engine.StopXmppClient();
-
 	if (!Engine.StartVisualReplay(g_GameData.gui.replayDirectory))
 	{
 		warn("Replay file not found!");
Index: binaries/data/mods/public/gui/summary/summary.xml
===================================================================
--- binaries/data/mods/public/gui/summary/summary.xml
+++ binaries/data/mods/public/gui/summary/summary.xml
@@ -209,7 +209,7 @@
 
 		<object type="button" name="replayButton" style="ModernButtonRed" size="100%-310 100%-48 100%-170 100%-20">
 			<translatableAttribute id="caption">Replay</translatableAttribute>
-			<action on="Press">confirmStartReplay();</action>
+			<action on="Press">startReplay();</action>
 		</object>
 
 		<object type="button" style="ModernButtonRed" size="100%-160 100%-48 100%-20 100%-20">