From 33e9cd612601e2b848437841b5611bd145d93e45 Mon Sep 17 00:00:00 2001
From: Dunedan <dunedan@phoenitydawn.de>
Date: Fri, 3 Jan 2025 16:33:51 +0100
Subject: [PATCH] Increase height of StoneButtons and TabButtons

This increases the height StoneButtons and TabButtons, so that a
double-spaced caption does fit on them without significant overflow.
Exempt from that are the StoneButtons resembling lists in the main menu
and the in-game menu, as changing their height didn't feel right and we
don't need double-spaced captions for them anyway, as they're wide
enough.

The height of StoneButtons got increased from 28px to 32px, while the
height of TabButtons got increased from 30px to 34px.
---
 .../campaigns/default_menu/CampaignMenu.xml    |  8 ++++----
 .../gui/campaigns/load_modal/LoadModal.xml     | 14 +++++++-------
 .../campaigns/new_modal/NewCampaignModal.xml   | 10 +++++-----
 .../gui/campaigns/setup/CampaignSetupPage.xml  |  8 ++++----
 .../data/mods/public/gui/credits/credits.js    |  2 +-
 .../Pages/GameSetupPage/GameSetupPage.xml      |  8 ++++----
 .../Panels/GameSettingWarning.xml              |  2 +-
 .../GameSetupPage/Panels/GameSettingsTabs.js   |  2 +-
 .../data/mods/public/gui/loadgame/load.xml     |  6 +++---
 .../data/mods/public/gui/options/options.js    |  2 +-
 .../public/gui/pregame/ProjectInformation.js   | 12 ++++++------
 .../public/gui/pregame/ProjectInformation.xml  |  2 +-
 .../data/mods/public/gui/pregame/menupanel.xml |  2 +-
 .../gui/pregame/userreport/userreport.xml      |  8 ++++----
 .../gui/reference/catafalque/catafalque.xml    |  4 ++--
 .../civinfo/Sections/HistorySection.xml        |  2 +-
 .../reference/common/Buttons/CivInfoButton.xml |  2 +-
 .../reference/common/Buttons/CloseButton.xml   |  2 +-
 .../common/Buttons/StructreeButton.xml         |  2 +-
 .../Sections/Trainer/TrainerSection.xml        |  2 +-
 .../structree/Sections/Tree/TreeSection.xml    |  2 +-
 .../gui/reference/tips/sections/TipDisplay.xml |  6 +++---
 .../mods/public/gui/reference/tips/tips.xml    |  4 ++--
 .../mods/public/gui/replaymenu/replay_menu.xml |  2 +-
 .../public/gui/session/chat/chat_window.xml    | 18 +++++++++---------
 25 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.xml b/binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.xml
index 413593a292..14f818bc2a 100644
--- a/binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.xml
+++ b/binaries/data/mods/public/gui/campaigns/default_menu/CampaignMenu.xml
@@ -14,7 +14,7 @@
 			<translatableAttribute id="caption">Campaign Name</translatableAttribute>
 		</object>
 
-		<object name="leftPanel" size="30 50 100%-447 100%-60">
+		<object name="leftPanel" size="30 50 100%-447 100%-68">
 			<!-- List of available levels -->
 			<object name="levelSelection"
 				size="0 0 100% 100%"
@@ -33,7 +33,7 @@
 			</object>
 		</object>
 
-		<object name="rightPanel" size="100%-432 50 100%-30 100%-60">
+		<object name="rightPanel" size="100%-432 50 100%-30 100%-68">
 			<!-- Scenario Image -->
 			<object type="image" sprite="ModernDarkBoxGold" name="levelPreviewBox" size="0 0 100% 302">
 				<object type="image" sprite="" size="1 1 100%-1 301" name="mapPreview"/>
@@ -51,14 +51,14 @@
 
 		</object>
 
-		<object name="bottomPanel" size="30 100%-55 100%-5 100%-25" >
+		<object name="bottomPanel" size="30 100%-57 100%-5 100%-25" >
 
 			<!-- Exit & Back to Main Menu -->
 			<object name="backToMain" type="button" style="StoneButton" size="0 0 17% 100%">
 				<translatableAttribute id="caption">Back to Main Menu</translatableAttribute>
 			</object>
 
-			<object name="savedGamesButton" type="button" style="StoneButtonFancy" size="63%-25 0 80%-25 100%">
+			<object name="savedGamesButton" type="button" style="StoneButtonFancy" size="64%-25 0 81%-25 100%">
 				<translatableAttribute id="caption">Saved Games</translatableAttribute>
 			</object>
 
