Index: binaries/data/mods/mod/gui/common/modern/sprites.xml
===================================================================
--- binaries/data/mods/mod/gui/common/modern/sprites.xml
+++ binaries/data/mods/mod/gui/common/modern/sprites.xml
@@ -147,6 +147,11 @@
 	- Box -
 	==========================================
 	-->
+	<sprite name = "ModernDarkBox">
+		<image backcolor = "12 12 12 100"
+			size = "0 0 100% 100%-1"
+		/>
+	</sprite>
 	<sprite name="ModernDarkBoxGold">
 		<!-- borders -->
 		<image texture = "global/modern/gold-separator.png"
@@ -162,6 +167,17 @@
 			size = "0 1 100% 100%-1"
 		/>
 	</sprite>
+	<sprite name="ModernDarkBoxGoldBorder">
+		<!-- borders -->
+		<image texture = "global/modern/gold-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 0 100% 1"
+		/>
+		<image texture = "global/modern/gold-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 100%-1 100% 100%"
+		/>
+	</sprite>
 	<sprite name="ModernDarkBoxGoldDisabled">
 		<effect grayscale=""/>
 		<!-- borders -->
@@ -193,6 +209,17 @@
 			size = "0 1 100% 100%-1"
 		/>
 	</sprite>
+	<sprite name="ModernDarkBoxWhiteBorder">
+		<!-- borders -->
+		<image texture = "global/modern/white-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 0 100% 1"
+		/>
+		<image texture = "global/modern/white-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 100%-1 100% 100%"
+		/>
+	</sprite>
 	<sprite name="ModernDarkBoxWhiteInvalid">
 		<!-- borders -->
 		<image texture = "global/modern/white-separator.png"
@@ -217,14 +244,11 @@
 			size = "0 1 100% 100%"
 		/>
 	</sprite>
-	<sprite name = "ModernDarkBoxGoldNoTop">
+	<sprite name="ModernDarkBoxBottomGold">
 		<image texture = "global/modern/gold-separator.png"
 			real_texture_placement = "0 0 806 1"
 			size = "0 100%-1 100% 100%"
 		/>
-		<image backcolor = "12 12 12 100"
-			size = "0 0 100% 100%-1"
-		/>
 	</sprite>
 	<!--
 	==========================================
@@ -517,6 +541,18 @@
 			bordercolor="black"
 		/>
 	</sprite>
+	<sprite name="GrayBackground">
+		<image backcolor="darkgray"
+			size="0 0 100% 100%"
+		/>
+	</sprite>
+	<sprite name="BlackBorder">
+		<image backcolor="0 0 0 0"
+			size="0 0 100% 100%"
+			border="true"
+			bordercolor="black"
+		/>
+	</sprite>
 	<!--
 	==========================================
 	- Misc. -
Index: binaries/data/mods/mod/gui/common/modern/styles.xml
===================================================================
--- binaries/data/mods/mod/gui/common/modern/styles.xml
+++ binaries/data/mods/mod/gui/common/modern/styles.xml
@@ -28,8 +28,10 @@
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
-		sprite="ModernDarkBoxGoldNoTop"
-		sprite_selectarea="ModernDarkBoxWhite"
+		sprite="ModernDarkBox"
+		sprite_overlay="ModernDarkBoxBottomGold"
+		sprite_selectarea="ModernDarkBox"
+		sprite_selectarea_overlay="ModernDarkBoxWhiteBorder"
 		textcolor="white"
 		textcolor_selected="white"
 		text_align="left"
@@ -40,8 +42,10 @@
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
-		sprite="ModernDarkBoxGoldNoTop"
-		sprite_selectarea="ModernDarkBoxWhite"
+		sprite="ModernDarkBox"
+		sprite_overlay="ModernDarkBoxBottomGold"
+		sprite_selectarea="ModernDarkBox"
+		sprite_selectarea_overlay="ModernDarkBoxWhiteBorder"
 		sprite_heading="ModernDarkBoxGoldNoBottom"
 		sprite_asc="ModernArrowUp"
 		sprite_desc="ModernArrowDown"
@@ -66,8 +70,10 @@
 		buffer_zone="8"
 		dropdown_size="225"
 		minimum_visible_items="3"
