diff --git a/apps/test.cpp b/apps/test.cpp
index 9c41609..8579645 100644
--- a/apps/test.cpp
+++ b/apps/test.cpp
@@ -146,6 +146,7 @@ void InitialiseInstance(EsInstance *instance) {
 	// Test();
 
 	EsPanel *panel = EsPanelCreate(instance->window, ES_CELL_FILL, &stylePanel);
+	EsButtonCreate(panel, ES_BUTTON_CHECKBOX, 0, "Checkbox");
 	EsButtonOnCommand(EsButtonCreate(panel, ES_FLAGS_DEFAULT, 0, "Crash"), [] (EsInstance *, EsElement *, EsCommand *) { EsAssert(false); });
 	EsButtonOnCommand(EsButtonCreate(panel, ES_FLAGS_DEFAULT, 0, "Hang"), [] (EsInstance *, EsElement *, EsCommand *) { while (true); });
 	EsButtonOnCommand(EsButtonCreate(panel, ES_FLAGS_DEFAULT, 0, "Wait"), [] (EsInstance *, EsElement *, EsCommand *) { EsSleep(8000); });
diff --git a/desktop/gui.cpp b/desktop/gui.cpp
index fccc656..02f26a7 100644
--- a/desktop/gui.cpp
+++ b/desktop/gui.cpp
@@ -3691,6 +3691,8 @@ int ProcessButtonMessage(EsElement *element, EsMessage *message) {
 
 		if (button->flags & ES_BUTTON_MENU_ITEM) {
 			button->window->Destroy();
+		} else {
+			button->MaybeRefreshStyle();
 		}
 	} else if (message->type == ES_MSG_RADIO_GROUP_UPDATED && (button->flags & ES_BUTTON_RADIOBOX)) {
 		EsButtonSetCheck(button, ES_CHECK_UNCHECKED);
diff --git a/desktop/styles.header b/desktop/styles.header
index edebe24..9dfbd67 100644
--- a/desktop/styles.header
+++ b/desktop/styles.header
@@ -8,8 +8,8 @@ define ES_STYLE_BUTTON_GROUP_CONTAINER (ES_STYLE_CAST(1229))
 define ES_STYLE_BUTTON_GROUP_ITEM (ES_STYLE_CAST(1231))
 define ES_STYLE_BUTTON_GROUP_SEPARATOR (ES_STYLE_CAST(1233))
 define_private ES_STYLE_CANVAS_SHADOW (ES_STYLE_CAST(1451))
-define_private ES_STYLE_CHECKBOX_NORMAL (ES_STYLE_CAST(1235))
-define_private ES_STYLE_CHECKBOX_RADIOBOX (ES_STYLE_CAST(1237))
+define_private ES_STYLE_CHECKBOX_NORMAL (ES_STYLE_CAST(1559))
+define_private ES_STYLE_CHECKBOX_RADIOBOX (ES_STYLE_CAST(1567))
 define_private ES_STYLE_COLOR_CHOSEN_POINT (ES_STYLE_CAST(1241))
 define_private ES_STYLE_COLOR_CIRCLE (ES_STYLE_CAST(1243))
 define_private ES_STYLE_COLOR_HEX_TEXTBOX (ES_STYLE_CAST(1245))
diff --git a/res/Theme Source.dat b/res/Theme Source.dat
index f4085c4..92586e2 100644
Binary files a/res/Theme Source.dat and b/res/Theme Source.dat differ
diff --git a/res/Themes/Theme.dat b/res/Themes/Theme.dat
index a632286..d2088cc 100644
Binary files a/res/Themes/Theme.dat and b/res/Themes/Theme.dat differ