diff --git a/Terminal.Gui/Views/DatePicker.cs b/Terminal.Gui/Views/DatePicker.cs
index d0cb41330..dcb154bf5 100644
--- a/Terminal.Gui/Views/DatePicker.cs
+++ b/Terminal.Gui/Views/DatePicker.cs
@@ -219,7 +219,8 @@ public class DatePicker : View
             Text = GetBackButtonText (),
             WantContinuousButtonPressed = true,
             NoPadding = true,
-            NoDecorations = true
+            NoDecorations = true,
+            ShadowStyle = ShadowStyle.None
         };
 
         _previousMonthButton.Accept += (sender, e) =>
@@ -237,7 +238,8 @@ public class DatePicker : View
             Text = GetForwardButtonText (),
             WantContinuousButtonPressed = true,
             NoPadding = true,
-            NoDecorations = true
+            NoDecorations = true,
+            ShadowStyle = ShadowStyle.None
         };
 
         _nextMonthButton.Accept += (sender, e) =>
diff --git a/UICatalog/Scenarios/HotKeys.cs b/UICatalog/Scenarios/HotKeys.cs
index fb50813fc..f4a46f516 100644
--- a/UICatalog/Scenarios/HotKeys.cs
+++ b/UICatalog/Scenarios/HotKeys.cs
@@ -77,7 +77,7 @@ public class HotKeys : Scenario
         {
             Title = "B_utton with Frame (focusable)",
             CanFocus = true,
-            X = Pos.Right (buttonWithFrameLabel) + 1, Y = Pos.Top (buttonWithFrameLabel), Width = 40, Height = 3,
+            X = Pos.Right (buttonWithFrameLabel) + 1, Y = Pos.Top (buttonWithFrameLabel), Width = 40,
             BorderStyle = LineStyle.Dashed
         };
         app.Add (buttonWithFrameFocusable);
@@ -88,7 +88,7 @@ public class HotKeys : Scenario
         var buttonWithFrame = new Button
         {
             Title = "Button with Frame (not focusab_le)",
-            X = Pos.Right (buttonWithFrameLabel) + 1, Y = Pos.Top (buttonWithFrameLabel), Width = 40, Height = 3,
+            X = Pos.Right (buttonWithFrameLabel) + 1, Y = Pos.Top (buttonWithFrameLabel), Width = 40,
             CanFocus = false,
             BorderStyle = LineStyle.Dashed
         };