-		sprite_list="BlackBorderOnGray"
-		sprite_selectarea="ModernDarkBoxWhite"
+		sprite_list="GrayBackground"
+		sprite_list_overlay="BlackBorder"
+		sprite_selectarea="ModernDarkBox"
+		sprite_selectarea_overlay="ModernDarkBoxWhiteBorder"
 		textcolor_selected="white"
 		textcolor_disabled="140 140 140 255"
 		scrollbar="true"
Index: binaries/data/mods/mod/gui/gui.rng
===================================================================
--- binaries/data/mods/mod/gui/gui.rng
+++ binaries/data/mods/mod/gui/gui.rng
@@ -378,6 +378,9 @@
         <attribute name="sprite_list"/>
       </optional>
       <optional>
+        <attribute name="sprite_list_overlay"/>
+      </optional>
+      <optional>
         <attribute name="sprite2_disabled"/>
       </optional>
       <optional>
@@ -387,6 +390,9 @@
         <attribute name="sprite_over"/>
       </optional>
       <optional>
+        <attribute name="sprite_overlay"/>
+      </optional>
+      <optional>
         <attribute name="sprite2_over"/>
       </optional>
       <optional>
@@ -399,6 +405,9 @@
         <attribute name="sprite_selectarea"/>
       </optional>
       <optional>
+        <attribute name="sprite_selectarea_overlay"/>
+      </optional>
+      <optional>
         <attribute name="square_side">
           <data type="decimal"/>
         </attribute>
Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
+++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Chat/ChatPanel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object name="chatPanel" type="image" sprite="ModernDarkBoxGold">
+<object name="chatPanel" type="image" sprite="ModernDarkBox">
 
 	<object name="chatText" type="list" size="2 2 100%-2 100%-28" style="ChatPanelList"/>
 
@@ -9,4 +9,6 @@
 		<translatableAttribute id="caption">Send</translatableAttribute>
 	</object>
 
+	<!-- Draw the border last so that it will be above all text -->
+	<object type="image" sprite="ModernDarkBoxGoldBorder" ghost="true">
 </object>
Index: binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatPanel.xml
===================================================================
--- binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatPanel.xml
+++ binaries/data/mods/public/gui/lobby/LobbyPage/Chat/ChatPanel.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<object name="chatPanel" type="image" sprite="ModernDarkBoxGold">
+<object name="chatPanel" type="image" sprite="ModernDarkBox">
 
 	<script directory="gui/lobby/LobbyPage/Chat/"/>
 	<script directory="gui/lobby/LobbyPage/Chat/ChatMessages/"/>
@@ -11,4 +11,7 @@
 	<object name="chatSubmit" size="100%-72 100%-26 100%-4 100%-4" type="button" style="StoneButton">
 		<translatableAttribute id="caption">Send</translatableAttribute>
 	</object>
+
+	<!-- Draw the border last so that it will be above all text -->
+	<object type="image" sprite="ModernDarkBoxGoldBorder" ghost="true"/>
 </object>
Index: source/gui/ObjectTypes/CDropDown.h
===================================================================
--- source/gui/ObjectTypes/CDropDown.h
+++ source/gui/ObjectTypes/CDropDown.h
@@ -133,6 +133,7 @@
 	CGUISimpleSetting<CStrW> m_SoundOpened;
 	CGUISimpleSetting<CGUISpriteInstance> m_SpriteDisabled;
 	CGUISimpleSetting<CGUISpriteInstance> m_SpriteList;
+	CGUISimpleSetting<CGUISpriteInstance> m_SpriteListOverlay;
 	CGUISimpleSetting<CGUISpriteInstance> m_Sprite2;
 	CGUISimpleSetting<CGUISpriteInstance> m_Sprite2Over;
 	CGUISimpleSetting<CGUISpriteInstance> m_Sprite2Pressed;
Index: source/gui/ObjectTypes/CDropDown.cpp
===================================================================
--- source/gui/ObjectTypes/CDropDown.cpp
+++ source/gui/ObjectTypes/CDropDown.cpp
@@ -43,6 +43,7 @@
 	  // Setting "sprite" is registered by CList and used as the background
 	  m_SpriteDisabled(this, "sprite_disabled"),
 	  m_SpriteList(this, "sprite_list"), // Background of the drop down list
