diff --git a/src/core/core.c b/src/core/core.c
index e31f7e367..ae81362d8 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -496,3 +496,10 @@ meta_invalidate_default_icons (void)
 {
   /* XXX: Actually invalidate the icons when they're used. */
 }
+
+void
+meta_retheme_all (void)
+{
+  if (meta_get_display ())
+    meta_display_retheme_all ();
+}
diff --git a/src/core/core.h b/src/core/core.h
index 0e84ad137..460adbeab 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -168,5 +168,6 @@ void       meta_core_set_screen_cursor (Display *xdisplay,
                                         MetaCursor cursor);
 
 void meta_invalidate_default_icons (void);
+void meta_retheme_all (void);
 
 #endif
diff --git a/src/ui/frames.c b/src/ui/frames.c
index f6d0094e1..5ca16ae5b 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -372,6 +372,8 @@ meta_frames_style_updated  (GtkWidget *widget)
   g_hash_table_foreach (frames->frames,
                         reattach_style_func, frames);
 
+  meta_retheme_all ();
+
   GTK_WIDGET_CLASS (meta_frames_parent_class)->style_updated (widget);
 }