diff --git a/src/clock/main.c b/src/clock/main.c
index aad459c..7550bb2 100644
--- a/src/clock/main.c
+++ b/src/clock/main.c
@@ -240,7 +240,7 @@ int main(int argc , char* argv[]) {
 			GFX_blitHardwareGroup(screen, show_setting);
 			
 			if (show_setting) {
-				if (PAD_isPressed(BTN_MENU)) GFX_blitButtonGroup((char*[]){ BRIGHTNESS_BUTTON_LABEL,"BRIGHTNESS",  NULL }, screen, 0);
+				if (show_setting==1) GFX_blitButtonGroup((char*[]){ BRIGHTNESS_BUTTON_LABEL,"BRIGHTNESS",  NULL }, screen, 0);
 				else GFX_blitButtonGroup((char*[]){ "MENU","BRIGHTNESS",  NULL }, screen, 0);
 			}
 			else GFX_blitButtonGroup((char*[]){ "SELECT",show_24hour?"12 HOUR":"24 HOUR", NULL }, screen, 0);
diff --git a/src/common/api.c b/src/common/api.c
index 19dc6a3..dfa01ba 100644
--- a/src/common/api.c
+++ b/src/common/api.c
@@ -975,8 +975,8 @@ void PAD_poll(void) {
 			else if (code==CODE_L2)		{ btn = BTN_L2; 		id = BTN_ID_L2; }
 			else if (code==CODE_R1)		{ btn = BTN_R1; 		id = BTN_ID_R1; }
 			else if (code==CODE_R2)		{ btn = BTN_R2; 		id = BTN_ID_R2; }
-			else if (code==CODE_VOL_UP)	{ btn = BTN_VOL_UP; 	id = BTN_ID_VOL_UP; }
-			else if (code==CODE_VOL_DN)	{ btn = BTN_VOL_DN; 	id = BTN_ID_VOL_DN; }
+			else if (code==CODE_PLUS)	{ btn = BTN_PLUS; 		id = BTN_ID_PLUS; }
+			else if (code==CODE_MINUS)	{ btn = BTN_MINUS; 		id = BTN_ID_MINUS; }
 			else if (code==CODE_POWER)	{ btn = BTN_POWER; 		id = BTN_ID_POWER; }
 		}
 		
@@ -1063,7 +1063,7 @@ void POW_update(int* _dirty, int* _show_setting, POW_callback_t before_sleep, PO
 		dirty = 1;
 	}
 	
-	if (PAD_justRepeated(BTN_VOL_UP) || PAD_justRepeated(BTN_VOL_DN) || PAD_justPressed(BTN_MENU)) {
+	if (PAD_justRepeated(BTN_PLUS) || PAD_justRepeated(BTN_MINUS) || PAD_justPressed(BTN_MENU)) {
 		setting_start = now;
 		if (PAD_isPressed(BTN_MENU)) {
 			show_setting = 1;
diff --git a/src/common/api.h b/src/common/api.h
index cb90df2..6abfdff 100644
--- a/src/common/api.h
+++ b/src/common/api.h
@@ -136,8 +136,8 @@ enum {
 	BTN_ID_L2,
 	BTN_ID_R2,
 	BTN_ID_MENU,
-	BTN_ID_VOL_UP,
-	BTN_ID_VOL_DN,
+	BTN_ID_PLUS,
+	BTN_ID_MINUS,
 	BTN_ID_POWER,
 	BTN_ID_COUNT,
 };
@@ -159,8 +159,8 @@ enum {
 	BTN_L2		= 1 << BTN_ID_L2,
 	BTN_R2		= 1 << BTN_ID_R2,
 	BTN_MENU	= 1 << BTN_ID_MENU,
-	BTN_VOL_UP	= 1 << BTN_ID_VOL_UP,
-	BTN_VOL_DN	= 1 << BTN_ID_VOL_DN,
+	BTN_PLUS	= 1 << BTN_ID_PLUS,
+	BTN_MINUS	= 1 << BTN_ID_MINUS,
 	BTN_POWER	= 1 << BTN_ID_POWER,
 };
 
diff --git a/src/common/defines.h b/src/common/defines.h
index 96dfcd1..da20cf7 100644
--- a/src/common/defines.h
+++ b/src/common/defines.h
@@ -16,8 +16,8 @@
 #define CODE_L2			0x66
 #define CODE_R2			0x67
 #define CODE_MENU		0x68
-#define CODE_VOL_UP		0x6C
-#define CODE_VOL_DN		0x6D
+#define CODE_PLUS		0x6C
+#define CODE_MINUS		0x6D
 #define CODE_POWER		0x74
 
 #define VOLUME_MIN 		0
diff --git a/src/keymon/keymon.c b/src/keymon/keymon.c
index 3ddd03f..8fd2682 100644
--- a/src/keymon/keymon.c
+++ b/src/keymon/keymon.c
@@ -105,11 +105,11 @@ int main (int argc, char *argv[]) {
 					case CODE_POWER:
 						power_pressed = val;
 					break;
-					case CODE_VOL_UP:
+					case CODE_PLUS:
 						up_pressed = up_just_pressed = val;
 						if (val) up_repeat_at = now + 300;
 					break;
-					case CODE_VOL_DN:
+					case CODE_MINUS:
 						down_pressed = down_just_pressed = val;
 						if (val) down_repeat_at = now + 300;
 					break;
diff --git a/src/minarch/main.c b/src/minarch/main.c
index de2bec9..8d2aa63 100644
--- a/src/minarch/main.c
+++ b/src/minarch/main.c
@@ -985,7 +985,7 @@ static void input_poll_callback(void) {
 	if (PAD_justPressed(BTN_MENU)) {
 		ignore_menu = 0;
 	}
-	if (PAD_isPressed(BTN_MENU) && (PAD_isPressed(BTN_VOL_UP) || PAD_isPressed(BTN_VOL_DN))) {
+	if (PAD_isPressed(BTN_MENU) && (PAD_isPressed(BTN_PLUS) || PAD_isPressed(BTN_MINUS))) {
 		ignore_menu = 1;
 	}
 	
@@ -3356,7 +3356,7 @@ static void Menu_loop(void) {
 			SDL_FreeSurface(text);
 			
 			if (show_setting) {
-				if (PAD_isPressed(BTN_MENU)) GFX_blitButtonGroup((char*[]){ BRIGHTNESS_BUTTON_LABEL,"BRIGHTNESS",  NULL }, screen, 0);
+				if (show_setting==1) GFX_blitButtonGroup((char*[]){ BRIGHTNESS_BUTTON_LABEL,"BRIGHTNESS",  NULL }, screen, 0);
 				else GFX_blitButtonGroup((char*[]){ "MENU","BRIGHTNESS",  NULL }, screen, 0);
 			}
 			else GFX_blitButtonGroup((char*[]){ "POWER","SLEEP", NULL }, screen, 0);
diff --git a/src/minui/main.c b/src/minui/main.c
index 8e19a40..96e1e0c 100644
--- a/src/minui/main.c
+++ b/src/minui/main.c
@@ -1424,7 +1424,7 @@ int main (int argc, char *argv[]) {
 			
 			// buttons
 			if (show_setting) {
-				if (PAD_isPressed(BTN_MENU)) GFX_blitButtonGroup((char*[]){ BRIGHTNESS_BUTTON_LABEL,"BRIGHTNESS",  NULL }, screen, 0);
+				if (show_setting==1) GFX_blitButtonGroup((char*[]){ BRIGHTNESS_BUTTON_LABEL,"BRIGHTNESS",  NULL }, screen, 0);
 				else GFX_blitButtonGroup((char*[]){ "MENU","BRIGHTNESS",  NULL }, screen, 0);
 			}
 			else if (can_resume) {