diff --git a/Source/Ribbon/Themes/XTPRibbonThemeOffice2013.cpp b/Source/Ribbon/Themes/XTPRibbonThemeOffice2013.cpp
index 9b4fcf6..775a414 100644
--- a/Source/Ribbon/Themes/XTPRibbonThemeOffice2013.cpp
+++ b/Source/Ribbon/Themes/XTPRibbonThemeOffice2013.cpp
@@ -225,6 +225,16 @@ CXTPRibbonOffice2013Theme::CThemeStaticExtension::CThemeStaticExtension()
 															   _T("SystemPopupBarEntryBackBrush"),
 															   RGB(255, 255, 255))));

+	// dbrookes, Add some better group popup border to ribbon XAML static extension.
+	pColors->Extend(new CXTPMarkupStaticExtensionBrushProperty(L"GroupPopupBorderBack",
+																														 XTPIniColor(_T("CommandBars"),
+																																				 _T("ComboBoxBack"),
+															                                           RGB(255, 255, 255))));
+	pColors->Extend(new CXTPMarkupStaticExtensionBrushProperty(L"GroupPopupBorderBorder",
+																														 XTPIniColor(_T("CommandBars"),
+																																				 _T("ComboBoxBorder"),
+																																				 RGB(255, 255, 255))));
+
 	Extend(pColors);
 }

diff --git a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupNormal.xaml b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupNormal.xaml
index 4912455..3ab9f3f 100644
--- a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupNormal.xaml
+++ b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupNormal.xaml
@@ -1,3 +1,5 @@
 <Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
 	<Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupNormalBrush}' />
+
+	<Border Width='32' Height='32' VerticalAlignment='Top' Margin='0,2,0,0' BorderThickness='1' Background='{x:Static Theme.Colors.GroupPopupBorderBack}' BorderBrush='{x:Static Theme.Colors.GroupPopupBorderBorder}' />
 </Grid>
diff --git a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupPopuped.xaml b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupPopuped.xaml
index ba4fc96..7c07038 100644
--- a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupPopuped.xaml
+++ b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupPopuped.xaml
@@ -1,3 +1,7 @@
 <Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-	<Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupPopupedBorderBrush}' Background='{x:Static Theme.Colors.GroupPopupPopupedBackBrush}' />
+	<Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupNormalBrush}' />
+
+	<Border Margin='0,0,3,0' Background='{x:Static Theme.Colors.GroupPopupPopupedBackBrush}' />
+
+	<Border Width='32' Height='32' VerticalAlignment='Top' Margin='0,2,0,0' BorderThickness='1' Background='{x:Static Theme.Colors.GroupPopupBorderBack}' BorderBrush='{x:Static Theme.Colors.GroupPopupBorderBorder}' />
 </Grid>
diff --git a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupSelected.xaml b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupSelected.xaml
index bee2559..212030d 100644
--- a/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupSelected.xaml
+++ b/Source/Styles/Office2016/XamlStyle/RibbonGroupPopupSelected.xaml
@@ -1,3 +1,7 @@
 <Grid xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
-	<Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupSelectedBorderBrush}' Background='{x:Static Theme.Colors.GroupPopupSelectedBackBrush}' />
+	<Border Margin='0,4,0,4' BorderThickness='0,0,1,0' BorderBrush='{x:Static Theme.Colors.GroupPopupNormalBrush}' />
+
+	<Border Margin='0,0,3,0' Background='{x:Static Theme.Colors.GroupPopupSelectedBackBrush}' />
+
+	<Border Width='32' Height='32' VerticalAlignment='Top' Margin='0,2,0,0' BorderThickness='1' Background='{x:Static Theme.Colors.GroupPopupBorderBack}' BorderBrush='{x:Static Theme.Colors.GroupPopupBorderBorder}' />
 </Grid>