diff --git a/templates/Froxlor/customer/email/account_add.tpl b/templates/Froxlor/customer/email/account_add.tpl
index 87e1a1e7..684f25cd 100644
--- a/templates/Froxlor/customer/email/account_add.tpl
+++ b/templates/Froxlor/customer/email/account_add.tpl
@@ -1,20 +1,20 @@
 $header
-<article>
-	<header>
-		<h2>
-			<img src="images/Froxlor/icons/email_add.png" alt="{$lng['emails']['account_add']}" />&nbsp;
-			{$lng['emails']['account_add']}
-		</h2>
-	</header>
-	
-	<section class="fullform bradiusodd">
+	<article>
+		<header>
+			<h2>
+				<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section class="fullform bradiusodd">
 
 			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_add']}</legend>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
 					<table class="formtable">
-            {$account_add_form}
+						{$account_add_form}
 					</table>
 
 					<p style="display: none;">
@@ -25,6 +25,8 @@ $header
 					</p>
 				</fieldset>
 			</form>
-	</section>
-</article>
+
+		</section>
+
+	</article>
 $footer
diff --git a/templates/Froxlor/customer/email/account_changepw.tpl b/templates/Froxlor/customer/email/account_changepw.tpl
index 9a211a30..3a5a7ea7 100644
--- a/templates/Froxlor/customer/email/account_changepw.tpl
+++ b/templates/Froxlor/customer/email/account_changepw.tpl
@@ -1,30 +1,33 @@
 $header
-<article>
-  <header>
-    <h2>
-      <img src="images/Froxlor/icons/email_add.png" alt="{$lng['menue']['main']['changepassword']}" />&nbsp;
-      {$lng['menue']['main']['changepassword']}
-    </h2>
-  </header>
-  
-  <section class="fullform bradiusodd">
+	<article>
+		<header>
+			<h2>
+				<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
 
-      <form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-        <fieldset>
-          <legend>Froxlor&nbsp;-&nbsp;{$lng['menue']['main']['changepassword']}</legend>
+		<section class="fullform bradiusodd">
 
-          <table class="formtable">
-            {$account_changepw}
-          </table>
+			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
-          <p style="display: none;">
-            <input type="hidden" name="s" value="$s" />
-            <input type="hidden" name="page" value="$page" />
-            <input type="hidden" name="action" value="$action" />
-            <input type="hidden" name="send" value="send" />
-          </p>
-        </fieldset>
-      </form>
-  </section>
-</article>
-$footer
\ No newline at end of file
+					<table class="formtable">
+						{$account_changepw_form}
+					</table>
+
+					<p style="display: none;">
+						<input type="hidden" name="s" value="$s" />
+						<input type="hidden" name="page" value="$page" />
+						<input type="hidden" name="action" value="$action" />
+						<input type="hidden" name="id" value="$id" />
+						<input type="hidden" name="send" value="send" />
+					</p>
+				</fieldset>
+			</form>
+
+		</section>
+
+	</article>
+$footer
diff --git a/templates/Froxlor/customer/email/account_changequota.tpl b/templates/Froxlor/customer/email/account_changequota.tpl
index 8f96bddd..5550e05b 100644
--- a/templates/Froxlor/customer/email/account_changequota.tpl
+++ b/templates/Froxlor/customer/email/account_changequota.tpl
@@ -1,30 +1,33 @@
 $header
-<article>
-  <header>
-    <h2>
-      <img src="images/Froxlor/icons/email_add.png" alt="{$lng['emails']['quota_edit']}" />&nbsp;
-      {$lng['emails']['quota_edit']}
-    </h2>
-  </header>
-  
-  <section class="fullform bradiusodd">
+	<article>
+		<header>
+			<h2>
+				<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
 
-      <form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-        <fieldset>
-          <legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['quota_edit']}</legend>
+		<section class="fullform bradiusodd">
 
-          <table class="formtable">
-            {$quota_edit}
-          </table>
+			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
 
