diff --git a/YAS/Classes/GUIStyleBase.uc b/YAS/Classes/GUIStyleBase.uc
index fc1e18b..12847bc 100644
--- a/YAS/Classes/GUIStyleBase.uc
+++ b/YAS/Classes/GUIStyleBase.uc
@@ -209,6 +209,15 @@ final function GetFillScreenSize(out float SizeX, out float SizeY)
 	SizeY = Base * 9;
 }
 
+final function float PickEdgeSize(float DefaultSize = 8.0f)
+{
+	local float FillSizeX, FillSizeY;
+	
+	GetFillScreenSize(FillSizeX, FillSizeY);
+	
+	return (FillSizeY / 1080.f) * DefaultSize;
+}
+
 final function DrawText(coerce string S)
 {
 	local float Scale;
@@ -519,7 +528,7 @@ final function DrawCornerTexNU(int SizeX, int SizeY, byte Dir ) // Draw non-unif
 	}
 }
 
-final function DrawCornerTex(int Size, byte Dir)
+final function DrawCornerTex(float Size, byte Dir)
 {
 	switch (Dir)
 	{
@@ -542,7 +551,7 @@ final function DrawWhiteBox(float XS, float YS, optional bool bClip)
 	Canvas.DrawTile(ItemTex, XS, YS, 19, 45, 1,1, ,bClip);
 }
 
-final function DrawCornerSmart(float X, float Y, int Edge, int CornerPosition, int CornerShape)
+final function DrawCornerSmart(float X, float Y, float Edge, int CornerPosition, int CornerShape)
 {
 	switch (CornerPosition)
 	{
@@ -621,7 +630,7 @@ final function DrawCornerSmart(float X, float Y, int Edge, int CornerPosition, i
 	}
 }
 
-final function DrawRectBoxSmart(float X, float Y, float W, float H, int Edge, int TopLeftShape, int TopRightShape, int BottomLeftShape, int BottomRightShape)
+final function DrawRectBoxSmart(float X, float Y, float W, float H, float Edge, int TopLeftShape, int TopRightShape, int BottomLeftShape, int BottomRightShape)
 {
 	local float BoxX, BoxW;
 	
@@ -666,7 +675,7 @@ final function DrawRectBoxSmart(float X, float Y, float W, float H, int Edge, in
 	DrawCornerSmart(X + W, Y + H, Edge, ECP_BottomRight, BottomRightShape);
 }
 
-final function DrawRectBox(float X, float Y, float Width, float Height, int Edge, optional byte Extrav)
+final function DrawRectBox(float X, float Y, float Width, float Height, float Edge, optional byte Extrav)
 {
 	if (Extrav == 2)
 		Edge=Min(FMin(Edge, (Width)*0.5), Height);// Verify size.
diff --git a/YAS/Classes/YAS_ScoreBoard.uc b/YAS/Classes/YAS_ScoreBoard.uc
index f0b4c2c..c7257fe 100644
--- a/YAS/Classes/YAS_ScoreBoard.uc
+++ b/YAS/Classes/YAS_ScoreBoard.uc
@@ -240,7 +240,7 @@ function DrawMenu()
 	local PlayerReplicationInfo PRI;
 	local float XPos, YPos, YL, XL, FontScalar, XPosCenter, BoxW, BoxX, BoxH, MinBoxW, DoshSize, ScrollBarWidth;
 	local int i, j, NumSpec, NumAlivePlayer, Width;
-	local float BorderSize, PlayerListSizeY;
+	local float BorderSize, EdgeSize, PlayerListSizeY;
 	local Color ColorTMP;
 	local Array<String> MessageOfTheDayLines;
 	
@@ -317,6 +317,7 @@ function DrawMenu()
 	Canvas.Font = Owner.CurrentStyle.PickFont(FontScalar);
 	Canvas.TextSize("ABC", XL, YL, FontScalar, FontScalar);
 	BorderSize = Owner.HUDOwner.ScaledBorderSize;
+	EdgeSize = Owner.CurrentStyle.PickEdgeSize();
 	
 	// Server Info
 	XPosCenter = Canvas.ClipX * 0.5;
@@ -330,7 +331,7 @@ function DrawMenu()
 	
 	// Top Rect (Server name)
 	Canvas.SetDrawColorStruct(Settings.Style.ServerNameBoxColor);
-	Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, Settings.Style.EdgeSize, Settings.Style.ShapeServerNameBox);
+	Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, EdgeSize, Settings.Style.ShapeServerNameBox);
 	
 	Canvas.SetDrawColorStruct(Settings.Style.ServerNameTextColor);
 	S = (DynamicServerName == "" ? KFGRI.ServerName : DynamicServerName);
@@ -356,20 +357,20 @@ function DrawMenu()
 	BoxW = Width * 0.7;
 	BoxH = YL * 2 + BorderSize * 2;
 	Canvas.SetDrawColorStruct(Settings.Style.GameInfoBoxColor);
-	Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, Settings.Style.EdgeSize, Settings.Style.ShapeGameInfoBox);
+	Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, EdgeSize, Settings.Style.ShapeGameInfoBox);
 	
 	Canvas.SetDrawColorStruct(Settings.Style.GameInfoTextColor);
 	S = class'KFCommon_LocalizedStrings'.static.GetFriendlyMapName(PC.WorldInfo.GetMapName(true));
