diff --git a/lng/english.lng.php b/lng/english.lng.php
index 17b5dd66..9122d13e 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1979,3 +1979,6 @@ $lng['serversettings']['phpfpm_settings']['ipcdir']['description'] = 'The direct
 $lng['panel']['news'] = 'News';
 $lng['error']['sslredirectonlypossiblewithsslipport'] = 'Using the SSL redirect is only possible when the domain has at least one ssl-enabled IP/port combination assigned.';
 $lng['error']['fcgidstillenableddeadlock'] = 'FCGID is currently active.<br />Please deactivate it before switching to another webserver than Apache2';
+$lng['error']['send_report_title'] = 'Send error report';
+$lng['error']['send_report_desc'] = 'Thank you for reporting this error and helping us to froxlor improve froxlor.<br />This is the email which will be sent to the froxlor developer team:';
+$lng['error']['send_report'] = 'Send report';
\ No newline at end of file
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 796fcf6f..81577091 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1705,3 +1705,6 @@ $lng['serversettings']['phpfpm_settings']['ipcdir']['description'] = 'In dieses
 $lng['panel']['news'] = 'Neuigkeiten';
 $lng['error']['sslredirectonlypossiblewithsslipport'] = 'Eine SSL-Weiterleitung ist nur möglich, wenn der Domain mindestens eine IP/Port Kombination zugewiesen wurde, bei der SSL aktiviert ist.';
 $lng['error']['fcgidstillenableddeadlock'] = 'FCGID ist derzeit aktiviert.<br />Bitte deaktiviere es, um einen anderen Webserver als Apache2 auswählen zu können.';
