diff --git a/binaries/data/mods/public/gui/session/menu.js b/binaries/data/mods/public/gui/session/menu.js
index 314fb2e732..b44f87989d 100644
--- a/binaries/data/mods/public/gui/session/menu.js
+++ b/binaries/data/mods/public/gui/session/menu.js
@@ -77,7 +77,10 @@ var g_FlushTributing = function() {};
 function initMenu()
 {
 	Engine.GetGUIObjectByName("menu").size = "100%-164 " + MENU_TOP + " 100% " + MENU_BOTTOM;
-	Engine.GetGUIObjectByName("menuExitButton").enabled = !Engine.IsAtlasRunning();
+
+	// TODO: Atlas should pass g_GameAttributes.settings
+	for (let button of ["menuExitButton", "summaryButton", "objectivesButton", "diplomacyButton"])
+		Engine.GetGUIObjectByName(button).enabled = !Engine.IsAtlasRunning();
 }
 
 function updateMenuPosition(dt)
diff --git a/binaries/data/mods/public/gui/session/session.js b/binaries/data/mods/public/gui/session/session.js
index b965f3ea83..2a295c6127 100644
--- a/binaries/data/mods/public/gui/session/session.js
+++ b/binaries/data/mods/public/gui/session/session.js
@@ -696,8 +696,8 @@ function updateTopPanel()
 	resPop.size = resPopSize;
 
 	Engine.GetGUIObjectByName("population").hidden = !isPlayer;
-	Engine.GetGUIObjectByName("diplomacyButton1").hidden = !isPlayer;
-	Engine.GetGUIObjectByName("tradeButton1").hidden = !isPlayer;
+	Engine.GetGUIObjectByName("diplomacyButton").hidden = !isPlayer;
+	Engine.GetGUIObjectByName("tradeButton").hidden = !isPlayer;
 	Engine.GetGUIObjectByName("observerText").hidden = isPlayer;
 
 	let alphaLabel = Engine.GetGUIObjectByName("alphaLabel");
diff --git a/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml b/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml
index c4db8deac2..4050d8dc56 100644
--- a/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml
+++ b/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object type="button"
-	name="diplomacyButton1"
+	name="diplomacyButton"
 	size="100%-254 4 100%-226 32"
 	style="iconButton"
 	tooltip_style="sessionToolTip"
diff --git a/binaries/data/mods/public/gui/session/top_panel/button_trade.xml b/binaries/data/mods/public/gui/session/top_panel/button_trade.xml
index e7c36c0915..c3657d62c8 100644
--- a/binaries/data/mods/public/gui/session/top_panel/button_trade.xml
+++ b/binaries/data/mods/public/gui/session/top_panel/button_trade.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object type="button"
-	name="tradeButton1"
+	name="tradeButton"
 	size="100%-224 4 100%-196 32"
 	style="iconButton"
 	tooltip_style="sessionToolTip"