-	DrawTextShadowHLeftVCenter(S, BoxX + Settings.Style.EdgeSize, YPos, BoxH/2, FontScalar);
+	DrawTextShadowHLeftVCenter(S, BoxX + EdgeSize, YPos, BoxH/2, FontScalar);
 	
 	S = KFGRI.GameClass.default.GameName $ " - " $ class'KFCommon_LocalizedStrings'.Static.GetDifficultyString(KFGRI.GameDifficulty);
-	DrawTextShadowHLeftVCenter(S, BoxX + Settings.Style.EdgeSize, YPos + BoxH/2, BoxH/2, FontScalar);
+	DrawTextShadowHLeftVCenter(S, BoxX + EdgeSize, YPos + BoxH/2, BoxH/2, FontScalar);
 	
 	// Mid Right Rect (Wave)
 	BoxX = BoxX + BoxW;
 	BoxW = Width - BoxW;
 	Canvas.SetDrawColorStruct(Settings.Style.WaveBoxColor);
-	Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, Settings.Style.EdgeSize, Settings.Style.ShapeWaveInfoBox);
+	Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, EdgeSize, Settings.Style.ShapeWaveInfoBox);
 	
 	Canvas.SetDrawColorStruct(Settings.Style.WaveTextColor);
 	S = class'KFGFxHUD_ScoreboardMapInfoContainer'.default.WaveString; 
@@ -383,11 +384,11 @@ function DrawMenu()
 	BoxW = Width;
 	BoxH = YL + BorderSize;
 	Canvas.SetDrawColorStruct(Settings.Style.PlayerCountBoxColor);