diff --git a/binaries/data/mods/public/gui/campaigns/load_modal/LoadModal.xml b/binaries/data/mods/public/gui/campaigns/load_modal/LoadModal.xml
index 7825ea9d09..523bf8c1b2 100644
--- a/binaries/data/mods/public/gui/campaigns/load_modal/LoadModal.xml
+++ b/binaries/data/mods/public/gui/campaigns/load_modal/LoadModal.xml
@@ -13,29 +13,29 @@
 			<translatableAttribute id="caption">Load Campaign</translatableAttribute>
 		</object>
 
-		<object name="runSelection" style="ModernList" type="list" size="24 22 100%-24 100%-130">
+		<object name="runSelection" style="ModernList" type="list" size="24 22 100%-24 100%-134">
 		</object>
 
-		<object size="24 22 100%-24 100%-130" name="noCampaignsText" type="text" text_align="center" style="ModernLeftLabelText">
+		<object size="24 22 100%-24 100%-134" name="noCampaignsText" type="text" text_align="center" style="ModernLeftLabelText">
 			<translatableAttribute id="caption">No ongoing campaigns.</translatableAttribute>
 		</object>
 
-		<object size="24 100%-124 100%-24 100%-100" name="campaignSaveName" type="text" style="ModernLeftLabelText">
+		<object size="24 100%-124 100%-24 100%-104" name="campaignSaveName" type="text" style="ModernLeftLabelText">
 			<translatableAttribute id="caption">Name of selected run:</translatableAttribute>
 		</object>
 
-		<object name="runDescription" size="24 100%-96 100%-24 100%-72" type="input" style="ModernInput">
+		<object name="runDescription" size="24 100%-96 100%-24 100%-76" type="input" style="ModernInput">
 		</object>
 
-		<object name="cancelButton" type="button" size="0%+25 100%-60 33%+10 100%-32" style="StoneButton" hotkey="cancel">
+		<object name="cancelButton" type="button" size="0%+25 100%-64 33%+10 100%-32" style="StoneButton" hotkey="cancel">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 		</object>
 
-		<object name="deleteGameButton" type="button" size="33%+20 100%-60 66%-15 100%-32" style="StoneButton" enabled="false">
+		<object name="deleteGameButton" type="button" size="33%+20 100%-64 66%-15 100%-32" style="StoneButton" enabled="false">
 			<translatableAttribute id="caption">Delete</translatableAttribute>
 		</object>
 
-		<object name="startButton" type="button" style="StoneButton" size="66%-5 100%-60 100%-25 100%-32">
+		<object name="startButton" type="button" style="StoneButton" size="66%-5 100%-64 100%-25 100%-32">
 			<translatableAttribute id="caption">Load Campaign</translatableAttribute>
 		</object>
 
diff --git a/binaries/data/mods/public/gui/campaigns/new_modal/NewCampaignModal.xml b/binaries/data/mods/public/gui/campaigns/new_modal/NewCampaignModal.xml
index 1eac4d6fe5..ace1bdf036 100644
--- a/binaries/data/mods/public/gui/campaigns/new_modal/NewCampaignModal.xml
+++ b/binaries/data/mods/public/gui/campaigns/new_modal/NewCampaignModal.xml
@@ -6,24 +6,24 @@
 	<!-- Add a translucent black background to fade out the page -->
 	<object type="image" z="0" sprite="ModernFade"/>
 
-	<object type="image" style="ModernDialog" size="50%-300 50%-75 50%+300 50%+75">
+	<object type="image" style="ModernDialog" size="50%-300 50%-77 50%+300 50%+77">
 		<object type="image" z="0" sprite="ModernFade"/>
 		<object type="text" style="TitleText" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">Start a campaign</translatableAttribute>
 		</object>
 
-		<object type="text" style="ModernLabelText" text_align="left" size="24 20 100%-24 100%-100">
+		<object type="text" style="ModernLabelText" text_align="left" size="24 20 100%-24 100%-104">
 			<translatableAttribute id="caption">Please enter the name of your new campaign run:</translatableAttribute>
 		</object>
 
-		<object name="runDescription" size="24 100%-96 100%-24 100%-72" type="input" style="ModernInput">
+		<object name="runDescription" size="24 100%-100 100%-24 100%-76" type="input" style="ModernInput">
 		</object>
 
