diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 8ab52c8010..b92747eb5e 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3005,13 +3005,15 @@ window.dialog.print {
  **********/
 frame,
 .frame {
-  box-shadow: none;
-  margin: 0;
-  padding: 0;
-  border-radius: 0;
   border: 1px solid $borders_color;
+}
 
-  &.flat { border-style: none; }
+frame {
+  border-radius: $window_radius;
+
+  > label {
+    margin: 4px;
+  }
 }
 
 actionbar > revealer >  box {
@@ -3222,6 +3224,7 @@ expander-widget {
 calendar {
   color: $text_color;
   border: 1px solid $borders_color;
+  border-radius: $window_radius;
 
   > header {
     border-bottom: 1px solid $borders_color;