-	Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, Settings.Style.EdgeSize, Settings.Style.ShapePlayersCountBox);
+	Owner.CurrentStyle.DrawRectBox(BoxX, YPos, BoxW, BoxH, EdgeSize, Settings.Style.ShapePlayersCountBox);
 	
 	/*
 	Owner.CurrentStyle.DrawTexture(IconPlayer,
-		BoxX + Settings.Style.EdgeSize + IconIndent,
+		BoxX + EdgeSize + IconIndent,
 		YPos + IconIndent,
 		BoxH - IconIndent*2,
 		BoxH - IconIndent*2,
@@ -397,7 +398,7 @@ function DrawMenu()
 	Canvas.SetDrawColorStruct(Settings.Style.PlayerCountTextColor);
 	S = Players $ ":" @ NumPlayer @ "/" @ KFGRI.MaxHumanCount $ "    " $ Spectators $ ": " $ NumSpec; ; 
 	Canvas.TextSize(S, XL, YL, FontScalar, FontScalar);
-	DrawTextShadowHLeftVCenter(S, BoxX + Settings.Style.EdgeSize, YPos, BoxH, FontScalar);
+	DrawTextShadowHLeftVCenter(S, BoxX + EdgeSize, YPos, BoxH, FontScalar);
 	
 	S = Owner.CurrentStyle.GetTimeString(KFGRI.ElapsedTime);
 	DrawTextShadowHVCenter(S, XPos + Width * 0.7, YPos, Width * 0.3, BoxH, FontScalar); // TODO: ?
@@ -415,7 +416,7 @@ function DrawMenu()
 		YPos,
 		Width + BorderSize * 4,
 		BoxH,
-		Settings.Style.EdgeSize,
+		EdgeSize,
 		Settings.Style.ShapeHeaderBox);
 
 	// Calc X offsets
@@ -431,7 +432,7 @@ function DrawMenu()
 		HealthWBox = PlayersList.GetItemHeight();
 	}
 	
-	PlayerXPos = HealthXPos + HealthWBox + PlayersList.GetItemHeight() + Settings.Style.EdgeSize;
+	PlayerXPos = HealthXPos + HealthWBox + PlayersList.GetItemHeight() + EdgeSize;
 	
 	Canvas.TextSize(class'KFGFxHUD_ScoreboardWidget'.default.PingString$" ", XL, YL, FontScalar, FontScalar);
 	PingWBox = XL < MinBoxW ? MinBoxW : XL;
@@ -501,7 +502,7 @@ function DrawMenu()
 			YPos + YL + BorderSize * 4,
 			ScrollBarWidth,
 			PlayerListSizeY,
-			Settings.Style.EdgeSize,
+			EdgeSize,
 			0);
 	}
 	
@@ -517,7 +518,7 @@ function DrawMenu()
 		YPos,
 		Width + BorderSize * 4,
 		BoxH * (MessageOfTheDayLines.Length > 0 ? MessageOfTheDayLines.Length : 1),
-		Settings.Style.EdgeSize,
+		EdgeSize,
 		152);
 	
 	if (MessageOfTheDay != "")
@@ -562,13 +563,14 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float
 	local int Ping;
 	local Rank Rank;
 	
-	local float BorderSize;
+	local float BorderSize, EdgeSize;
 	
 	local int Shape, ShapeHealth;
 	
 	local Color HealthBoxColor;
 	
 	BorderSize = Owner.HUDOwner.ScaledBorderSize;
+	EdgeSize = Owner.CurrentStyle.PickEdgeSize();
 	
 	YOffset *= PlayerEntryHeightMod;
 	
@@ -609,7 +611,7 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float
 		YOffset,
 		HealthWBox,
 		Height,
-		Settings.Style.EdgeSize,
+		EdgeSize,
 		ShapeHealth);
 	
 	C.SetDrawColorStruct(Settings.Style.StateTextColorHealthHigh);
@@ -630,7 +632,7 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float
 	Shape = Settings.Style.ShapePlayerBoxMidPlayer;
 
 	BoxWidth = DoshXPos - HealthWBox - BorderSize * 2;
-	Owner.CurrentStyle.DrawRectBox(XPos, YOffset, BoxWidth, Height, Settings.Style.EdgeSize, Shape);
+	Owner.CurrentStyle.DrawRectBox(XPos, YOffset, BoxWidth, Height, EdgeSize, Shape);
 	
 	XPos += BoxWidth;
 	
@@ -644,7 +646,7 @@ function DrawPlayerEntry(Canvas C, int Index, float YOffset, float Height, float
 		YOffset,
 		BoxWidth,
 		Height,
-		Settings.Style.EdgeSize,
+		EdgeSize,
 		Shape);
 
 	// Perk
diff --git a/YAS/Classes/YAS_Types.uc b/YAS/Classes/YAS_Types.uc
index f7addb7..f6295c9 100644
--- a/YAS/Classes/YAS_Types.uc
+++ b/YAS/Classes/YAS_Types.uc
@@ -45,7 +45,7 @@ struct YAS_SettingsLevel
 struct YAS_Style
 {
 	// Box shapes
-	var int       EdgeSize;
+	var float     EdgeSize;
 	var int       ShapeServerNameBox;
 	var int       ShapeGameInfoBox;
 	var int       ShapeWaveInfoBox;
@@ -169,7 +169,7 @@ struct YAS_Style
 	
 	Structdefaultproperties
 	{
-		EdgeSize                        = 8
+		EdgeSize                        = 8.0f
 		
 		// Box shapes
 		ShapeServerNameBox              = 150