+	  m_SpriteListOverlay(this, "sprite_list_overlay"), // Overlay above the drop down list
 	  m_Sprite2(this, "sprite2"), // Button that sits to the right
 	  m_Sprite2Over(this, "sprite2_over"),
 	  m_Sprite2Pressed(this, "sprite2_pressed"),
@@ -465,7 +466,7 @@
 		if (m_HideScrollBar)
 			m_ScrollBar.Set(false, false);
 
-		DrawList(m_ElementHighlight, m_SpriteList, m_SpriteSelectArea, m_TextColor);
+		DrawList(m_ElementHighlight, m_SpriteList, m_SpriteListOverlay, m_SpriteSelectArea, m_SpriteSelectAreaOverlay, m_TextColor);
 
 		if (m_HideScrollBar)
 			m_ScrollBar.Set(old, false);
Index: source/gui/ObjectTypes/CList.h
===================================================================
--- source/gui/ObjectTypes/CList.h
+++ source/gui/ObjectTypes/CList.h
@@ -106,7 +106,8 @@
 
 	// Extended drawing interface, this is so that classes built on the this one
 	//  can use other sprite names.
-	virtual void DrawList(const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& sprite_selected, const CGUIColor& textcolor);
+	virtual void DrawList(const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& spriteOverlay,
+	                      const CGUISpriteInstance& spriteSelectArea, const CGUISpriteInstance& spriteSelectAreaOverlay, const CGUIColor& textColor);
 
 	// Get the area of the list. This is so that it can easily be changed, like in CDropDown
 	//  where the area is not equal to m_CachedActualSize.
@@ -134,7 +135,9 @@
 	CGUISimpleSetting<CStrW> m_SoundDisabled;
 	CGUISimpleSetting<CStrW> m_SoundSelected;
 	CGUISimpleSetting<CGUISpriteInstance> m_Sprite;
+	CGUISimpleSetting<CGUISpriteInstance> m_SpriteOverlay;
 	CGUISimpleSetting<CGUISpriteInstance> m_SpriteSelectArea;
+	CGUISimpleSetting<CGUISpriteInstance> m_SpriteSelectAreaOverlay;
 	CGUISimpleSetting<CGUIColor> m_TextColor;
 	CGUISimpleSetting<CGUIColor> m_TextColorSelected;
 	CGUISimpleSetting<i32> m_Selected;
Index: source/gui/ObjectTypes/CList.cpp
===================================================================
--- source/gui/ObjectTypes/CList.cpp
+++ source/gui/ObjectTypes/CList.cpp
@@ -46,8 +46,10 @@
 	  m_SoundDisabled(this, "sound_disabled"),
 	  m_SoundSelected(this, "sound_selected"),
 	  m_Sprite(this, "sprite"),
+	  m_SpriteOverlay(this, "sprite_overlay"),
 	  // Add sprite_disabled! TODO
 	  m_SpriteSelectArea(this, "sprite_selectarea"),
+	  m_SpriteSelectAreaOverlay(this, "sprite_selectarea_overlay"),
 	  m_TextColor(this, "textcolor"),
 	  m_TextColorSelected(this, "textcolor_selected"),
 	  m_Selected(this, "selected", -1), // Index selected. -1 is none.
@@ -299,10 +301,11 @@
 
 void CList::Draw()
 {
-	DrawList(m_Selected, m_Sprite, m_SpriteSelectArea, m_TextColor);
+	DrawList(m_Selected, m_Sprite, m_SpriteOverlay, m_SpriteSelectArea, m_SpriteSelectAreaOverlay, m_TextColor);
 }
 
