diff --git a/binaries/data/mods/mod/gui/common/modern/styles.xml b/binaries/data/mods/mod/gui/common/modern/styles.xml
index 4f8e896fff..9990f29815 100644
--- a/binaries/data/mods/mod/gui/common/modern/styles.xml
+++ b/binaries/data/mods/mod/gui/common/modern/styles.xml
@@ -69,7 +69,7 @@
 		sprite2="ModernDropDownArrow"
 		sprite2_disabled="ModernDropDownArrowDisabled"
 		sprite2_pressed="ModernDropDownArrowHighlight"
-		buffer_zone="8"
+		buffer_zone="5"
 		dropdown_size="440"
 		minimum_visible_items="3"
 		sprite_list="GrayBackground"
diff --git a/binaries/data/mods/public/gui/common/setup.xml b/binaries/data/mods/public/gui/common/setup.xml
index 0ad1a53b9e..d85daa4789 100644
--- a/binaries/data/mods/public/gui/common/setup.xml
+++ b/binaries/data/mods/public/gui/common/setup.xml
@@ -27,7 +27,7 @@
 
 		<tooltip name="snToolTip"
 			anchor="top"
-			buffer_zone="4"
+			buffer_zone="3"
 			delay="500"
 			font="sans-14"
 			maxwidth="400"
@@ -38,7 +38,7 @@
 
 		<tooltip name="snToolTipBottom"
 			anchor="bottom"
-			buffer_zone="4"
+			buffer_zone="3"
 			delay="500"
 			font="sans-14"
 			maxwidth="400"
@@ -49,7 +49,7 @@
 
 		<tooltip name="sessionToolTip"
 			anchor="top"
-			buffer_zone="4"
+			buffer_zone="3"
 			delay="100"
 			font="sans-14"
 			maxwidth="400"
@@ -60,7 +60,7 @@
 
 		<tooltip name="sessionToolTipInstantly"
 			anchor="top"
-			buffer_zone="4"
+			buffer_zone="3"
 			delay="0"
 			font="sans-14"
 			maxwidth="400"
@@ -71,7 +71,7 @@
 
 		<tooltip name="sessionToolTipBottom"
 			anchor="bottom"
-			buffer_zone="4"
+			buffer_zone="3"
 			delay="100"
 			font="sans-14"
 			maxwidth="400"
@@ -82,7 +82,7 @@
 
 		<tooltip name="sessionToolTipBold"
 			anchor="top"
-			buffer_zone="4"
+			buffer_zone="3"
 			delay="100"
 			font="sans-bold-14"
 			maxwidth="400"
@@ -93,7 +93,7 @@
 
 		<tooltip name="sessionToolTipBottomBold"
 			anchor="bottom"
-			buffer_zone="4"
+			buffer_zone="3"
 			delay="100"
 			font="sans-bold-14"
 			maxwidth="400"
diff --git a/binaries/data/mods/public/gui/common/sprites.xml b/binaries/data/mods/public/gui/common/sprites.xml
index 03604f6875..31440f1663 100644
--- a/binaries/data/mods/public/gui/common/sprites.xml
+++ b/binaries/data/mods/public/gui/common/sprites.xml
@@ -151,7 +151,7 @@
 		<effect add_color="237 227 167"/>
 		<image
 			texture="global/icon/info.png"
-			size="0 3 100% 100%+3"
+			size="0 0 100% 100%"
 		/>
 	</sprite>
 
@@ -159,7 +159,7 @@
 		<effect add_color="255 255 255"/>
 		<image
 			texture="global/icon/info.png"
-			size="0 3 100% 100%+3"
+			size="0 0 100% 100%"
 		/>
 	</sprite>
 
@@ -167,7 +167,7 @@
 		<effect add_color="237 227 167"/>
 		<image
 			texture="global/icon/reset.png"
-			size="0 3 100% 100%+3"
+			size="0 0 100% 100%"
 		/>
 	</sprite>
 
@@ -175,7 +175,7 @@
 		<effect add_color="255 255 255"/>
 		<image
 			texture="global/icon/reset.png"
-			size="0 3 100% 100%+3"
+			size="0 0 100% 100%"
 		/>
 	</sprite>
 
@@ -183,7 +183,7 @@
 		<effect add_color="237 227 167"/>
 		<image
 			texture="global/icon/bubble.png"
-			size="0 3 100% 100%+3"
+			size="0 0 100% 100%"
 		/>
 	</sprite>
 
