diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 21d2799688..7fe517a8a7 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -778,8 +778,8 @@ button.et2_timestamper:hover {
  * It uses jQueryUI, so this is just our little bits - icon on left
  */
 .ui-dialog-content .dialog_icon {
-    margin-right: 2ex;
     vertical-align: middle;
+    width: 2em;
 }
 
 .ui-dialog-content {
diff --git a/api/templates/default/password.xet b/api/templates/default/password.xet
index 170bb8e09a..f9c030ab22 100644
--- a/api/templates/default/password.xet
+++ b/api/templates/default/password.xet
@@ -3,18 +3,17 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="etemplate.password" template="" lang="" group="0" version="16.1">
-		<vbox  width="250px" class="ui-dialog-content">
+		<vbox  width="400px" class="ui-dialog-content">
 			<label class="et2_fullWidth" id="message"/>
-			<hbox>
-				<image src="password" class="dialog_icon"/>
+			<vbox>
 				<hbox>
-					<passwd id="value" width="80%" blur="enter your passphrase"/>
+					<image src="password" class="dialog_icon"/>
+					<passwd id="value" blur="enter your passphrase"/>
 				</hbox>
 				<hbox>
 					<textbox id="pass_exp" type="integer" label="Remeber this password for" blur="10" min="1" max="60"/>
-					<description value="minutes"/>
 				</hbox>
-			</hbox>
+			</vbox>
 		</vbox>
 	</template>
 </overlay>