-void CList::DrawList(const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& sprite_selectarea, const CGUIColor& textcolor)
+void CList::DrawList(const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& spriteOverlay,
+                     const CGUISpriteInstance& spriteSelectArea, const CGUISpriteInstance& spriteSelectAreaOverlay, const CGUIColor& textColor)
 {
 	CRect rect = GetListRect();
 
@@ -312,34 +315,36 @@
 	if (m_ScrollBar)
 		scroll = GetScrollBar(0).GetPos();
 
+	bool drawSelected = false;
+	CRect rectSel;
 	if (selected >= 0 && selected+1 < (int)m_ItemsYPositions.size())
 	{
 		// Get rectangle of selection:
-		CRect rect_sel(
+		rectSel = CRect(
 			rect.left, rect.top + m_ItemsYPositions[selected] - scroll,
 			rect.right, rect.top + m_ItemsYPositions[selected+1] - scroll);
 
-		if (rect_sel.top <= rect.bottom &&
-			rect_sel.bottom >= rect.top)
+		if (rectSel.top <= rect.bottom &&
+			rectSel.bottom >= rect.top)
 		{
-			if (rect_sel.bottom > rect.bottom)
-				rect_sel.bottom = rect.bottom;
-			if (rect_sel.top < rect.top)
-				rect_sel.top = rect.top;
-
+			if (rectSel.bottom > rect.bottom)
+				rectSel.bottom = rect.bottom;
+			if (rectSel.top < rect.top)
+				rectSel.top = rect.top;
 			if (m_ScrollBar)
 			{
 				// Remove any overlapping area of the scrollbar.
-				if (rect_sel.right > GetScrollBar(0).GetOuterRect().left &&
-					rect_sel.right <= GetScrollBar(0).GetOuterRect().right)
-					rect_sel.right = GetScrollBar(0).GetOuterRect().left;
-
-				if (rect_sel.left >= GetScrollBar(0).GetOuterRect().left &&
-					rect_sel.left < GetScrollBar(0).GetOuterRect().right)
-					rect_sel.left = GetScrollBar(0).GetOuterRect().right;
+				if (rectSel.right > GetScrollBar(0).GetOuterRect().left &&
+					rectSel.right <= GetScrollBar(0).GetOuterRect().right)
+					rectSel.right = GetScrollBar(0).GetOuterRect().left;
+
+				if (rectSel.left >= GetScrollBar(0).GetOuterRect().left &&
+					rectSel.left < GetScrollBar(0).GetOuterRect().right)
+					rectSel.left = GetScrollBar(0).GetOuterRect().right;
 			}
 
-			m_pGUI.DrawSprite(sprite_selectarea, rect_sel);
+			m_pGUI.DrawSprite(spriteSelectArea, rectSel);
+			drawSelected = true;
 		}
 	}
 
@@ -363,11 +368,17 @@
 				cliparea.left = GetScrollBar(0).GetOuterRect().right;
 		}
 
-		DrawText(i, textcolor, rect.TopLeft() - CVector2D(0.f, scroll - m_ItemsYPositions[i]), cliparea);
+		DrawText(i, textColor, rect.TopLeft() - CVector2D(0.f, scroll - m_ItemsYPositions[i]), cliparea);
 	}
 
+	// Draw scrollbar above all but below the overlays
 	if (m_ScrollBar)
 		IGUIScrollBarOwner::Draw();
+
+	// Draw the overlays last
+	m_pGUI.DrawSprite(spriteOverlay, rect);
+	if (drawSelected)
+		m_pGUI.DrawSprite(spriteSelectAreaOverlay, rectSel);
 }
 
 void CList::AddItem(const CGUIString& str, const CGUIString& data)
Index: source/gui/ObjectTypes/COList.h
===================================================================
--- source/gui/ObjectTypes/COList.h
+++ source/gui/ObjectTypes/COList.h
@@ -67,7 +67,8 @@
 	virtual bool HandleAdditionalChildren(const XMBData& xmb, const XMBElement& child);
 	virtual void AdditionalChildrenHandled();
 
-	void DrawList(const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& sprite_selected, const CGUIColor& textcolor);
+	void DrawList(const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& spriteOverlay,
+	              const CGUISpriteInstance& spriteSelectarea, const CGUISpriteInstance& spriteSelectAreaOverlay, const CGUIColor& textColor);
 
 	virtual CRect GetListRect() const;
 
Index: source/gui/ObjectTypes/COList.cpp
===================================================================
--- source/gui/ObjectTypes/COList.cpp
+++ source/gui/ObjectTypes/COList.cpp
@@ -280,11 +280,9 @@
 	SetupText();
 }
 