-		<object name="cancelButton" type="button" size="0%+25 100%-60 33%+10 100%-32" style="StoneButton" hotkey="cancel">
+		<object name="cancelButton" type="button" size="0%+25 100%-64 33%+10 100%-32" style="StoneButton" hotkey="cancel">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 		</object>
 
-		<object name="startButton" type="button" style="StoneButton" size="66%-5 100%-60 100%-25 100%-32" enabled="true">
+		<object name="startButton" type="button" style="StoneButton" size="66%-5 100%-64 100%-25 100%-32" enabled="true">
 			<translatableAttribute id="caption">Start Campaign</translatableAttribute>
 		</object>
 
diff --git a/binaries/data/mods/public/gui/campaigns/setup/CampaignSetupPage.xml b/binaries/data/mods/public/gui/campaigns/setup/CampaignSetupPage.xml
index 2440da7891..bca31c619f 100644
--- a/binaries/data/mods/public/gui/campaigns/setup/CampaignSetupPage.xml
+++ b/binaries/data/mods/public/gui/campaigns/setup/CampaignSetupPage.xml
@@ -10,7 +10,7 @@
 			<translatableAttribute id="caption">Campaigns</translatableAttribute>
 		</object>
 
-		<object name="leftPanel" size="30 50 100%-515 100%-80">
+		<object name="leftPanel" size="30 50 100%-515 100%-68">
 			<!-- List of campaigns -->
 			<object name="campaignSelection"
 				size="0 0 100% 100%"
@@ -28,7 +28,7 @@
 			</object>
 		</object>
 
-		<object name="rightPanel" size="100%-485 50 100%-30 100%-30">
+		<object name="rightPanel" size="100%-485 50 100%-30 100%-68">
 			<object type="image" sprite="ModernDarkBoxGold" size="0 0 100% 342">
 				<object name="campaignImage" type="image" sprite="" size="1 1 100%-1 100%-1">
 				</object>
@@ -36,14 +36,14 @@
 			<object type="text" name="campaignTitle" style="TitleText" size="0 360 100% 390">
 				<translatableAttribute id="caption">No Campaign selected</translatableAttribute>
 			</object>
-			<object type="image" sprite="ModernDarkBoxGold" name="campaignDescBox" size="0 400 100% 100%-50" hidden="false">
+			<object type="image" sprite="ModernDarkBoxGold" name="campaignDescBox" size="0 400 100% 100%" hidden="false">
 				<object type="text" name="campaignDesc" style="ModernLabelText" font="sans-16" size="10 10 100%-10 100%-10">
 				</object>
 			</object>
 		</object>
 	</object>
 
-	<object name="bottomPanel" size="25 100%-55 100%-5 100%-25" >
+	<object name="bottomPanel" size="25 100%-57 100%-5 100%-25" >
 
 		<!-- Main Menu Button -->
 		<object name="mainMenuButton" type="button" style="StoneButton" size="25 0 17%+25 100%">
diff --git a/binaries/data/mods/public/gui/credits/credits.js b/binaries/data/mods/public/gui/credits/credits.js
index e5bae01ff6..5e0d474c3b 100644
--- a/binaries/data/mods/public/gui/credits/credits.js
+++ b/binaries/data/mods/public/gui/credits/credits.js
@@ -22,7 +22,7 @@ var g_PanelData = [];
 /**
  * Vertical size of a tab button.
  */
