diff --git a/metacity-themes/Glider/metacity-theme-1.xml b/metacity-themes/Glider/metacity-theme-1.xml
index 52e3820..3f936ee 100644
--- a/metacity-themes/Glider/metacity-theme-1.xml
+++ b/metacity-themes/Glider/metacity-theme-1.xml
@@ -342,59 +342,47 @@
 
 <draw_ops name="close_button_icon">
         <line color="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.75"
-			width="1"
 			x1="ButtonIPad+1" y1="ButtonIPad"
-			x2="width - ButtonIPad" y2="height - ButtonIPad - 1"/>
+			x2="width - ButtonIPad - 1" y2="height - ButtonIPad - 2"/>
 		<line color="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.75"
-			width="1"
 			x1="ButtonIPad" y1="ButtonIPad"
-			x2="width - ButtonIPad" y2="height - ButtonIPad"/>
+			x2="width - ButtonIPad - 1" y2="height - ButtonIPad - 1"/>
 		<line color="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.75"
-			width="1"
 			x1="ButtonIPad" y1="ButtonIPad+1"
-			x2="width - ButtonIPad - 1" y2="height - ButtonIPad"/>
+			x2="width - ButtonIPad - 2" y2="height - ButtonIPad - 1"/>
 
 		<line color="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.75"
-			width="1"
 			x1="ButtonIPad" y1="height - ButtonIPad - 2"
-			x2="width - ButtonIPad - 1" y2="ButtonIPad-1"/>
+			x2="width - ButtonIPad - 2" y2="ButtonIPad"/>
 		<line color="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.75"
-			width="1"
 			x1="ButtonIPad" y1="height - ButtonIPad - 1"
-			x2="width - ButtonIPad" y2="ButtonIPad-1"/>
+			x2="width - ButtonIPad - 1" y2="ButtonIPad"/>
 		<line color="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.75"
-			width="1"
 			x1="ButtonIPad+1" y1="height - ButtonIPad - 1"
-			x2="width - ButtonIPad" y2="ButtonIPad"/>
+			x2="width - ButtonIPad - 1" y2="ButtonIPad + 1"/>
 </draw_ops>
 
 <draw_ops name="close_button_icon_unfocused">
 <include name="button_bg_unfocused"/>
 		<line color="blend/gtk:fg[INSENSITIVE]/gtk:bg[INSENSITIVE]/0.35"
-			width="1"
 			x1="ButtonIPad+1" y1="ButtonIPad"
-			x2="width - ButtonIPad" y2="height - ButtonIPad - 1"/>
+			x2="width - ButtonIPad - 1" y2="height - ButtonIPad - 2"/>
 		<line color="blend/gtk:fg[INSENSITIVE]/gtk:bg[INSENSITIVE]/0.35"
-			width="1"
 			x1="ButtonIPad" y1="ButtonIPad"
-			x2="width - ButtonIPad" y2="height - ButtonIPad"/>
+			x2="width - ButtonIPad - 1" y2="height - ButtonIPad - 1"/>
 		<line color="blend/gtk:fg[INSENSITIVE]/gtk:bg[INSENSITIVE]/0.35"
-			width="1"
 			x1="ButtonIPad" y1="ButtonIPad+1"
-			x2="width - ButtonIPad - 1" y2="height - ButtonIPad"/>
+			x2="width - ButtonIPad - 2" y2="height - ButtonIPad - 1"/>
 
 		<line color="blend/gtk:fg[INSENSITIVE]/gtk:bg[INSENSITIVE]/0.35"
-			width="1"
 			x1="ButtonIPad" y1="height - ButtonIPad - 2"
-			x2="width - ButtonIPad - 1" y2="ButtonIPad-1"/>
+			x2="width - ButtonIPad - 2" y2="ButtonIPad"/>
 		<line color="blend/gtk:fg[INSENSITIVE]/gtk:bg[INSENSITIVE]/0.35"
-			width="1"
 			x1="ButtonIPad" y1="height - ButtonIPad - 1"
-			x2="width - ButtonIPad" y2="ButtonIPad-1"/>
+			x2="width - ButtonIPad - 1" y2="ButtonIPad"/>
 		<line color="blend/gtk:fg[INSENSITIVE]/gtk:bg[INSENSITIVE]/0.35"
-			width="1"
 			x1="ButtonIPad+1" y1="height - ButtonIPad - 1"
-			x2="width - ButtonIPad" y2="ButtonIPad"/>
+			x2="width - ButtonIPad - 1" y2="ButtonIPad + 1"/>
 	</draw_ops>
 
 	<draw_ops name="outer_bevel">
