diff --git a/ChangeLog b/ChangeLog
index b751639aa..e32900147 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-27  James M. Cape  <jcape@ignore-your.tv>
+
+	* src/themes/Esco/metacity-theme-1.xml: Use the 'utility' frame
+	for dialogs too.
+
 2004-01-24  James M. Cape  <jcape@ignore-your.tv>
 
 	* src/themes/Esco/metacity-theme-1.xml: Updated this theme.
diff --git a/src/themes/Esco/metacity-theme-1.xml b/src/themes/Esco/metacity-theme-1.xml
index fffd9d9a7..9a9061ba7 100644
--- a/src/themes/Esco/metacity-theme-1.xml
+++ b/src/themes/Esco/metacity-theme-1.xml
@@ -776,9 +776,9 @@
 		y="(height / 2) - (title_height / 2)"/>
 	<icon
 		x="width - title_width - height - (IconTitleSpacing * 2)"
-		y="0"
-		width="height"
-		height="height"/>
+		y="1"
+		width="height - 2"
+		height="height - 2"/>
 </draw_ops>
 
 <draw_ops name="title_text_with_icon">
@@ -798,9 +798,9 @@
 		y="(height / 2) - (title_height / 2)"/>
 	<icon alpha="0.33"
 		x="width - title_width - height - (IconTitleSpacing * 2)"
-		y="0"
-		width="height"
-		height="height"/>
+		y="1"
+		width="height - 2"
+		height="height - 2"/>
 </draw_ops>
 
 <draw_ops name="title_normal">
@@ -972,8 +972,8 @@
 </frame_style_set>
 
 <window type="normal" style_set="normal"/>
-<window type="dialog" style_set="normal"/>
-<window type="modal_dialog" style_set="normal"/>
+<window type="dialog" style_set="utility"/>
+<window type="modal_dialog" style_set="utility"/>
 <window type="menu" style_set="utility"/>
 <window type="utility" style_set="utility"/>
 <window type="border" style_set="border"/>