diff --git a/themes/b5/Makefile.am b/themes/b5/Makefile.am
index 652566b4052fd3431f4fe9303d46870dbadb9f3f..82fb80eb6a8854f1d6eb2d66192832347d5b47b6 100644
--- a/themes/b5/Makefile.am
+++ b/themes/b5/Makefile.am
@@ -6,11 +6,11 @@ theme_DATA = README \
 	bottom-left-inactive.xpm \
 	bottom-right-active.xpm \
 	bottom-right-inactive.xpm \
+	close-active.xpm \
+	close-inactive.xpm \
+	close-pressed.xpm \
 	left-active.xpm \
 	left-inactive.xpm \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.xpm \
 	right-active.xpm \
 	right-inactive.xpm \
 	themerc \
diff --git a/themes/b5/Makefile.in b/themes/b5/Makefile.in
index 461bf70ab425509c178ae5c98eb2f4dc8cf4c123..dd722785993d9d924e3e743427ba7c7c942c5c03 100644
--- a/themes/b5/Makefile.in
+++ b/themes/b5/Makefile.in
@@ -87,11 +87,11 @@ theme_DATA = README \
 	bottom-left-inactive.xpm \
 	bottom-right-active.xpm \
 	bottom-right-inactive.xpm \
+	close-active.xpm \
+	close-inactive.xpm \
+	close-pressed.xpm \
 	left-active.xpm \
 	left-inactive.xpm \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.xpm \
 	right-active.xpm \
 	right-inactive.xpm \
 	themerc \
diff --git a/themes/b5/menu-active.xpm b/themes/b5/close-active.xpm
similarity index 73%
rename from themes/b5/menu-active.xpm
rename to themes/b5/close-active.xpm
index 831943deee33a030e5584cd79b7db7facb28a8b1..5b21d0c2b732240fdbcd5087544fd42c8fc02c91 100644
--- a/themes/b5/menu-active.xpm
+++ b/themes/b5/close-active.xpm
@@ -1,12 +1,12 @@
 /* XPM */
-static char * menu_active_xpm[] = {
+static char * close_active_xpm[] = {
 "14 23 6 1",
-" 	c None",
-".	c #B78200",
-"+	c #FFFF3F",
-"@	c #FFEC21",
-"#	c #FFCB00",
-"$	c #EAB500",
+"       c None",
+".      c #B78200",
+"+      c #FFFF3F",
+"@      c #FFEC21",
+"#      c #FFCB00",
+"$      c #EAB500",
 "              ",
 "              ",
 "              ",
diff --git a/themes/b5/menu-inactive.xpm b/themes/b5/close-inactive.xpm
similarity index 76%
rename from themes/b5/menu-inactive.xpm
rename to themes/b5/close-inactive.xpm
index 34cfb7a43471e101ecd368a3799551096a48f9a7..78d376de6d7b38db428c8b423d30ac15113901c4 100644
--- a/themes/b5/menu-inactive.xpm
+++ b/themes/b5/close-inactive.xpm
@@ -1,11 +1,11 @@
 /* XPM */
-static char * menu_inactive_xpm[] = {
+static char * close_inactive_xpm[] = {
 "14 23 5 1",
-" 	c None",
-".	c #A0A0A0",
-"+	c #FFFFFF",
-"@	c #E8E8E8",
-"#	c #D3D3D3",
+"       c None",
+".      c #A0A0A0",
+"+      c #FFFFFF",
+"@      c #E8E8E8",
+"#      c #D3D3D3",
 "              ",
 "              ",
 "              ",
diff --git a/themes/b5/menu-pressed.xpm b/themes/b5/close-pressed.xpm
similarity index 73%
rename from themes/b5/menu-pressed.xpm
rename to themes/b5/close-pressed.xpm
index 7e1ac5d112fbbae39336d497383e12603f3c51dc..f3a3d9cd0f6da8b7d0db702f9a0bb834cbacafc5 100644
--- a/themes/b5/menu-pressed.xpm
+++ b/themes/b5/close-pressed.xpm
@@ -1,12 +1,12 @@
 /* XPM */
-static char * menu_pressed_xpm[] = {
+static char * close_pressed_xpm[] = {
 "14 23 6 1",
-" 	c None",
-".	c #B78200",
-"+	c #FFFF3F",
-"@	c #EAB500",
-"#	c #FFCB00",
-"$	c #FFEC21",
+"       c None",
+".      c #B78200",
+"+      c #FFFF3F",
+"@      c #EAB500",
+"#      c #FFCB00",
+"$      c #FFEC21",
 "              ",
 "              ",
 "              ",
diff --git a/themes/b5/themerc b/themes/b5/themerc
index 85c2cb147ded6b92911bc88b09f496075e97be0a..229c5ea7fe223d4efca0d2ecac49cd6da017afd9 100644
--- a/themes/b5/themerc
+++ b/themes/b5/themerc
@@ -3,6 +3,6 @@ title_vertical_offset=-1
 title_alignment=left
 button_offset=4
 button_spacing=0
-button_layout=O|
+button_layout=C|
 active_text_color=#000000
 inactive_text_color=#000000