diff --git a/metacity-themes/Glossy/metacity-theme-1.xml b/metacity-themes/Glossy/metacity-theme-1.xml
index 2e5e3cd..2eab980 100644
--- a/metacity-themes/Glossy/metacity-theme-1.xml
+++ b/metacity-themes/Glossy/metacity-theme-1.xml
@@ -621,30 +621,30 @@
 	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
 		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
-	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
-		x2="width- ((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
+		x2="width- ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
 	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
 		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
-	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
-		x2="width - ((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
+		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
 </draw_ops>
 
 <draw_ops name="close_button_icon_unfocused">
 	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
 		x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"/>
-	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
 	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
 		x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
-	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
 </draw_ops>
 
 <draw_ops name="close_button_normal">
diff --git a/metacity-themes/Inverted/metacity-theme-1.xml b/metacity-themes/Inverted/metacity-theme-1.xml
index d7df4da..80f743d 100644
--- a/metacity-themes/Inverted/metacity-theme-1.xml
+++ b/metacity-themes/Inverted/metacity-theme-1.xml
@@ -633,30 +633,30 @@
 	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
 		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
-	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
-		x2="width- ((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
+		x2="width- ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
 	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="2"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
 		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
-	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75" width="1"
+	<line color="blend/gtk:bg[SELECTED]/#FFFFFF/0.75"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"
-		x2="width - ((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
+		x2="width - ((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
 </draw_ops>
 
 <draw_ops name="close_button_icon_unfocused">
 	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
 		x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"/>
-	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="((height-(Bmin`max`height-Bpad*2))/2)"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="height - ((height-(Bmin`max`height-Bpad*2))/2)"/>
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="height - ((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
 	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="2"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
 		x2="width-((width-(Bmin`max`height-Bpad*2))/2)-1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
-	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45" width="1"
+	<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.45"
 		x1="((width-(Bmin`max`height-Bpad*2))/2)" y1="height - ((height-(Bmin`max`height-Bpad*2))/2)-1"
-		x2="width-((width-(Bmin`max`height-Bpad*2))/2)" y2="((height-(Bmin`max`height-Bpad*2))/2) - 1"/>
+		x2="width-((width-(Bmin`max`height-Bpad*2))/2) - 1" y2="((height-(Bmin`max`height-Bpad*2))/2)"/>
 </draw_ops>
 
 <draw_ops name="close_button_normal">
diff --git a/metacity-themes/Mist/metacity-theme-1.xml b/metacity-themes/Mist/metacity-theme-1.xml
index ab22862..dbbecdf 100644
--- a/metacity-themes/Mist/metacity-theme-1.xml
+++ b/metacity-themes/Mist/metacity-theme-1.xml
@@ -174,23 +174,23 @@
 <draw_ops name="close_button_icon">
   <line color="gtk:fg[SELECTED]" width="2"
         x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad-1" y2="height - ButtonIPad-1"/>
-  <line color="gtk:fg[SELECTED]" width="1"
-        x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad" y2="height - ButtonIPad"/>
+  <line color="gtk:fg[SELECTED]"
+        x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad-1" y2="height - ButtonIPad-1"/>
   <line color="gtk:fg[SELECTED]" width="2"
         x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad-1" y2="ButtonIPad"/>
-  <line color="gtk:fg[SELECTED]" width="1"
-        x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad" y2="ButtonIPad - 1"/>
+  <line color="gtk:fg[SELECTED]"
+        x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad-1" y2="ButtonIPad"/>
 </draw_ops>
 
 <draw_ops name="close_button_icon_unfocused">
   <line color="gtk:fg[INSENSITIVE]" width="2"
         x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad-1" y2="height - ButtonIPad-1"/>
-  <line color="gtk:fg[INSENSITIVE]" width="1"
-        x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad" y2="height - ButtonIPad"/>
+  <line color="gtk:fg[INSENSITIVE]"
+        x1="ButtonIPad" y1="ButtonIPad" x2="width-ButtonIPad-1" y2="height - ButtonIPad-1"/>
   <line color="gtk:fg[INSENSITIVE]" width="2"
         x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad-1" y2="ButtonIPad"/>
-  <line color="gtk:fg[INSENSITIVE]" width="1"
-        x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad" y2="ButtonIPad - 1"/>
+  <line color="gtk:fg[INSENSITIVE]"
+        x1="ButtonIPad" y1="height - ButtonIPad-1" x2="width-ButtonIPad-1" y2="ButtonIPad"/>
 </draw_ops>
 
 <draw_ops name="close_button_normal">
