diff --git a/src/ui/frames.c b/src/ui/frames.c
index 75f3340f2..4a03ec40f 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -505,6 +505,7 @@ meta_frames_calc_geometry (MetaFrames        *frames,
   meta_prefs_get_button_layout (&button_layout);
   
   meta_theme_calc_geometry (frame->tv->theme,
+                            frame->tv->style_context,
                             type,
                             frame->text_height,
                             flags,
diff --git a/src/ui/theme-private.h b/src/ui/theme-private.h
index 715adb18c..8a36a7e00 100644
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-private.h
@@ -1086,6 +1086,7 @@ void meta_theme_get_frame_borders (MetaTheme         *theme,
                                    MetaFrameBorders  *borders);
 
 void meta_theme_calc_geometry (MetaTheme              *theme,
+                               GtkStyleContext        *ctx,
                                MetaFrameType           type,
                                int                     text_height,
                                MetaFrameFlags          flags,
diff --git a/src/ui/theme.c b/src/ui/theme.c
index cc4faa3f2..96c37c6d3 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -514,6 +514,7 @@ strip_button (MetaButtonSpace *func_rects[MAX_BUTTONS_PER_CORNER],
 
 static void
 meta_frame_layout_calc_geometry (const MetaFrameLayout  *layout,
+                                 GtkStyleContext        *ctx,
                                  int                     text_height,
                                  MetaFrameFlags          flags,
                                  int                     client_width,
@@ -5047,6 +5048,7 @@ meta_theme_draw_frame_with_style (MetaTheme              *theme,
     return;
   
   meta_frame_layout_calc_geometry (style->layout,
+                                   style_gtk,
                                    text_height,
                                    flags,
                                    client_width, client_height,
@@ -5116,6 +5118,7 @@ meta_theme_get_frame_borders (MetaTheme        *theme,
 
 void
 meta_theme_calc_geometry (MetaTheme              *theme,
+                          GtkStyleContext        *ctx,
                           MetaFrameType           type,
                           int                     text_height,
                           MetaFrameFlags          flags,
@@ -5135,6 +5138,7 @@ meta_theme_calc_geometry (MetaTheme              *theme,
     return;
 
   meta_frame_layout_calc_geometry (style->layout,
+                                   ctx,
                                    text_height,
                                    flags,
                                    client_width, client_height,