+$lng['error']['send_report_title'] = 'Fehler melden';
+$lng['error']['send_report_desc'] = 'Danke, dass Sie uns diesen Fehler melden und damit helfen Froxlor zu verbessern.<br />Folgender Bericht wird per Mail an das Froxlor Entwickler Team gesendet.';
+$lng['error']['send_report'] = 'Fehlerbericht senden';
\ No newline at end of file
diff --git a/templates/Froxlor/admin/index/send_error_report.tpl b/templates/Froxlor/admin/index/send_error_report.tpl
new file mode 100644
index 00000000..76c49e7d
--- /dev/null
+++ b/templates/Froxlor/admin/index/send_error_report.tpl
@@ -0,0 +1,43 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/display.png" alt="" />&nbsp;
+				{$lng['error']['send_report_title']}
+			</h2>
+		</header>
+
+		<section>
+			<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="send" value="send" />
+				<table class="bradiusodd">
+					<thead>
+					<tr>
+						<th>
+							<p>{$lng['error']['send_report_desc']}</p>
+						</th>
+					</tr>
+					</thead>
+					<tbody>
+					<tr>
+						<td>
+							<code>{$mail_html}</code>
+						</td>
+					</tr>
+					</tbody>
+					<tfoot>
+						<tr>
+							<td align="center">					
+								<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
+							</td>
+						</tr>
+					</tfoot>
+				</table>
+				</fieldset>
+			</form>
+		</section>
+	</article>
+$footer
diff --git a/templates/Froxlor/assets/css/main.css b/templates/Froxlor/assets/css/main.css
index 6d610246..49a64048 100644
--- a/templates/Froxlor/assets/css/main.css
+++ b/templates/Froxlor/assets/css/main.css
@@ -266,6 +266,7 @@ p.submit {
 	text-align: left;
 	padding-top: 10px;
 	padding-left: 10px;
+	padding-right: 10px;
 }
 
 .messagewrapper {
diff --git a/templates/Froxlor/customer/index/send_error_report.tpl b/templates/Froxlor/customer/index/send_error_report.tpl
new file mode 100644
index 00000000..76c49e7d
--- /dev/null
+++ b/templates/Froxlor/customer/index/send_error_report.tpl
@@ -0,0 +1,43 @@
+$header
+	<article>
+		<header>
+			<h2>
+				<img src="templates/{$theme}/assets/img/icons/display.png" alt="" />&nbsp;
+				{$lng['error']['send_report_title']}
+			</h2>
+		</header>
+
+		<section>
+			<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+				<input type="hidden" name="s" value="$s" />
+				<input type="hidden" name="page" value="$page" />
+				<input type="hidden" name="send" value="send" />
+				<table class="bradiusodd">
+					<thead>
+					<tr>
+						<th>
+							<p>{$lng['error']['send_report_desc']}</p>
+						</th>
+					</tr>
+					</thead>
+					<tbody>
+					<tr>
+						<td>
+							<code>{$mail_html}</code>
+						</td>
+					</tr>
+					</tbody>
+					<tfoot>
+						<tr>
+							<td align="center">					
+								<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
+							</td>
+						</tr>
+					</tfoot>
+				</table>
+				</fieldset>
+			</form>
+		</section>
+	</article>
+$footer
diff --git a/templates/Froxlor/misc/dberrornice.tpl b/templates/Froxlor/misc/dberrornice.tpl
index 84b00ee8..80c14961 100644
--- a/templates/Froxlor/misc/dberrornice.tpl
+++ b/templates/Froxlor/misc/dberrornice.tpl
@@ -31,9 +31,15 @@
 					<pre style="overflow:auto;"><DEBUG></pre>
 				</div>
 			</div>
-			<p class="submit">
-				<a href="#" title="Click here to go back" id="historyback">Go back</a>
-			</p>
+			<aside>
+				<div style="float:left;">
+					<a href="#" title="Click here to go back" id="historyback">Go back</a>
+				</div>
+				<div style="float:right;">
+					<a href="<LINK>" title="Click here to report error">Report error</a>
+				</div>
+				<div style="clear:both;"></div>
+			</aside>
 		</section>
 
 	</article>
@@ -44,4 +50,4 @@
 	</span>
 </footer>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/templates/Sparkle/admin/index/send_error_report.tpl b/templates/Sparkle/admin/index/send_error_report.tpl
index 6da355dd..7ddda746 100644
--- a/templates/Sparkle/admin/index/send_error_report.tpl
+++ b/templates/Sparkle/admin/index/send_error_report.tpl
@@ -2,23 +2,22 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/display_big.png" alt="" />&nbsp;
-				Send error report
+				<img src="templates/{$theme}/assets/img/icons/error_report_big.png" alt="" />&nbsp;
+				{$lng['error']['send_report_title']}
 			</h2>
 		</header>
 
-		<section>
+		<section class="fullform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<input type="hidden" name="s" value="$s" />
 				<input type="hidden" name="page" value="$page" />
 				<input type="hidden" name="send" value="send" />
-				<table class="bradius">
+				<table class="formtable">
 					<thead>
 					<tr>
 						<th>
-							<p>Thank you for reporting this error and helping us to make froxlor better.</p>
-							<p>This is the e-mail that will be sent to the froxlor developer team:</p>
+							<p>{$lng['error']['send_report_desc']}</p>
 						</th>
 					</tr>
 					</thead>
@@ -32,7 +31,7 @@ $header
 					<tfoot>
 						<tr>
 							<td align="center">					
-								<input class="bottom" type="submit" value="Send report" />
+								<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
 							</td>
 						</tr>
 					</tfoot>
diff --git a/templates/Sparkle/assets/img/icons/error_report_big.png b/templates/Sparkle/assets/img/icons/error_report_big.png
new file mode 100644
index 00000000..e3f1fbf5
Binary files /dev/null and b/templates/Sparkle/assets/img/icons/error_report_big.png differ
diff --git a/templates/Sparkle/customer/index/send_error_report.tpl b/templates/Sparkle/customer/index/send_error_report.tpl
index 6da355dd..7ddda746 100644
--- a/templates/Sparkle/customer/index/send_error_report.tpl
+++ b/templates/Sparkle/customer/index/send_error_report.tpl
@@ -2,23 +2,22 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/display_big.png" alt="" />&nbsp;
-				Send error report
+				<img src="templates/{$theme}/assets/img/icons/error_report_big.png" alt="" />&nbsp;
+				{$lng['error']['send_report_title']}
 			</h2>
 		</header>
 
-		<section>
+		<section class="fullform bradius">
 			<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
 				<fieldset>
 				<input type="hidden" name="s" value="$s" />
 				<input type="hidden" name="page" value="$page" />
 				<input type="hidden" name="send" value="send" />
-				<table class="bradius">
+				<table class="formtable">
 					<thead>
 					<tr>
 						<th>
-							<p>Thank you for reporting this error and helping us to make froxlor better.</p>
-							<p>This is the e-mail that will be sent to the froxlor developer team:</p>
+							<p>{$lng['error']['send_report_desc']}</p>
 						</th>
 					</tr>
 					</thead>
@@ -32,7 +31,7 @@ $header
 					<tfoot>
 						<tr>
 							<td align="center">					
-								<input class="bottom" type="submit" value="Send report" />
+								<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
 							</td>
 						</tr>
 					</tfoot>