@@ -191,7 +191,7 @@
 		<effect add_color="255 255 255"/>
 		<image
 			texture="global/icon/bubble.png"
-			size="0 3 100% 100%+3"
+			size="0 0 100% 100%"
 		/>
 	</sprite>
 
diff --git a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/PlayersPanel.xml b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/PlayersPanel.xml
index 806bd3fc01..cf509c43b6 100644
--- a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/PlayersPanel.xml
+++ b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/PlayersPanel.xml
@@ -18,14 +18,14 @@
 			<translatableAttribute id="caption">Civilization</translatableAttribute>
 		</object>
 
-		<object name="civInfoButton" type="button" style="IconButton" sprite="iconInfoGold" sprite_over="iconInfoWhite" size="85%-37 0 85%-21 16"/>
-		<object name="civResetButton" type="button" style="IconButton" sprite="iconResetGold" sprite_over="iconResetWhite" size="85%-16 0 85% 16"/>
+		<object name="civInfoButton" type="button" style="IconButton" sprite="iconInfoGold" sprite_over="iconInfoWhite" size="85%-37 4 85%-21 20"/>
+		<object name="civResetButton" type="button" style="IconButton" sprite="iconResetGold" sprite_over="iconResetWhite" size="85%-16 4 85% 20"/>
 
 		<object name="playerTeamHeading" type="text" style="ModernLabelText" size="85%+5 0 100%-21 100%">
 			<translatableAttribute id="caption">Team</translatableAttribute>
 		</object>
 
-		<object name="teamResetButton" type="button" style="IconButton" sprite="iconResetGold" sprite_over="iconResetWhite" size="100%-21 0 100%-5 16" />
+		<object name="teamResetButton" type="button" style="IconButton" sprite="iconResetGold" sprite_over="iconResetWhite" size="100%-21 4 100%-5 20" />
 	</object>
 
 	<object size="1 36 100%-1 100%">
diff --git a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/LobbyButton.xml b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/LobbyButton.xml
index c6026aa171..4e32620a60 100644
--- a/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/LobbyButton.xml
+++ b/binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/LobbyButton.xml
@@ -8,4 +8,5 @@
 	z="100"
 	sprite="iconBubbleGold"
 	sprite_over="iconBubbleWhite"
+	size="0 9 100% 100%+9"
 />
diff --git a/binaries/data/mods/public/gui/pregame/ProjectInformation.xml b/binaries/data/mods/public/gui/pregame/ProjectInformation.xml
index 3f59714829..135723c680 100644
--- a/binaries/data/mods/public/gui/pregame/ProjectInformation.xml
+++ b/binaries/data/mods/public/gui/pregame/ProjectInformation.xml
@@ -4,7 +4,7 @@
 
 	<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"/>
+		<object name="productDescription" font="sans-14" type="text" textcolor="white" size="8 4 100%-8 100%-36" ghost="true" buffer_zone="5"/>
 
 		<object name="communityButtons">
 			<repeat count="10">
diff --git a/binaries/data/mods/public/gui/pregame/styles.xml b/binaries/data/mods/public/gui/pregame/styles.xml
index 11f9a0b037..b627f023a7 100644
--- a/binaries/data/mods/public/gui/pregame/styles.xml
+++ b/binaries/data/mods/public/gui/pregame/styles.xml
@@ -19,6 +19,7 @@
 		textcolor="white"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
+		buffer_zone="0"
 	/>
 
 </styles>
diff --git a/binaries/data/mods/public/gui/pregame/userreport/userreport.xml b/binaries/data/mods/public/gui/pregame/userreport/userreport.xml
index 938b2b6312..a18375b41c 100644
--- a/binaries/data/mods/public/gui/pregame/userreport/userreport.xml
+++ b/binaries/data/mods/public/gui/pregame/userreport/userreport.xml
@@ -5,7 +5,7 @@
 	<action on="Load">initUserReport();</action>
 	<action on="Tick">updateUserReportStatus();</action>
 
-	<object type="text" name="userReportText" style="userReportText" size="2 2 100%-2 100%-44"/>
+	<object type="text" name="userReportText" style="userReportText" size="7 3 100%-5 100%-44"/>
 
 	<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"/>
diff --git a/binaries/data/mods/public/gui/reference/civinfo/setup.xml b/binaries/data/mods/public/gui/reference/civinfo/setup.xml
index 13ca9d2ca5..c8991dc811 100644
--- a/binaries/data/mods/public/gui/reference/civinfo/setup.xml
+++ b/binaries/data/mods/public/gui/reference/civinfo/setup.xml
@@ -3,7 +3,7 @@
 <setup>
 	<tooltip name="civInfoTooltip"
 		anchor="top"