-void COList::DrawList(const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& sprite_selected, const CGUIColor& textcolor)
+void COList::DrawList(const int& selected, const CGUISpriteInstance& sprite, const CGUISpriteInstance& spriteOverlay,
+                      const CGUISpriteInstance& spriteSelectArea, const CGUISpriteInstance& spriteSelectAreaOverlay, const CGUIColor& textColor)
 {
-	if (m_ScrollBar)
-		IGUIScrollBarOwner::Draw();
-
 	CRect rect = GetListRect();
 
 	m_pGUI.DrawSprite(sprite, rect);
@@ -293,37 +291,41 @@
 	if (m_ScrollBar)
 		scroll = GetScrollBar(0).GetPos();
 
+	bool drawSelected = false;
+	CRect rectSel;
 	// Draw item selection
 	if (selected != -1)
 	{
 		ENSURE(selected >= 0 && selected+1 < (int)m_ItemsYPositions.size());
 
 		// Get rectangle of selection:
-		CRect rect_sel(rect.left, rect.top + m_ItemsYPositions[selected] - scroll,
-		               rect.right, rect.top + m_ItemsYPositions[selected+1] - scroll);
+		rectSel = CRect(
+			rect.left, rect.top + m_ItemsYPositions[selected] - scroll,
+			rect.right, rect.top + m_ItemsYPositions[selected+1] - scroll);
 
-		if (rect_sel.top <= rect.bottom &&
-			rect_sel.bottom >= rect.top)
+		if (rectSel.top <= rect.bottom &&
+			rectSel.bottom >= rect.top)
 		{
-			if (rect_sel.bottom > rect.bottom)
-				rect_sel.bottom = rect.bottom;
-			if (rect_sel.top < rect.top)
-				rect_sel.top = rect.top;
+			if (rectSel.bottom > rect.bottom)
+				rectSel.bottom = rect.bottom;
+			if (rectSel.top < rect.top)
+				rectSel.top = rect.top;
 
 			if (m_ScrollBar)
 			{
 				// Remove any overlapping area of the scrollbar.
-				if (rect_sel.right > GetScrollBar(0).GetOuterRect().left &&
-					rect_sel.right <= GetScrollBar(0).GetOuterRect().right)
-					rect_sel.right = GetScrollBar(0).GetOuterRect().left;
-
-				if (rect_sel.left >= GetScrollBar(0).GetOuterRect().left &&
-					rect_sel.left < GetScrollBar(0).GetOuterRect().right)
-					rect_sel.left = GetScrollBar(0).GetOuterRect().right;
+				if (rectSel.right > GetScrollBar(0).GetOuterRect().left &&
+					rectSel.right <= GetScrollBar(0).GetOuterRect().right)
+					rectSel.right = GetScrollBar(0).GetOuterRect().left;
+
+				if (rectSel.left >= GetScrollBar(0).GetOuterRect().left &&
+					rectSel.left < GetScrollBar(0).GetOuterRect().right)
+					rectSel.left = GetScrollBar(0).GetOuterRect().right;
 			}
 
 			// Draw item selection
-			m_pGUI.DrawSprite(sprite_selected, rect_sel);
+			m_pGUI.DrawSprite(spriteSelectArea, rectSel);
+			drawSelected = true;
 		}
 	}
 
@@ -371,7 +373,7 @@
 		}
 
 		// Draw column header text
-		DrawText(col, textcolor, leftTopCorner + COLUMN_SHIFT, rect_head);
+		DrawText(col, textColor, leftTopCorner + COLUMN_SHIFT, rect_head);
 		xpos += width;
 		++col;
 	}
@@ -426,4 +428,13 @@
 			xpos += width;
 		}
 	}
+
+	// Draw scrollbar above all but below the overlays
+	if (m_ScrollBar)
+		IGUIScrollBarOwner::Draw();
+
+	// Draw the overlays last
+	m_pGUI.DrawSprite(spriteOverlay, rect);
+	if (drawSelected)
+		m_pGUI.DrawSprite(spriteSelectAreaOverlay, rectSel);
 }