diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index aac15d2..9698dad 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -81,10 +81,6 @@ void InputManager::readConfFile(const string &conffile) {
 		else if (name == "altright") button = ALTRIGHT;
 		else if (name == "menu")     button = MENU;
 		else if (name == "settings") button = SETTINGS;
-		else if (name == "volup")    button = VOLUP;
-		else if (name == "voldown")  button = VOLDOWN;
-		else if (name == "power")    button = POWER;
-		else if (name == "lock")     button = LOCK;
 		else {
 			WARNING("InputManager: Ignoring unknown button name \"%s\"\n",
 					name.c_str());
diff --git a/src/inputmanager.h b/src/inputmanager.h
index 84ac588..72eccdd 100644
--- a/src/inputmanager.h
+++ b/src/inputmanager.h
@@ -40,11 +40,9 @@ public:
 		ACCEPT, CANCEL,
 		ALTLEFT, ALTRIGHT,
 		MENU, SETTINGS,
-		VOLUP, VOLDOWN,
-		POWER, LOCK,
 		REPAINT,
 	};
-	#define BUTTON_TYPE_SIZE 14
+	#define BUTTON_TYPE_SIZE 10
 
 	enum ButtonState { PRESSED, RELEASED };
 	struct ButtonEvent {
diff --git a/src/messagebox.cpp b/src/messagebox.cpp
index 4dfbab6..a06bfbb 100644
--- a/src/messagebox.cpp
+++ b/src/messagebox.cpp
@@ -52,8 +52,6 @@ MessageBox::MessageBox(GMenu2X *gmenu2x, const string &text, const string &icon)
 	buttonLabels[InputManager::ALTRIGHT] = "r";
 	buttonLabels[InputManager::SETTINGS] = "start";
 	buttonLabels[InputManager::MENU] = "select";
-	buttonLabels[InputManager::VOLUP] = "vol+";
-	buttonLabels[InputManager::VOLDOWN] = "vol-";
 }
 
 void MessageBox::setButton(InputManager::Button button, const string &label) {