-		buffer_zone="10"
+		buffer_zone="6"
 		delay="50"
 		font="sans-12"
 		textcolor="white"
diff --git a/binaries/data/mods/public/gui/reference/tips/sections/TipDisplay.js b/binaries/data/mods/public/gui/reference/tips/sections/TipDisplay.js
index 1bd0082419..55c243d96a 100644
--- a/binaries/data/mods/public/gui/reference/tips/sections/TipDisplay.js
+++ b/binaries/data/mods/public/gui/reference/tips/sections/TipDisplay.js
@@ -131,7 +131,7 @@ class TipDisplay
 		this.tipTitle.caption = tipText.shift();
 		this.scaleGuiElementsToFit();
 		this.tipText.caption = tipText.map(text =>
-			text && "[icon=\"BulletPoint\"] " + text).join("\n\n");
+			text && "[icon=\"BulletPoint\" displace=\"0 -3\"] " + text).join("\n\n");
 	}
 
 	updateTipImage()
diff --git a/binaries/data/mods/public/gui/session/top_panel/Counters.xml b/binaries/data/mods/public/gui/session/top_panel/Counters.xml
index e1062741c3..40902e2c0a 100644
--- a/binaries/data/mods/public/gui/session/top_panel/Counters.xml
+++ b/binaries/data/mods/public/gui/session/top_panel/Counters.xml
@@ -6,7 +6,7 @@
 		<object name="resource[n]" size="0 0 73 100%" type="button" style="resourceCounter" tooltip_style="sessionToolTip">
 			<object size="2 0 38 36" type="image" name="resource[n]_icon" ghost="true"/>
 			<object size="33 4 180 22" type="text" style="resourceText"  name="resource[n]_count"/>
-			<object size="33 1 200 34" type="text" style="gathererCounts" name="resource[n]_stats"/>
+			<object size="33 20 200 38" type="text" style="gathererCounts" name="resource[n]_stats"/>
 		</object>
 	</repeat>
 </object>
diff --git a/binaries/data/mods/public/gui/session/trade/BarterPanel.xml b/binaries/data/mods/public/gui/session/trade/BarterPanel.xml
index c02961efbb..9bace051e4 100644
--- a/binaries/data/mods/public/gui/session/trade/BarterPanel.xml
+++ b/binaries/data/mods/public/gui/session/trade/BarterPanel.xml
@@ -30,7 +30,7 @@
 		</object>
 
 		<object name="barterHelp" type="button" size="100%-24 50%-12 100% 50%+12" style="StoneButton" tooltip_style="sessionToolTipBold" enabled="false">
-			<object type="image" size="20% 15% 80% 75%" sprite="iconInfoWhite" ghost="true"/>
+			<object type="image" size="20% 20% 80% 80%" sprite="iconInfoWhite" ghost="true"/>
 		</object>
 
 	</object>
diff --git a/binaries/data/mods/public/gui/session/trade/TradePanel.xml b/binaries/data/mods/public/gui/session/trade/TradePanel.xml
index 39b81915dd..8fb0633956 100644
--- a/binaries/data/mods/public/gui/session/trade/TradePanel.xml
+++ b/binaries/data/mods/public/gui/session/trade/TradePanel.xml
@@ -35,7 +35,7 @@
 		</object>
 
 		<object name="tradeHelp" type="button" size="100%-24 4 100% 28" style="StoneButton" tooltip_style="sessionToolTipBold" enabled="false">
-			<object type="image" size="20% 15% 80% 75%" sprite="iconInfoWhite" ghost="true"/>
+			<object type="image" size="20% 20% 80% 80%" sprite="iconInfoWhite" ghost="true"/>
 		</object>
 
 	</object>
diff --git a/binaries/data/mods/public/gui/summary/summary.xml b/binaries/data/mods/public/gui/summary/summary.xml
index 84ac23ec40..05df836e83 100644
--- a/binaries/data/mods/public/gui/summary/summary.xml
+++ b/binaries/data/mods/public/gui/summary/summary.xml
@@ -166,7 +166,7 @@
 			type="button"
 			sprite="iconBubbleGold"
 			sprite_over="iconBubbleWhite"
-			size="100%-436 100%-45 100%-420 100%-29"
+			size="100%-436 100%-42 100%-420 100%-26"
 			z="50"
 			hotkey="lobby"
 		>