-var g_TabButtonHeight = 35;
+var g_TabButtonHeight = 34;
 
 /**
  * Vertical space between two tab buttons.
diff --git a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSetupPage.xml b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSetupPage.xml
index 0388d9b8fa..62e1a21eff 100644
--- a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSetupPage.xml
+++ b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSetupPage.xml
@@ -27,7 +27,7 @@
 		</object>
 	</object>
 
-	<object name="centerPanel" size="0 0 100% 100%-60">
+	<object name="centerPanel" size="0 0 100% 100%-64">
 
 		<object name="centerLeftPanel" size="24 0 100% 100%">
 			<object size="0 346 100%-795-24 100%">
@@ -63,7 +63,7 @@
 
 	</object>
 
-	<object name="bottomPanel" size="0 0 100% 100%-24">
+	<object name="bottomPanel" size="0 0 100% 100%-22">
 
 		<object name="bottomLeftPanel">
 
@@ -71,13 +71,13 @@
 				<include file="gui/gamesetup/Pages/GameSetupPage/Panels/Tooltip.xml"/>
 			</object>
 
-			<object size="0 100%-28 100%-470 100%">
+			<object size="0 100%-32 100%-470 100%">
 				<include file="gui/gamesetup/Pages/GameSetupPage/Panels/GameSettingWarning.xml"/>
 			</object>
 
 		</object>
 
-		<object name="bottomRightPanel" size="100%-464 100%-28 100% 100%">
+		<object name="bottomRightPanel" size="100%-464 100%-32 100% 100%">
 
 			<object size="0 0 140 100%">
 				<include file="gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/SavedGameLabel.xml"/>
diff --git a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/GameSettingWarning.xml b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/GameSettingWarning.xml
index 9aea93858c..defb9df04a 100644
--- a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/GameSettingWarning.xml
+++ b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/GameSettingWarning.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object name="gameSettingWarning" type="text" textcolor="red" style="ModernRightLabelText" size="0 0 100% 30"/>
+<object name="gameSettingWarning" type="text" textcolor="red" style="ModernRightLabelText" size="0 0 100% 32"/>
diff --git a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/GameSettingsTabs.js b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/GameSettingsTabs.js
index 32b73b217c..d2d743b956 100644
--- a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/GameSettingsTabs.js
+++ b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/GameSettingsTabs.js
@@ -73,7 +73,7 @@ class GameSettingTabs
 GameSettingTabs.prototype.ToggleTooltip =
 	translate("Click to toggle the %(name)s settings tab.");
 
-GameSettingTabs.prototype.TabButtonHeight = 30;
+GameSettingTabs.prototype.TabButtonHeight = 34;
 
 GameSettingTabs.prototype.TabButtonMargin = 4;
 
diff --git a/binaries/data/mods/public/gui/loadgame/load.xml b/binaries/data/mods/public/gui/loadgame/load.xml
index 841ff0bf56..c9b8f933e7 100644
--- a/binaries/data/mods/public/gui/loadgame/load.xml
+++ b/binaries/data/mods/public/gui/loadgame/load.xml
@@ -46,15 +46,15 @@
 
 			<object name="saveGameDesc" size="20 100%-96 100%-20 100%-72" type="input" style="ModernInput" hidden="true"/>
 
-			<object name="cancel" type="button" size="0%+20 100%-60 33%+10 100%-32" style="StoneButton" hotkey="cancel">
+			<object name="cancel" type="button" size="0%+20 100%-62 33%+10 100%-30" style="StoneButton" hotkey="cancel">
 				<translatableAttribute id="caption">Cancel</translatableAttribute>
 			</object>
 
-			<object name="deleteGameButton" type="button" size="33%+20 100%-60 66%-20 100%-32" style="StoneButton" enabled="false" hotkey="session.savedgames.delete">
+			<object name="deleteGameButton" type="button" size="33%+20 100%-62 66%-20 100%-30" style="StoneButton" enabled="false" hotkey="session.savedgames.delete">
 				<translatableAttribute id="caption">Delete</translatableAttribute>
 			</object>
 
-			<object name="confirmButton" type="button" style="StoneButton" size="66%-10 100%-60 100%-20 100%-32"/>
+			<object name="confirmButton" type="button" style="StoneButton" size="66%-10 100%-62 100%-20 100%-30"/>
 		</object>
 
 		<object name="filterPanel" size="625 25 100%-20 70">
diff --git a/binaries/data/mods/public/gui/options/options.js b/binaries/data/mods/public/gui/options/options.js
index 8de16ce7dc..5754c717be 100644
--- a/binaries/data/mods/public/gui/options/options.js
+++ b/binaries/data/mods/public/gui/options/options.js
@@ -11,7 +11,7 @@ var g_ChangedKeys;
 /**
  * Vertical size of a tab button.
  */
