diff --git a/docs/themerc b/docs/themerc
index b3de250a..cf485eaf 100644
--- a/docs/themerc
+++ b/docs/themerc
@@ -33,6 +33,7 @@ window.label.text.justify: center
 
 # window button width and spacing
 window.button.width: 26
+window.button.height: 26
 window.button.spacing: 0
 
 # window button hover effect
diff --git a/src/theme.c b/src/theme.c
index b813219d..ae2ae400 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -701,6 +701,12 @@ entry(struct theme *theme, const char *key, const char *value)
 		theme->window_titlebar_padding_height = get_int_if_positive(
 			value, "window.titlebar.padding.height");
 	}
+	if (match_glob(key, "titlebar.height")) {
+		wlr_log(WLR_ERROR, "titlebar.height is no longer supported");
+	}
+	if (match_glob(key, "padding.height")) {
+		wlr_log(WLR_ERROR, "padding.height is no longer supported");
+	}
 	if (match_glob(key, "menu.items.padding.x")) {
 		theme->menu_item_padding_x = get_int_if_positive(
 			value, "menu.items.padding.x");