diff --git a/panels/user-accounts/um-editable-button.c b/panels/user-accounts/um-editable-button.c
index 5cad243ca..5e1945996 100644
--- a/panels/user-accounts/um-editable-button.c
+++ b/panels/user-accounts/um-editable-button.c
@@ -370,7 +370,7 @@ button_clicked (GtkWidget        *widget,
 }
 
 static void
-update_button_padding (UmEditableButton *button)
+update_button_padding (UmEditableButton *button, gpointer user_data)
 {
         UmEditableButtonPrivate *priv = button->priv;
         GtkStyleContext *context;
@@ -416,7 +416,7 @@ um_editable_button_init (UmEditableButton *button)
         gtk_stack_add_named (priv->stack, GTK_WIDGET (priv->button), PAGE_BUTTON);
         g_signal_connect (priv->button, "clicked", G_CALLBACK (button_clicked), button);
 
-        update_button_padding (button);
+        g_signal_connect (button, "style-updated", G_CALLBACK (update_button_padding), NULL);
 
         gtk_container_add (GTK_CONTAINER (button), GTK_WIDGET (priv->stack));
 
diff --git a/panels/user-accounts/um-editable-combo.c b/panels/user-accounts/um-editable-combo.c
index b5eb91184..a3432b136 100644
--- a/panels/user-accounts/um-editable-combo.c
+++ b/panels/user-accounts/um-editable-combo.c
@@ -381,7 +381,7 @@ popup_shown (GtkWidget       *widget,
 }
 
 static void
-update_button_padding (UmEditableCombo *combo)
+update_button_padding (UmEditableCombo *combo, gpointer user_data)
 {
         UmEditableComboPrivate *priv = combo->priv;
         GtkStyleContext *context;
@@ -433,7 +433,7 @@ um_editable_combo_init (UmEditableCombo *combo)
         g_signal_connect (priv->combo, "changed", G_CALLBACK (combo_changed), combo);
         g_signal_connect (priv->combo, "notify::popup-shown", G_CALLBACK (popup_shown), combo);
 
-        update_button_padding (combo);
+        g_signal_connect (combo, "style-updated", G_CALLBACK (update_button_padding), NULL);
 
         gtk_container_add (GTK_CONTAINER (combo), GTK_WIDGET (priv->stack));
 
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index e7c4a2151..a98bd725a 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -1645,7 +1645,7 @@ setup_main_window (CcUserPanel *self)
         button = get_widget (d, "last-login-history-button");
         g_signal_connect (button, "clicked",
                           G_CALLBACK (show_history), d);
-        update_padding (button, get_widget (d, "last-login-value-label"));
+        g_signal_connect (button, "style-updated", G_CALLBACK (update_padding), get_widget (d, "last-login-value-label"));
 
         d->permission = (GPermission *)polkit_permission_new_sync (USER_ACCOUNTS_PERMISSION, NULL, NULL, &error);
         if (d->permission != NULL) {
diff --git a/shell/cc-editable-entry.c b/shell/cc-editable-entry.c
index f77dda730..cd40ac263 100644
--- a/shell/cc-editable-entry.c
+++ b/shell/cc-editable-entry.c
@@ -568,7 +568,7 @@ entry_key_press (GtkWidget       *widget,
 }
 
 static void
-update_button_padding (CcEditableEntry *e)
+update_button_padding (CcEditableEntry *e, gpointer user_data)
 {
         CcEditableEntryPrivate *priv = e->priv;
         GtkStyleContext *context;
@@ -625,7 +625,7 @@ cc_editable_entry_init (CcEditableEntry *e)
         g_signal_connect (priv->entry, "focus-out-event", G_CALLBACK (entry_focus_out), e);
         g_signal_connect (priv->entry, "key-press-event", G_CALLBACK (entry_key_press), e);
 
-        update_button_padding (e);
+        g_signal_connect (e, "style-updated", G_CALLBACK (update_button_padding), NULL);
 
         gtk_container_add (GTK_CONTAINER (e), (GtkWidget*)priv->stack);