Index: ps/trunk/binaries/data/config/default.cfg
===================================================================
--- ps/trunk/binaries/data/config/default.cfg
+++ ps/trunk/binaries/data/config/default.cfg
@@ -317,7 +317,9 @@
 [hotkey.session.gui]
 toggle = "Alt+G"             ; Toggle visibility of session GUI
 menu.toggle = "F10"          ; Toggle in-game menu
+diplomacy.toggle = "Ctrl+H"  ; Toggle in-game diplomacy page
 barter.toggle = "Ctrl+B"     ; Toggle in-game barter/trade page
+objectives.toggle = "Ctrl+O" ; Toggle in-game objectives page
 tutorial.toggle = "Ctrl+P"   ; Toggle in-game tutorial panel
 
 [hotkey.session.savedgames]
Index: ps/trunk/binaries/data/mods/public/gui/manual/intro.txt
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/manual/intro.txt
+++ ps/trunk/binaries/data/mods/public/gui/manual/intro.txt
@@ -91,7 +91,9 @@
 Tab: See all status bars (which would also show the building progress)
 Ctrl + Tab: Toggle summary window.
 Alt + L: Show the multiplayer lobby in a dialog window.
+Ctrl + H: Toggle in-game diplomacy page.
 Ctrl + B: Toggle in-game barter/trade page.
+Ctrl + O: Toggle in-game objectives page.
 Ctrl + P: Toggle in-game tutorial panel.
 Alt + Shift + T: Toggle structure tree.
 Alt + Shift + H: Toggle civilization info.
Index: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml
@@ -24,10 +24,6 @@
 		<action on="Press">toggleMenu();</action>
 	</object>
 
-	<object hotkey="session.gui.barter.toggle">
-		<action on="Press">toggleTrade();</action>
-	</object>
-
 	<object hotkey="session.gui.tutorial.toggle">
 		<action on="Press">toggleTutorial();</action>
 	</object>
Index: ps/trunk/binaries/data/mods/public/gui/session/menu.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/menu.js
+++ ps/trunk/binaries/data/mods/public/gui/session/menu.js
@@ -140,11 +140,6 @@
 	openChat();
 }
 
-function pauseMenuButton()
-{
-	togglePause();
-}
-
 function resignMenuButton()
 {
 	closeOpenDialogs();
Index: ps/trunk/binaries/data/mods/public/gui/session/session.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.js
+++ ps/trunk/binaries/data/mods/public/gui/session/session.js
@@ -439,6 +439,14 @@
 		colorizeHotkey("%(hotkey)s" + " ", "session.diplomacycolors") +
 		translate("Toggle Diplomacy Colors");
 
+	Engine.GetGUIObjectByName("diplomacyButton").tooltip =
+		colorizeHotkey("%(hotkey)s" + " ", "session.gui.diplomacy.toggle") +
+		translate("Diplomacy");
+
+	Engine.GetGUIObjectByName("tradeButton").tooltip =
+		colorizeHotkey("%(hotkey)s" + " ", "session.gui.barter.toggle") +
+		translate("Barter & Trade");
+
 	Engine.GetGUIObjectByName("tradeHelp").tooltip = colorizeHotkey(
 		translate("Select one type of goods you want to modify by clicking on it, and then use the arrows of the other types to modify their shares. You can also press %(hotkey)s while selecting one type of goods to bring its share to 100%%."),
 		"session.fulltradeswap");
@@ -449,6 +457,10 @@
 			"hotkey": colorizeHotkey("%(hotkey)s", "session.massbarter"),
 			"multiplier": g_BarterMultiplier
 		});
+
+	Engine.GetGUIObjectByName("objectivesButton").tooltip =
+		colorizeHotkey("%(hotkey)s" + " ", "session.gui.objectives.toggle") +
+		translate("Objectives");
 }
 
 function initPanelEntities()
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_diplomacy.xml
@@ -4,13 +4,11 @@
 	size="100%-254 4 100%-226 32"
 	style="iconButton"
 	tooltip_style="sessionToolTip"
+	hotkey="session.gui.diplomacy.toggle"
 >
-		<translatableAttribute id="tooltip">Diplomacy</translatableAttribute>
 	<!-- TODO make the button less ugly -->
 	<object size="0 0 100% 100%" name="diplomacyButtonImage" type="image" sprite="stretched:session/icons/diplomacy.png" ghost="true"/>
 	<action on="Press">
 		toggleDiplomacy();
 	</action>
 </object>
-
-
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_objectives.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_objectives.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_objectives.xml
@@ -5,6 +5,7 @@
 	size="100%-194 4 100%-166 32"
 	style="iconButton"
 	tooltip_style="sessionToolTip"
+	hotkey="session.gui.objectives.toggle"
 >
 	<object
 		size="3 3 100%-3 100%-3"
@@ -12,7 +13,6 @@
 		sprite="stretched:session/icons/objectives.png"
 		ghost="true"
 	/>
-	<translatableAttribute id="tooltip">Objectives</translatableAttribute>
 	<action on="Press">
 		toggleObjectives();
 	</action>
Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_trade.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_trade.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/button_trade.xml
@@ -4,9 +4,9 @@
 	size="100%-224 4 100%-196 32"
 	style="iconButton"
 	tooltip_style="sessionToolTip"
+	hotkey="session.gui.barter.toggle"
 >
 	<object size="0 0 100% 100%" name="tradeButtonImage" type="image" sprite="stretched:session/icons/economics.png" ghost="true"/>
-	<translatableAttribute id="tooltip">Barter &amp; Trade</translatableAttribute>
 	<action on="Press">
 		toggleTrade();
 	</action>