-          <p style="display: none;">
-            <input type="hidden" name="s" value="$s" />
-            <input type="hidden" name="page" value="$page" />
-            <input type="hidden" name="action" value="$action" />
-            <input type="hidden" name="send" value="send" />
-          </p>
-        </fieldset>
-      </form>
-  </section>
-</article>
-$footer
\ No newline at end of file
+					<table class="formtable">
+						{$quota_edit_form}
+					</table>
+
+					<p style="display: none;">
+						<input type="hidden" name="s" value="$s" />
+						<input type="hidden" name="page" value="$page" />
+						<input type="hidden" name="action" value="$action" />
+						<input type="hidden" name="id" value="$id" />
+						<input type="hidden" name="send" value="send" />
+					</p>
+				</fieldset>
+			</form>
+
+		</section>
+
+	</article>
+$footer
diff --git a/templates/Froxlor/customer/email/emails_add.tpl b/templates/Froxlor/customer/email/emails_add.tpl
index 8559dc2f..13548d2c 100644
--- a/templates/Froxlor/customer/email/emails_add.tpl
+++ b/templates/Froxlor/customer/email/emails_add.tpl
@@ -7,33 +7,33 @@ $header
 					<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
 				</div>
 			</div>
-	</if>
 	<else>
-	<header>
-		<h2>
-			<img src="images/Froxlor/icons/email_add.png" alt="{$lng['emails']['emails_add']}" />&nbsp;
-			{$lng['emails']['emails_add']}
-		</h2>
-	</header>
+		<header>
+			<h2>
+				<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+				{$title}
+			</h2>
+		</header>
+
+		<section class="fullform bradiusodd">
 	
-	<section class="fullform bradiusodd">
-
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_add']}</legend>
-
-					<table class="formtable">
-						  {$email_add_form}
-					</table>
-
-					<p style="display: none;">
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
-						<input type="hidden" name="action" value="$action" />
-						<input type="hidden" name="send" value="send" />
-					</p>
-				</fieldset>
-			</form>
-	</section>
+				<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
+					<fieldset>
+						<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_add']}</legend>
+	
+						<table class="formtable">
+							  {$email_add_form}
+						</table>
+	
+						<p style="display: none;">
+							<input type="hidden" name="s" value="$s" />
+							<input type="hidden" name="page" value="$page" />
+							<input type="hidden" name="action" value="$action" />
+							<input type="hidden" name="send" value="send" />
+						</p>
+					</fieldset>
+				</form>
+		</section>
+	</if>
 </article>
 $footer
diff --git a/templates/Froxlor/customer/email/emails_edit.tpl b/templates/Froxlor/customer/email/emails_edit.tpl
index fc259a61..883e776b 100644
--- a/templates/Froxlor/customer/email/emails_edit.tpl
+++ b/templates/Froxlor/customer/email/emails_edit.tpl
@@ -2,25 +2,26 @@ $header
 <article>
 	<header>
 		<h2>
-			<img src="images/Froxlor/icons/email_edit.png" alt="{$lng['emails']['emails_edit']}" />&nbsp;
-			{$lng['emails']['emails_edit']}
+			<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+			{$title}
 		</h2>
 	</header>
-	
+
 	<section class="fullform bradiusodd">
 
 			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_edit']}</legend>
+					<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_add']}</legend>
 
 					<table class="formtable">
-            {$email_edit_form}
+						  {$email_edit_form}
 					</table>
 
 					<p style="display: none;">
 						<input type="hidden" name="s" value="$s" />
 						<input type="hidden" name="page" value="$page" />
 						<input type="hidden" name="action" value="$action" />
+						<input type="hidden" name="id" value="$id" />
 						<input type="hidden" name="send" value="send" />
 					</p>
 				</fieldset>
diff --git a/templates/Froxlor/customer/email/forwarder_add.tpl b/templates/Froxlor/customer/email/forwarder_add.tpl
index 509b7258..b0a2564f 100644
--- a/templates/Froxlor/customer/email/forwarder_add.tpl
+++ b/templates/Froxlor/customer/email/forwarder_add.tpl
@@ -2,16 +2,16 @@ $header
 <article>
 	<header>
 		<h2>
-			<img src="images/Froxlor/icons/add_autoresponder.png" alt="{$lng['emails']['forwarder_add']}" />&nbsp;
-			{$lng['emails']['forwarder_add']}
+			<img src="images/Froxlor/{$image}" alt="{$title}" />&nbsp;
+			{$title}
 		</h2>
 	</header>
-	
+
 	<section class="fullform bradiusodd">
 
 			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
 				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['forwarder_add']}</legend>
+					<legend>Froxlor&nbsp;-&nbsp;{$lng['emails']['emails_add']}</legend>
 
 					<table class="formtable">
 						  {$forwarder_add_form}