diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp
index da7ec0c..fa06b97 100644
--- a/src/gmenu2x.cpp
+++ b/src/gmenu2x.cpp
@@ -1037,11 +1037,14 @@ int GMenu2X::drawButton(Surface& s, const string &btn, const string &text, int x
 		if (y < 0) y = resY + y;
 		w = icon->width();
 		icon->blit(s, x, y - 7);
-		w += 3;
-		w += font->write(
-				s, text, x + w, y, Font::HAlignLeft, Font::VAlignMiddle);
+		if (!text.empty()) {
+			w += 3;
+			w += font->write(
+					s, text, x + w, y, Font::HAlignLeft, Font::VAlignMiddle);
+			w += 6;
+		}
 	}
-	return x + w + 6;
+	return x + w;
 }
 
 int GMenu2X::drawButtonRight(Surface& s, const string &btn, const string &text, int x, int y) {
@@ -1051,11 +1054,14 @@ int GMenu2X::drawButtonRight(Surface& s, const string &btn, const string &text,
 		if (y < 0) y = resY + y;
 		w = icon->width();
 		icon->blit(s, x - w, y - 7);
-		w += 3;
-		w += font->write(
-				s, text, x - w, y, Font::HAlignRight, Font::VAlignMiddle);
+		if (!text.empty()) {
+			w += 3;
+			w += font->write(
+					s, text, x - w, y, Font::HAlignRight, Font::VAlignMiddle);
+			w += 6;
+		}
 	}
-	return x - (w + 6);
+	return x - w;
 }
 
 void GMenu2X::drawScrollBar(uint pageSize, uint totalSize, uint pagePos) {
diff --git a/src/linkapp.cpp b/src/linkapp.cpp
index 6b0ccea..cb146b1 100644
--- a/src/linkapp.cpp
+++ b/src/linkapp.cpp
@@ -475,7 +475,7 @@ void LinkApp::showManual() {
 				gmenu2x->drawButton(s, "start", gmenu2x->tr["Exit"],
 				gmenu2x->drawButton(s, "cancel", "",
 				gmenu2x->drawButton(s, "right", gmenu2x->tr["Change page"],
-				gmenu2x->drawButton(s, "left", "", 5)-10))-10);
+				gmenu2x->drawButton(s, "left", "", 5))));
 
 				ss.clear();
 				ss << page+1;
diff --git a/src/selector.cpp b/src/selector.cpp
index be7fd80..2415362 100644
--- a/src/selector.cpp
+++ b/src/selector.cpp
@@ -66,11 +66,11 @@ int Selector::exec(int startSelection) {
 		gmenu2x->drawButton(bg, "start", gmenu2x->tr["Exit"],
 		gmenu2x->drawButton(bg, "accept", gmenu2x->tr["Select"],
 		gmenu2x->drawButton(bg, "cancel", gmenu2x->tr["Up one folder"],
-		gmenu2x->drawButton(bg, "left", "", 5)-10)));
+		gmenu2x->drawButton(bg, "left", "", 5))));
 	} else {
 		gmenu2x->drawButton(bg, "start", gmenu2x->tr["Exit"],
 		gmenu2x->drawButton(bg, "cancel", "",
-		gmenu2x->drawButton(bg, "accept", gmenu2x->tr["Select"], 5)) - 10);
+		gmenu2x->drawButton(bg, "accept", gmenu2x->tr["Select"], 5)));
 	}
 
 	unsigned int top, height;
diff --git a/src/textdialog.cpp b/src/textdialog.cpp
index de74310..39477e8 100644
--- a/src/textdialog.cpp
+++ b/src/textdialog.cpp
@@ -73,7 +73,7 @@ void TextDialog::exec() {
 	gmenu2x->drawButton(bg, "start", gmenu2x->tr["Exit"],
 	gmenu2x->drawButton(bg, "cancel", "",
 	gmenu2x->drawButton(bg, "down", gmenu2x->tr["Scroll"],
-	gmenu2x->drawButton(bg, "up", "", 5)-10))-10);
+	gmenu2x->drawButton(bg, "up", "", 5))));
 
 	bg.convertToDisplayFormat();
 
diff --git a/src/textmanualdialog.cpp b/src/textmanualdialog.cpp
index d846ef3..7017e82 100644
--- a/src/textmanualdialog.cpp
+++ b/src/textmanualdialog.cpp
@@ -82,7 +82,7 @@ void TextManualDialog::exec() {
 	gmenu2x->drawButton(bg, "right", gmenu2x->tr["Change page"],
 	gmenu2x->drawButton(bg, "left", "",
 	gmenu2x->drawButton(bg, "down", gmenu2x->tr["Scroll"],
-	gmenu2x->drawButton(bg, "up", "", 5)-10))-10))-10);
+	gmenu2x->drawButton(bg, "up", "", 5))))));
 
 	bg.convertToDisplayFormat();