-var g_TabButtonHeight = 30;
+var g_TabButtonHeight = 34;
 
 /**
  * Vertical space between two tab buttons.
diff --git a/binaries/data/mods/public/gui/pregame/ProjectInformation.js b/binaries/data/mods/public/gui/pregame/ProjectInformation.js
index 05e92cee46..67a0e2412a 100644
--- a/binaries/data/mods/public/gui/pregame/ProjectInformation.js
+++ b/binaries/data/mods/public/gui/pregame/ProjectInformation.js
@@ -24,7 +24,7 @@ var g_CommunityButtons = [
 	{
 		"caption": translate("Website"),
 		"tooltip": translate("Click to open play0ad.com in your web browser."),
-		"size": "8 100%-144 50%-4 100%-116",
+		"size": "8 100%-148 50%-4 100%-116",
 		"onPress": () => {
 			openURL("https://play0ad.com/");
 		}
@@ -32,7 +32,7 @@ var g_CommunityButtons = [
 	{
 		"caption": translate("Chat"),
 		"tooltip": translate("Click to open the 0 A.D. IRC chat in your browser (#0ad on webchat.quakenet.org). It is run by volunteers who do all sorts of tasks, it may take a while to get your question answered. Alternatively, you can use the forum (see Website)."),
-		"size": "50%+4 100%-144 100%-8 100%-116",
+		"size": "50%+4 100%-148 100%-8 100%-116",
 		"onPress": () => {
 			openURL("https://webchat.quakenet.org/?channels=0ad");
 		}
@@ -40,7 +40,7 @@ var g_CommunityButtons = [
 	{
 		"caption": translate("Report a Bug"),
 		"tooltip": translate("Click to visit 0 A.D. Trac to report a bug, crash, or error."),
-		"size": "8 100%-108 50%-4 100%-80",
+		"size": "8 100%-112 50%-4 100%-80",
 		"onPress": () => {
 			openURL("https://gitea.wildfiregames.com/0ad/0ad/wiki/ReportingErrors/");
 		}
@@ -48,7 +48,7 @@ var g_CommunityButtons = [
 	{
 		"caption": translateWithContext("Frequently Asked Questions", "FAQ"),
 		"tooltip": translate("Click to visit the Frequently Asked Questions page in your browser."),
-		"size": "50%+4 100%-108 100%-8 100%-80",
+		"size": "50%+4 100%-112 100%-8 100%-80",
 		"onPress": () => {
 			openURL("https://gitea.wildfiregames.com/0ad/0ad/wiki/FAQ");
 		}
@@ -56,7 +56,7 @@ var g_CommunityButtons = [
 	{
 		"caption": translate("Translate the Game"),
 		"tooltip": translate("Click to open the 0 A.D. translate page in your browser."),
-		"size": "8 100%-72 100%-8 100%-44",
+		"size": "8 100%-76 100%-8 100%-44",
 		"onPress": () => {
 			openURL("https://gitea.wildfiregames.com/0ad/0ad/wiki/Localization");
 		}
@@ -64,7 +64,7 @@ var g_CommunityButtons = [
 	{
 		"caption": translate("Donate"),
 		"tooltip": translate("Help with the project expenses by donating."),
-		"size": "8 100%-36 100%-8 100%-8",
+		"size": "8 100%-40 100%-8 100%-8",
 		"onPress": () => {
 			openURL("https://play0ad.com/community/donate/");
 		}
diff --git a/binaries/data/mods/public/gui/pregame/ProjectInformation.xml b/binaries/data/mods/public/gui/pregame/ProjectInformation.xml
index ab56bd48a5..3f59714829 100644
--- a/binaries/data/mods/public/gui/pregame/ProjectInformation.xml
+++ b/binaries/data/mods/public/gui/pregame/ProjectInformation.xml
@@ -2,7 +2,7 @@
 <object>
 	<object name="productLogo" type="image" ghost="true" size="50%-110 10 50%+110 110"/>
 
-	<object type="image" style="TranslucentPanelThinBorder" size="8 100%-360 100%-8 100%-94">
+	<object type="image" style="TranslucentPanelThinBorder" size="8 100%-368 100%-8 100%-94">
 
 		<object name="productDescription" font="sans-14" type="text" textcolor="white" size="8 8 100%-8 100%-36" ghost="true"/>
 
diff --git a/binaries/data/mods/public/gui/pregame/menupanel.xml b/binaries/data/mods/public/gui/pregame/menupanel.xml
index 110a8e7acf..40f0deaa24 100644
--- a/binaries/data/mods/public/gui/pregame/menupanel.xml
+++ b/binaries/data/mods/public/gui/pregame/menupanel.xml
@@ -7,7 +7,7 @@
 		<!-- Set z value explicitly to be able to click buttons for low
 			resolutions, when they might be covered by project information.
 			Players should be able to exit at least. -->
-		<object name="mainMenuButtons" size="8 156 100%-8 356" z="60">
+		<object name="mainMenuButtons" size="8 146 100%-8 346" z="60">
 			<repeat count="10">
 				<object name="mainMenuButton[n]" type="button" style="StoneButtonFancy" tooltip_style="pgToolTip"/>
 			</repeat>
diff --git a/binaries/data/mods/public/gui/pregame/userreport/userreport.xml b/binaries/data/mods/public/gui/pregame/userreport/userreport.xml
index 18618e1ac3..938b2b6312 100644
--- a/binaries/data/mods/public/gui/pregame/userreport/userreport.xml
+++ b/binaries/data/mods/public/gui/pregame/userreport/userreport.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<object name="userReport" type="image" style="userReportPanel" size="100%-314 100%-154 100%-4 100%-4">
+<object name="userReport" type="image" style="userReportPanel" size="100%-314 100%-158 100%-4 100%-4">
 
 	<action on="Load">initUserReport();</action>
 	<action on="Tick">updateUserReportStatus();</action>
 
-	<object type="text" name="userReportText" style="userReportText" size="2 2 100%-2 100%-40"/>
+	<object type="text" name="userReportText" style="userReportText" size="2 2 100%-2 100%-44"/>
 
-	<object type="button" name="userReportEnableButton" style="StoneButton" tooltip_style="pgToolTip" size="8 100%-36 151 100%-8"/>
-	<object type="button" name="userReportTermsButton" style="StoneButton" size="100%-151 100%-36 100%-8 100%-8"/>
+	<object type="button" name="userReportEnableButton" style="StoneButton" tooltip_style="pgToolTip" size="8 100%-40 151 100%-8"/>
+	<object type="button" name="userReportTermsButton" style="StoneButton" size="100%-151 100%-40 100%-8 100%-8"/>
 
 </object>
diff --git a/binaries/data/mods/public/gui/reference/catafalque/catafalque.xml b/binaries/data/mods/public/gui/reference/catafalque/catafalque.xml
index 327f162e1e..d9081473ac 100644
--- a/binaries/data/mods/public/gui/reference/catafalque/catafalque.xml
+++ b/binaries/data/mods/public/gui/reference/catafalque/catafalque.xml
@@ -12,13 +12,13 @@
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" sprite="BackgroundTranslucent"/>
 
-	<object type="image" style="ModernDialog" size="50%-368 50%-368 50%+368 50%+370">
+	<object type="image" style="ModernDialog" size="50%-400 50%-368 50%+400 50%+370">
 
 		<object style="TitleText" type="text" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">Catafalque Bonuses</translatableAttribute>
 		</object>
 
-		<object name="canvas" size="8 8 100%-8 100%-8">
+		<object name="canvas" size="8 4 100%-8 100%-12">
 			<repeat count="16" var="e">
 				<object name="emblem[e]" style="Emblem">
 					<object type="image" style="EmblemImage"/>
diff --git a/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.xml b/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.xml
index fa31f9398c..17b13772ed 100644
--- a/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.xml
+++ b/binaries/data/mods/public/gui/reference/civinfo/Sections/HistorySection.xml
@@ -13,7 +13,7 @@
 		/>
 	</object>
 
-	<object type="image" sprite="ModernDarkBoxGold" size="0 35 100% 100%">
+	<object type="image" sprite="ModernDarkBoxGold" size="0 35 100% 100%-12">
 		<object
 			name="civHistoryText"
 			type="text"
diff --git a/binaries/data/mods/public/gui/reference/common/Buttons/CivInfoButton.xml b/binaries/data/mods/public/gui/reference/common/Buttons/CivInfoButton.xml
index 2595aeec90..3fcde2a182 100644
--- a/binaries/data/mods/public/gui/reference/common/Buttons/CivInfoButton.xml
+++ b/binaries/data/mods/public/gui/reference/common/Buttons/CivInfoButton.xml
@@ -3,6 +3,6 @@
 	name="civInfoButton"
 	type="button"
 	style="StoneButton"
-	size="100%-421 100%-44 100%-221 100%-16"
+	size="100%-421 100%-56 100%-224 100%-24"
 	hotkey="civinfo"
 />
diff --git a/binaries/data/mods/public/gui/reference/common/Buttons/CloseButton.xml b/binaries/data/mods/public/gui/reference/common/Buttons/CloseButton.xml
index 06a3eaee6f..11d507eb80 100644
--- a/binaries/data/mods/public/gui/reference/common/Buttons/CloseButton.xml
+++ b/binaries/data/mods/public/gui/reference/common/Buttons/CloseButton.xml
@@ -3,6 +3,6 @@
 	name="closeButton"
 	type="button"
 	style="StoneButton"
-	size="100%-216 100%-44 100%-16 100%-16"
+	size="100%-216 100%-56 100%-24 100%-24"
 	hotkey="cancel"
 />
diff --git a/binaries/data/mods/public/gui/reference/common/Buttons/StructreeButton.xml b/binaries/data/mods/public/gui/reference/common/Buttons/StructreeButton.xml
index 434b3f8e0e..e4c114d4c9 100644
--- a/binaries/data/mods/public/gui/reference/common/Buttons/StructreeButton.xml
+++ b/binaries/data/mods/public/gui/reference/common/Buttons/StructreeButton.xml
@@ -3,6 +3,6 @@
 	name="structreeButton"
 	type="button"
 	style="StoneButton"
-	size="100%-421 100%-44 100%-221 100%-16"
+	size="100%-421 100%-56 100%-224 100%-24"
 	hotkey="structree"
 />
diff --git a/binaries/data/mods/public/gui/reference/structree/Sections/Trainer/TrainerSection.xml b/binaries/data/mods/public/gui/reference/structree/Sections/Trainer/TrainerSection.xml
index 016cd41340..923ae09223 100644
--- a/binaries/data/mods/public/gui/reference/structree/Sections/Trainer/TrainerSection.xml
+++ b/binaries/data/mods/public/gui/reference/structree/Sections/Trainer/TrainerSection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object size="100%-124 54+64 100%-16 100%-54" name="trainerSection">
+<object size="100%-124 54+64 100%-16 100%-66" name="trainerSection">
 	<object
 		name="trainerSectionHeading"
 		type="text"
diff --git a/binaries/data/mods/public/gui/reference/structree/Sections/Tree/TreeSection.xml b/binaries/data/mods/public/gui/reference/structree/Sections/Tree/TreeSection.xml
index 58ab5e35d4..611fa82068 100644
--- a/binaries/data/mods/public/gui/reference/structree/Sections/Tree/TreeSection.xml
+++ b/binaries/data/mods/public/gui/reference/structree/Sections/Tree/TreeSection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object size="0 54+64 100%-16 100%-54" name="treeSection">
+<object size="0 54+64 100%-16 100%-66" name="treeSection">
 	<object name="phaseIdents">
 		<repeat count="4" var="n">
 			<object name="phase[n]_ident" hidden="true">
diff --git a/binaries/data/mods/public/gui/reference/tips/sections/TipDisplay.xml b/binaries/data/mods/public/gui/reference/tips/sections/TipDisplay.xml
index 6c315dd8f5..54a984a1a6 100644
--- a/binaries/data/mods/public/gui/reference/tips/sections/TipDisplay.xml
+++ b/binaries/data/mods/public/gui/reference/tips/sections/TipDisplay.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object>
 	<script directory="gui/reference/tips/sections/"/>
-	<object type="image" name="imageControlPanel" sprite="ModernFade" size="80 398 440 430">
+	<object type="image" name="imageControlPanel" sprite="ModernFade" size="120 412 400 444">
 		<object type="image" sprite="TipImageFrame"/>
 		<object type="text" name="tipImageText" style="TipImageText"/>
 		<object type="button" name="previousImageButton" style="PreviousImageButton" size="43 9 57 23"/>
-		<object type="button" name="nextImageButton" style="NextImageButton" size="303 9 317 23"/>
+		<object type="button" name="nextImageButton" style="NextImageButton" size="223 9 237 23"/>
 	</object>
-	<object type="image" sprite="TipImageFrame" size="0 0 520 392" ghost="true">
+	<object type="image" sprite="TipImageFrame" size="0 4 520 396" ghost="true">
 		<object name="tipImage" size="4 4 516 516" type="image">
 			<object type="image" sprite="stretched:tipdisplay/tip-image-gradient.png"/>
 		</object>
diff --git a/binaries/data/mods/public/gui/reference/tips/tips.xml b/binaries/data/mods/public/gui/reference/tips/tips.xml
index 4df987a0a8..44a08c14e3 100644
--- a/binaries/data/mods/public/gui/reference/tips/tips.xml
+++ b/binaries/data/mods/public/gui/reference/tips/tips.xml
@@ -4,11 +4,11 @@
 	<script directory="gui/reference/tips/"/>
 	<script directory="gui/reference/common/Buttons/"/>
     <object type="image" sprite="BackgroundTranslucent"/>
-	<object type="image" size="50%-502 50%-250 50%+502 50%+250" sprite="ModernDialog">
+	<object type="image" size="50%-502 50%-255 50%+502 50%+255" sprite="ModernDialog">
 		<object style="TitleText" type="text" size="50%-128 -18 50%+128 14">
 			<translatableAttribute id="caption">Tips and Tricks</translatableAttribute>
 		</object>
-		<object size="50%-452 50%-206 50%+452 50%+186">
+		<object size="50%-452 50%-215 50%+452 50%+191">
 			<include file="gui/reference/tips/sections/TipDisplay.xml"/>
 		</object>
 		<include file="gui/reference/common/Buttons/CloseButton.xml"/>
diff --git a/binaries/data/mods/public/gui/replaymenu/replay_menu.xml b/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
index f7652f901d..40753cd9f0 100644
--- a/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
+++ b/binaries/data/mods/public/gui/replaymenu/replay_menu.xml
@@ -221,7 +221,7 @@
 
 
 		<!-- Bottom Panel: Buttons. -->
-		<object name="bottomPanel" size="25 100%-55 100%-5 100%-25" >
+		<object name="bottomPanel" size="25 100%-56 100%-5 100%-24" >
 
 			<!-- Main Menu Button -->
 			<object type="button" style="StoneButton" size="0 0 19% 100%">
diff --git a/binaries/data/mods/public/gui/session/chat/chat_window.xml b/binaries/data/mods/public/gui/session/chat/chat_window.xml
index b0ad7fa070..8c1737069e 100644
--- a/binaries/data/mods/public/gui/session/chat/chat_window.xml
+++ b/binaries/data/mods/public/gui/session/chat/chat_window.xml
@@ -39,16 +39,16 @@
 	</object>
 
 	<!-- Chat input elements -->
-	<object name="chatPage" size="0 100%-120 100% 100%">
+	<object name="chatPage" size="0 100%-128 100% 100%">
 
 		<!-- Message addressee -->
-		<object type="text" name="chatAddresseeCaption" size="16 100%-106 50 100%-82" style="ModernLeftLabelText">
+		<object type="text" name="chatAddresseeCaption" size="16 100%-114 50 100%-90" style="ModernLeftLabelText">
 			<translatableAttribute id="caption" context="chat input">To:</translatableAttribute>
 		</object>
 		<object
 			name="chatAddressee"
 			type="dropdown"
-			size="75 100%-108 100%-16 100%-84"
+			size="75 100%-116 100%-16 100%-90"
 			style="ModernDropDown"
 			tooltip_style="sessionToolTipBold"
 		>
@@ -56,19 +56,19 @@
 		</object>
 
 		<!-- Message text -->
-		<object type="text" name="chatInputCaption" size="16 100%-74 50 100%-50" style="ModernLeftLabelText">
+		<object type="text" name="chatInputCaption" size="16 100%-82 50 100%-58" style="ModernLeftLabelText">
 			<translatableAttribute id="caption" context="chat input">Text:</translatableAttribute>
 		</object>
 		<object
 			type="input"
 			name="chatInput"
-			size="75 100%-76 100%-16 100%-52"
+			size="75 100%-82 100%-16 100%-56"
 			style="ModernInput"
 			max_length="1024"
 		/>
 
 		<!-- Cancel Button -->
-		<object name="closeChat" size="16 100%-40 30%+16 100%-12" type="button" style="StoneButton">
+		<object name="closeChat" size="16 100%-48 30%+16 100%-12" type="button" style="StoneButton">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 		</object>
 
@@ -78,16 +78,16 @@
 			name="extendedChat"
 			checked="false"
 			style="ModernTickBox"
-			size="50%-40 100%-38 50%-20 100%-12"
+			size="50%-40 100%-40 50%-20 100%-12"
 		/>
 
 		<!-- Extended Chat Label -->
-		<object type="text" size="50%-20 100%-38 50%+50 100%-12" text_align="left" textcolor="white">
+		<object type="text" size="50%-20 100%-48 50%+50 100%-12" text_align="left" text_valign="center" textcolor="white">
 			<translatableAttribute id="caption" context="chat">History</translatableAttribute>
 		</object>
 
 		<!-- Send Button -->
-		<object name="sendChat" size="70%-16 100%-40 100%-16 100%-12" type="button" style="StoneButton">
+		<object name="sendChat" size="70%-16 100%-48 100%-16 100%-12" type="button" style="StoneButton">
 			<translatableAttribute id="caption">Send</translatableAttribute>
 		</object>
 	</object>