Index: ps/trunk/binaries/data/mods/public/gui/session/diplomacy_window.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/diplomacy_window.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/diplomacy_window.xml
@@ -76,7 +76,17 @@
 
 	<object name="diplomacyCeasefireCounter" size="32 100%-90 100%-32 100%-62" type="text" style="DiplomacyText" ghost="true"/>
 
-	<object size="50%-64 100%-50 50%+64 100%-22" type="button" style="StoneButton">
+	<object size="50%-228 100%-50 50%+100 100%-22">
+		<object name="diplomacyColorsWindowButton" size="0 0 28 28" type="button" style="iconButton" tooltip_style="sessionToolTip">
+			<object name="diplomacyColorsWindowButtonIcon" size="0 0 100% 100%" type="image" sprite="stretched:session/icons/diplomacy.png" ghost="true"/>
+			<action on="Press">updateDiplomacyColorsButton();</action>
+		</object>
+		<object size="32 0 100% 28" type="text" style="DiplomacyText" text_valign="center">
+			<translatableAttribute id="caption">Toggle Diplomacy Colors</translatableAttribute>
+		</object>
+	</object>
+
+	<object size="50%+100 100%-50 50%+228 100%-22" type="button" style="StoneButton">
 		<translatableAttribute id="caption">Close</translatableAttribute>
 		<action on="Press">closeDiplomacy();</action>
 	</object>
Index: ps/trunk/binaries/data/mods/public/gui/session/minimap_panel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/minimap_panel.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/minimap_panel.xml
@@ -40,6 +40,6 @@
 		sprite="stretched:session/minimap-diplomacy-off.png"
 		sprite_over="stretched:session/minimap-diplomacy-off-highlight.png"
 	>
-		<action on="Press">updateDiplomacyColorsButton()</action>
+		<action on="Press">updateDiplomacyColorsButton();</action>
 	</object>
 </object>
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
@@ -386,6 +386,9 @@
 	diplomacyColorsButton.sprite_over = g_DiplomacyColorsToggle ?
 		"stretched:session/minimap-diplomacy-on-highlight.png" :
 		"stretched:session/minimap-diplomacy-off-highlight.png";
+	Engine.GetGUIObjectByName("diplomacyColorsWindowButtonIcon").sprite = g_DiplomacyColorsToggle ?
+		"stretched:session/icons/diplomacy-on.png" :
+		"stretched:session/icons/diplomacy.png";
 	updateDisplayedPlayerColors();
 }
 
@@ -453,6 +456,10 @@
 		colorizeHotkey("%(hotkey)s" + " ", "session.diplomacycolors") +
 		translate("Toggle Diplomacy Colors");
 
+	Engine.GetGUIObjectByName("diplomacyColorsWindowButton").tooltip =
+		colorizeHotkey("%(hotkey)s" + " ", "session.diplomacycolors") +
+		translate("Toggle Diplomacy Colors");
+
 	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");