diff --git a/install/templates/assets/css/install.css b/install/templates/assets/css/install.css
new file mode 100755
index 00000000..a31b0c6b
--- /dev/null
+++ b/install/templates/assets/css/install.css
@@ -0,0 +1,531 @@
+@charset "UTF-8";
+
+/* RESET */
+html,body,div,ul,ol,li,dl,dt,dd,h1,h2,h3,h4,h5,h6,pre,form,p,blockquote,fieldset,input { margin:0; padding:0; }
+h1,h2,h3,h4,h5,h6,pre,code,address,caption,cite,code,em,strong,th { font-size:1em; font-weight:400; font-style:normal; }
+ul,ol { list-style:none; }
+fieldset,img { border:none; }
+caption,th { text-align:left; }
+table { border-collapse:collapse; border-spacing:0; }
+article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section { display:block; }
+
+/* TYPE */
+html,body {
+	font:12px/18px Helvetica,Arial,Verdana,sans-serif;
+	background-color:#f2f2f2;
+	color:#333;
+	-webkit-font-smoothing: antialiased;
+}
+
+body {
+	margin:0;
+	padding:0;
+}
+
+.dark {
+	background-color: #e9edf0;
+	border-bottom:1px solid #d1d5d8;
+}
+
+header img {
+	padding:10px 0 10px 10px;
+}
+
+h1 {
+	display:none;
+}
+
+h2, h3 {
+	margin: 0 0 1em 0;
+	padding: 0;
+	font-weight: bold;
+}
+
+h2 {
+	font-size:17px;
+}
+
+h3 {
+	font-size: 15px;
+}
+
+
+img {
+	border:0;
+	vertical-align:middle;
+}
+
+td a {
+	text-decoration:none;
+}
+
+.bradius {
+	border-radius: 5px 5px 5px 5px;
+	box-shadow: rgba(0, 0, 0, 0.34902) 0px 1px 3px 0px;
+}
+
+/* FOOTER */
+footer {
+	clear:both;
+	text-align:center;
+	color: #888;
+	font-size:10px !important;
+	margin: 10px 0;
+}
+
+footer a,footer a:active,footer a:visited {
+	color: #888;
+}
+
+.install {
+	background-color:#fff;
+	margin: 20px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 12px;
+	width: 800px;
+}
+
+p {
+	margin: 0 10px !important;
+}
+
+.installsec {
+	margin-top:10px;
+	padding:0;
+	text-align:left;
+}
+
+.installsec table {
+	width:100%;
+	padding:0 10px;
+	margin: 15px 0 15px 0;
+}
+
+.installsec h2 {
+	display: block;
+	border-bottom: 1px solid #d1d5d8;
+	margin: 0;
+	padding: 5px 15px 15px 15px;
+}
+
+.installsec form {
+	width:800px;
+	margin:0 auto;
+	padding:10px 0 0;
+	text-align:left;
+}
+
+.installsec fieldset {
+	border:0;
+	float:left;
+	clear:left;
+	width:600px;
+	margin:0 100px 10px;
+	padding:0;
+}
+
+.installsec legend {
+	display:none;
+}
+
+.installsec label {
+	float:left;
+	width:26em;
+	margin-right:1em;
+	margin-top:6px;
+	text-align:left;
+}
+
+p.submit {
+	text-align:right;
+	padding-right:46px;
+}
+
+.installsec aside {
+	border-top:1px solid #d1d5d8;
+	clear:both;
+	float:none;
+	width:auto;
+	text-align: right;
+	padding: 10px;
+}
+
+.line {
+	border: 0;
+	width: 800px;
+	border-bottom:1px solid #d1d5d8;
+}
+
+.messagewrapper {
+	width:650px;
+	margin:0 auto;
+	padding:120px 0 0;
+	overflow:hidden;
+}
+
+.messagewrapperfull {
+	width:100%;
+	margin:0 auto;
+	padding:0;
+	overflow:hidden;
+}
+
+.overviewsearch {
+	position:absolute;
+	top:155px;
+	right:36px;
+	font-size:80%;
+}
+
+.overviewadd {
+	padding:10px;
+	font-weight:700;
+}
+
+/*
+ * error message display
+ */
+.errorcontainer {
+	background:url(../img/icons/error_big.png) 10px center no-repeat #ffedef;
+	border:1px solid #ffc2ca;
+	padding:10px 10px 10px 68px!important;
+	margin: 10px 0 10px 0 !important;
+	text-align:left!important;
+	overflow:hidden;
+	box-shadow: 0px 0px 0px black;
+}
+
+.errortitle {
+	font-weight:700;
+	color:#c00!important;
+}
+
+.error {
+	font-weight:400!important;
+	color:#c00!important;
+}
+
+/*
+ * warning message display
+ */
+.warningcontainer,.ui-dialog {
+	background:url(../img/icons/warning_big.png) 10px center no-repeat #fffecc;
+	border:1px solid #f3c37e;
+	padding:10px 10px 10px 68px !important;
+	margin: 10px 0 10px 0 !important;
+	text-align:left!important;
+	overflow:hidden;
+	box-shadow: 0px 0px 0px black;
+}
+.ui-dialog {
+	padding: 10px !important;
+}
+
+.warningtitle,.ui-dialog-titlebar {
+	font-weight:700;
+	color:#D57D00;
+}
+
+.warning,.ui-dialog-content {
+	color:#D57D00!important;
+}
+
+/*
+ * success message display
+ */
+.successcontainer {
+	background:url(../img/icons/ok_big.png) 10px center no-repeat #E2F9E3;
+	border:1px solid #9C9;
+	padding:10px 10px 10px 68px!important;
+	margin: 10px 0 10px 0 !important;
+	text-align:left!important;
+	overflow:hidden;
+	box-shadow: 0px 0px 0px black;
+}
+
+.successtitle {
+	font-weight:700;
+	color:#060!important;
+}
+
+.success {
+	font-weight:400!important;
+}
+
+/*
+ * neutral/info message display
+ */
+.neutralcontainer {
+	background:url(../img/icons/info_big.png) 10px center no-repeat #d2eaf6;
+	border:1px solid #b7d8ed;
+	padding:10px 10px 10px 68px!important;
+	margin: 10px 0 10px 0 !important;
+	text-align:left!important;
+	overflow:hidden;
+	box-shadow: 0px 0px 0px black;
+}
+
+.neutraltitle {
+	font-weight:700;
+	color:#3188c1!important;
+}
+
+.neutral {
+	font-weight:400!important;
+	color:#3188c1!important;
+}
+
+/* std hyperlink */
+a,a:active,a:visited {
+	color:#176fa1;
+	text-decoration:none;
+}
+
+a:hover {
+	text-decoration:underline;
+}
+
+.infotext {
+	font-size:11px;
+}
+
+/*
+ * main container
+ */
+.main {
+	margin-left:240px;
+	margin-right:10px;
+	margin-top:105px;
+	margin-bottom:0;
+	background-color:#fff;
+	padding: 30px 30px 30px 30px;
+	min-height:400px;
+}
+
+.noborder {
+	width:100%;
+	border-spacing:0;
+	border-collapse:separate;
+	border: 0;
+}
+
+.noborder td {
+	border:0;
+}
+
+table {
+	width:100%;
+	border-spacing:0;
+	border:1px solid #d1d5d8;
+	border-collapse:separate;
+	box-shadow:0px 0px 0px black !important;
+}
+
+table thead th, table th {
+	border-top: 1px solid #d1d5d8;
+	border-bottom: 1px solid #d1d5d8;
+	height: 25px !important;
+	padding: 5px 0px 5px 8px;
+	background-color: #e9edf0;
+	font-weight: bold;
+}
+table thead:first-child th, table:first-child th {
+	border-top: none !important;
+}
+
+table th {
+	border-top: 0;
+}
+th a:hover {
+	text-decoration: none;
+}
+th a img {
+}
+th a:nth-child(odd) img {
+	position: relative;
+	top: -5px;
+	left: 4px;
+}
+th a:nth-child(even) img {
+	position: relative;
+	top: 3px;
+	left: -7px;
+}
+
+table thead:first-child th {
+	border-top: 0;
+}
+
+.disabled td, .disabled td a {
+	color: #cfcfcf;
+}
+
+table tbody td {
+	border-bottom:1px dotted #ccc;
+}
+table tbody tr:last-child td {
+	border-bottom: 0;
+}
+
+.formtable {
+	width: 100%;
+	border-spacing:0;
+	border:0;
+	border-collapse:separate;
+	margin:0 0 0;
+}
+
+.formtable tbody td {
+	border:0;
+	border-bottom:1px dotted #ccc;
+	min-height: 20px;
+}
+
+.formtable label {
+	float:none;
+	display:block;
+	padding:0;
+	margin:0;
+	width:100%;
+	text-align:left;
+}
+
+td {
+	padding-top:5px;
+	padding-left:10px;
+	padding-right: 10px;
+	padding-bottom:5px;
+	min-height: 20px;
+}
+
+table tfoot td {
+	height:25px;
+	border-top: 1px solid #d1d5d8;
+	background-color: #f2f8fa;
+}
+
+.tfootleft {
+	text-align:left;
+}
+
+.maintitle {
+	padding-top:20px;
+}
+
+/* input elements */
+input {
+	background: #fff url(../img/text_align_left.png) no-repeat 5px 4px;
+	padding:2px 4px 2px 24px;
+	height:22px;
+	border: 1px solid #d9d9d9;
+	margin-bottom: 5px;
+}
+
+textarea {
+	background:#fff url(../img/text_align_left.png) no-repeat 5px 4px;
+	padding:4px 4px 2px 24px;
+	border:1px solid #d9d9d9;
+	margin-bottom: 5px;
+}
+
+input[type="password"] {
+	background:#fff url(../img/password.png) no-repeat 5px 4px;
+}
+
+input[type="button"],input[type="submit"],input[type="reset"] {
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #79bbff), color-stop(1, #378de5) );
+	background:-moz-linear-gradient( center top, #79bbff 5%, #378de5 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#79bbff', endColorstr='#378de5');
+	background-color:#79bbff;
+	-moz-border-radius:5px;
+	-webkit-border-radius:5px;
+	border-radius:5px;
+	display:inline-block;
+	color:#ffffff;
+	padding:2px 24px 2px 24px;
+	text-decoration:none;
+	text-shadow:1px 1px 0px #528ecc;
+	height: 26px;
+	margin: 0 3px 0 3px;
+}
+input[type="button"]:hover,input[type="submit"]:hover,input[type="reset"]:hover {
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #378de5), color-stop(1, #79bbff) );
+	background:-moz-linear-gradient( center top, #378de5 5%, #79bbff 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#378de5', endColorstr='#79bbff');
+	background-color:#378de5;
+}
+
+input[type="submit"],input[class="yesbutton"] {
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) );
+	background:-moz-linear-gradient( center top, #9dce2c 5%, #8cb82b 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9dce2c', endColorstr='#8cb82b');
+	background-color:#9dce2c;
+	text-shadow:1px 1px 0px #aade7c;
+}
+input[type="submit"]:hover,input[class="yesbutton"]:hover {
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #8cb82b), color-stop(1, #9dce2c) );
+	background:-moz-linear-gradient( center top, #8cb82b 5%, #9dce2c 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8cb82b', endColorstr='#9dce2c');
+	background-color:#8cb82b;
+}
+
+input[class="nobutton"],input[type="reset"] {
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #fe1a00), color-stop(1, #ce0100) );
+	background:-moz-linear-gradient( center top, #fe1a00 5%, #ce0100 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fe1a00', endColorstr='#ce0100');
+	background-color:#fe1a00;
+	text-shadow:1px 1px 0px #b23e35;
+}
+input[class="nobutton"]:hover,input[type="reset"]:hover {
+	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ce0100), color-stop(1, #fe1a00) );
+	background:-moz-linear-gradient( center top, #ce0100 5%, #fe1a00 100% );
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ce0100', endColorstr='#fe1a00');
+	background-color:#ce0100;
+}
+
+input[type="checkbox"] {
+	background:#dae7ee;
+	padding: 0;
+	margin: 0 20px 0 0;
+}
+
+input[type="radio"] { /*the span element that immediately follow the radio button */
+	margin: 0 10px 0 10px;
+	height:22px;
+}
+
+select {
+	background:#fff;
+	padding:4px;
+	border:1px solid #d9d9d9;
+	margin-bottom: 5px;
+}
+
+.maintable {
+	width:90%;
+}
+
+.update_progess {
+	padding:2em;
+	text-align:left;
+}
+
+.preconfig {
+	text-align:left;
+	margin-top:20px;
+	margin-bottom:5px;
+	margin-right:15px;
+	margin-left:15px;
+}
+
+.preconfigitem {
+	padding:.15em;
+	border-bottom:1px solid #ccc;
+}
+
+.preconfdesc {
+	display:block;
+	margin-bottom:.5em;
+	font-size:120%;
+}
\ No newline at end of file
diff --git a/install/templates/assets/img/favicon.ico b/install/templates/assets/img/favicon.ico
new file mode 100755
index 00000000..84b71747
Binary files /dev/null and b/install/templates/assets/img/favicon.ico differ
diff --git a/install/templates/assets/img/logo.png b/install/templates/assets/img/logo.png
new file mode 100755
index 00000000..58ced30f
Binary files /dev/null and b/install/templates/assets/img/logo.png differ
diff --git a/install/templates/assets/img/password.png b/install/templates/assets/img/password.png
new file mode 100755
index 00000000..e08c49ad
Binary files /dev/null and b/install/templates/assets/img/password.png differ
diff --git a/install/templates/assets/img/text_align_left.png b/install/templates/assets/img/text_align_left.png
new file mode 100755
index 00000000..37caa3ed
Binary files /dev/null and b/install/templates/assets/img/text_align_left.png differ
diff --git a/install/templates/dataform.tpl b/install/templates/dataform.tpl
old mode 100644
new mode 100755
index 074db61e..6823d22f
--- a/install/templates/dataform.tpl
+++ b/install/templates/dataform.tpl
@@ -1,6 +1,6 @@
+		<p style="margin: 20px 20px 0 !important">{$this->_lng['install']['title']}</p>
 		<form action="{$formaction}" method="get">
 			<fieldset>
-				<legend>{$this->_lng['install']['title']}</legend>
 				{$formdata}
 				<p class="submit">
 					<input type="hidden" name="check" value="1" />
@@ -8,4 +8,3 @@
 				</p>
 			</fieldset>
 		</form>
-		<aside>&nbsp;</aside>
diff --git a/install/templates/dataform2.tpl b/install/templates/dataform2.tpl
old mode 100644
new mode 100755
index 80b30848..405743a1
--- a/install/templates/dataform2.tpl
+++ b/install/templates/dataform2.tpl
@@ -1,13 +1,13 @@
+		<p style="margin: 20px 20px 0 !important">{$this->_lng['install']['welcometext']}</p>
 		<form action="{$formaction}" method="post">
+			<hr class="line">
 			<fieldset>
-				<legend>{$this->_lng['install']['welcometext']}</legend>
 				{$formdata}
-				<p class="submit">
-					<input type="hidden" name="check" value="1" />
-					<input type="hidden" name="language" value="{$language}" />
-					<input type="hidden" name="installstep" value="1" />
-					<input class="bottom" type="submit" name="submitbutton" value="{$this->_lng['click_here_to_continue']}" />
-				</p>
 			</fieldset>
-		</form>
-		<aside>&nbsp;</aside>
+			<aside>
+			<input type="hidden" name="check" value="1" />
+			<input type="hidden" name="language" value="{$language}" />
+			<input type="hidden" name="installstep" value="1" />
+			<input class="bottom" type="submit" name="submitbutton" value="{$this->_lng['click_here_to_continue']}" />
+			</aside>
+		</form>
\ No newline at end of file
diff --git a/install/templates/dataitem.tpl b/install/templates/dataitem.tpl
old mode 100644
new mode 100755
index 6332d437..fda5c207
--- a/install/templates/dataitem.tpl
+++ b/install/templates/dataitem.tpl
@@ -1,4 +1,4 @@
 <p>
-	<label for="{$fieldname}" style="widht:65%;{$style}">{$fieldlabel}:</label>&nbsp;
+	<label for="{$fieldname}" style="width:65%;{$style}">{$fieldlabel}:</label>&nbsp;
 	<input type="{$type}" name="{$fieldname}" id="{$fieldname}" value="{$fieldvalue}" {$required} />
 </p>
diff --git a/install/templates/dataitemchk.tpl b/install/templates/dataitemchk.tpl
old mode 100644
new mode 100755
index a814fb5c..f048ee16
--- a/install/templates/dataitemchk.tpl
+++ b/install/templates/dataitemchk.tpl
@@ -1,4 +1,4 @@
 <p>
-	<label for="{$fieldname}" style="widht:65%;{$style}">{$this->_lng['install']['webserver']} {$fieldlabel}:</label>
-	<input type="radio" name="webserver" id="{$fieldname}" value="{$fieldname}" {$checked} />{$fieldlabel}
+	<label for="{$fieldname}" style="width:65%;{$style}">{$this->_lng['install']['webserver']} {$fieldlabel}:</label>
+	<input type="radio" name="webserver" id="{$fieldname}" value="{$fieldname}" {$checked} /><span>{$fieldlabel}<span>
 </p>
diff --git a/install/templates/datasection.tpl b/install/templates/datasection.tpl
old mode 100644
new mode 100755
index 764ea7a1..380e92dd
--- a/install/templates/datasection.tpl
+++ b/install/templates/datasection.tpl
@@ -1 +1,2 @@
+<br />
 <h3>{$section}</h3>
diff --git a/install/templates/footer.tpl b/install/templates/footer.tpl
old mode 100644
new mode 100755
diff --git a/install/templates/header.tpl b/install/templates/header.tpl
old mode 100644
new mode 100755
index a6c6c20d..82fefaf8
--- a/install/templates/header.tpl
+++ b/install/templates/header.tpl
@@ -4,9 +4,9 @@
 	<meta charset="utf-8" />
 	<meta http-equiv="Default-Style" content="text/css" />
 	<!--[if lt IE 9]><script src="../js/html5shiv.js"></script><![endif]-->
-	<link href="../templates/{$theme}/assets/css/main.css" rel="stylesheet" type="text/css" />
+	<link href="templates/assets/css/install.css" rel="stylesheet" type="text/css" />
 	<!--[if IE]><link rel="stylesheet" href="../templates/{$theme}/css/main_ie.css" type="text/css" /><![endif]-->
-	<link href="../templates/{$theme}/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
+	<link href="templates/assets/img/favicon.ico" rel="icon" type="image/x-icon" />
 	<title>Froxlor Server Management Panel - Installation</title>
 	<style type="text/css">
 	body {
@@ -15,4 +15,4 @@
 	</style>
 </head>
 <body>
-	<div class="loginpage">
+	<div class="installsec">
diff --git a/install/templates/lngform.tpl b/install/templates/lngform.tpl
old mode 100644
new mode 100755
index 1e9c16a9..cd655c95
--- a/install/templates/lngform.tpl
+++ b/install/templates/lngform.tpl
@@ -6,11 +6,9 @@
 					<select name="language" id="language">
 						{$language_options}
 					</select>
-				</p>
-				<p class="submit">
 					<input type="hidden" name="check" value="1" />
 					<input type="submit" name="chooselang" value="{$this->_lng['install']['lngbtn_go']}" />
 				</p>
 			</fieldset>
 		</form>
-		<aside>&nbsp;</aside>
+		<hr class="line">
\ No newline at end of file
diff --git a/install/templates/page.tpl b/install/templates/page.tpl
old mode 100644
new mode 100755
diff --git a/install/templates/pagebottom.tpl b/install/templates/pagebottom.tpl
old mode 100644
new mode 100755
diff --git a/install/templates/textarea.tpl b/install/templates/textarea.tpl
old mode 100644
new mode 100755
diff --git a/templates/Sparkle/admin/aps/manage_instances.tpl b/templates/Sparkle/admin/aps/manage_instances.tpl
index 43cbbbd4..ee3215da 100644
--- a/templates/Sparkle/admin/aps/manage_instances.tpl
+++ b/templates/Sparkle/admin/aps/manage_instances.tpl
@@ -1,7 +1,7 @@
 <article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
 				{$lng['aps']['specialoptions']}
 			</h2>
 		</header>
@@ -21,7 +21,7 @@
 <article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
 				{$lng['aps']['manageinstances']}
 			</h2>
 		</header>
diff --git a/templates/Sparkle/admin/aps/manage_packages.tpl b/templates/Sparkle/admin/aps/manage_packages.tpl
index e9cbcce7..512b472a 100644
--- a/templates/Sparkle/admin/aps/manage_packages.tpl
+++ b/templates/Sparkle/admin/aps/manage_packages.tpl
@@ -1,7 +1,7 @@
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
+			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
 			{$lng['aps']['specialoptions']}
 		</h2>
 	</header>
@@ -62,7 +62,7 @@
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
+			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
 			{$lng['aps']['managepackages']}
 		</h2>
 	</header>
diff --git a/templates/Sparkle/admin/aps/manage_packages_download.tpl b/templates/Sparkle/admin/aps/manage_packages_download.tpl
index 2db11f92..f20eed37 100644
--- a/templates/Sparkle/admin/aps/manage_packages_download.tpl
+++ b/templates/Sparkle/admin/aps/manage_packages_download.tpl
@@ -1,7 +1,7 @@
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
+			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
 			{$lng['aps']['specialoptions']}
 		</h2>
 	</header>
diff --git a/templates/Sparkle/admin/aps/upload.tpl b/templates/Sparkle/admin/aps/upload.tpl
index 6ef5982e..a07e5564 100644
--- a/templates/Sparkle/admin/aps/upload.tpl
+++ b/templates/Sparkle/admin/aps/upload.tpl
@@ -1,7 +1,7 @@
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_upload.png" alt="" />&nbsp;
+			<img src="templates/{$theme}/assets/img/icons/aps_upload_big.png" alt="" />&nbsp;
 			{$lng['aps']['upload']}
 		</h2>
 	</header>
diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl
index b04666b2..2780f252 100644
--- a/templates/Sparkle/admin/index/index.tpl
+++ b/templates/Sparkle/admin/index/index.tpl
@@ -3,9 +3,9 @@ $header
 
 	<if 0 < $awaitingtickets && $settings['ticket']['enabled'] == 1 >
 	<div class="messagewrapperfull">
-		<div class="warningcontainer bradius">
-			<div class="warningtitle">{$lng['admin']['warning']}</div>
-			<div class="warning"><br /><strong>{$awaitingtickets_text}</strong></div>
+		<div class="neutralcontainer bradius">
+			<div class="neutraltitle">{$lng['admin']['note']}</div>
+			<div class="neutral">{$awaitingtickets_text}</div>
 		</div>
 	</div>
 	</if>
diff --git a/templates/Sparkle/admin/phpconfig/overview.tpl b/templates/Sparkle/admin/phpconfig/overview.tpl
index 9f2311a4..1839a598 100644
--- a/templates/Sparkle/admin/phpconfig/overview.tpl
+++ b/templates/Sparkle/admin/phpconfig/overview.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/phpsettings.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/phpsettings_big.png" alt="" />&nbsp;
 				{$lng['menue']['phpsettings']['maintitle']}
 			</h2>
 		</header>
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 64adb1c8..7f3584a8 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -11,9 +11,10 @@ article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section {
 
 /* TYPE */
 html,body {
-	font:12px/18px "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;
+	font:12px/18px Helvetica,Arial,Verdana,sans-serif;
 	background-color:#f2f2f2;
 	color:#333;
+	-webkit-font-smoothing: antialiased;
 }
 
 body {
@@ -64,8 +65,8 @@ td a {
 }
 
 .topheader {
-	background: #e9edf0;
-	background: rgba(234,238,240,0.9);
+	background: #fafafa;
+	background: rgba(250,250,250,0.9);
 	top: 0px;
 	width: 100%;
 	padding: 2px 0 0 5px;
@@ -75,16 +76,17 @@ td a {
 }
 .topheader_navigation {
 	float: right;
-	margin: 35px 40px 0 0;
+	margin: 36px 50px 0 0;
+	text-transform: uppercase;
 }
 
 /* TOPHEADER NAV */
 ul.topheadernav {
 	list-style-type: none;
-	font-size: 14px;
+	font-size: 13px;
 }
 ul.topheadernav li {
-	padding: 0 0 0 30px;
+	padding: 0 0 0 50px;
 	float: left;
 	position: relative;
 }
@@ -109,7 +111,7 @@ ul.topheadernav li:hover ul {
 }
 ul.topheadernav li ul li {
 	font-size: 11px;
-	margin-left: -30px;
+	margin-left: -50px;
 }
 ul.topheadernav li ul li a:hover {
 	color: #111;
@@ -145,6 +147,10 @@ footer a,footer a:active,footer a:visited {
 	margin-bottom: 12px;
 	width: 600px;
 }
+.login div.warningcontainer, .login div.errorcontainer, .login div.successcontainer {
+	margin: 10px !important;
+}
+
 .install {
 	width: 800px;
 }
@@ -286,15 +292,18 @@ p.submit {
 	clear:both;
 	float:none;
 	width:auto;
-	text-align:left;
-	padding-top:10px;
-	padding-left:10px;
+	text-align: left;
+	padding: 10px 10px 0 10px;
 }
 .installsec aside {
 	text-align: right;
 	padding: 10px;
 }
 
+aside.right {
+	text-align: right;
+}
+
 .messagewrapper {
 	width:650px;
 	margin:0 auto;
@@ -344,6 +353,7 @@ p.submit {
 	color:#c00!important;
 }
 
+
 /*
  * warning message display
  */
diff --git a/templates/Sparkle/customer/aps/installer.tpl b/templates/Sparkle/customer/aps/installer.tpl
index ef936318..21bcc03b 100644
--- a/templates/Sparkle/customer/aps/installer.tpl
+++ b/templates/Sparkle/customer/aps/installer.tpl
@@ -1,7 +1,7 @@
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="{$Xml->name}" />&nbsp;
+			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="{$Xml->name}" />&nbsp;
 			{$Xml->name}
 		</h2>
 	</header>
diff --git a/templates/Sparkle/customer/aps/package.tpl b/templates/Sparkle/customer/aps/package.tpl
index 18f6204e..7aada2b8 100644
--- a/templates/Sparkle/customer/aps/package.tpl
+++ b/templates/Sparkle/customer/aps/package.tpl
@@ -1,7 +1,7 @@
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="{$Xml->name}" />&nbsp;
+			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="{$Xml->name}" />&nbsp;
 			{$Xml->name}
 		</h2>
 	</header>
diff --git a/templates/Sparkle/customer/aps/package_status.tpl b/templates/Sparkle/customer/aps/package_status.tpl
index 35982810..9979c274 100644
--- a/templates/Sparkle/customer/aps/package_status.tpl
+++ b/templates/Sparkle/customer/aps/package_status.tpl
@@ -1,7 +1,7 @@
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="{$Xml->name}" />&nbsp;
+			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="{$Xml->name}" />&nbsp;
 			{$Xml->name}
 		</h2>
 	</header>
diff --git a/templates/Sparkle/customer/aps/search.tpl b/templates/Sparkle/customer/aps/search.tpl
index 97ec712a..dee840fb 100644
--- a/templates/Sparkle/customer/aps/search.tpl
+++ b/templates/Sparkle/customer/aps/search.tpl
@@ -1,7 +1,7 @@
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt=""{$lng['aps']['search']} />&nbsp;
+			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt=""{$lng['aps']['search']} />&nbsp;
 			{$lng['aps']['search']}
 		</h2>
 	</header>
diff --git a/templates/Sparkle/header.tpl b/templates/Sparkle/header.tpl
index eb47ee8f..57668873 100644
--- a/templates/Sparkle/header.tpl
+++ b/templates/Sparkle/header.tpl
@@ -45,7 +45,7 @@
 	<div class="topheader_navigation">
 		<ul class="topheadernav">
 			<li><a href="{$linker->getLink(array('section' => 'index'))}">{$lng['admin']['overview']}</a></li>
-			<li><a href="#">{$lng['panel']['options']}</a>
+			<li><a href="#">{$lng['panel']['options']}&nbsp;&#x25BE;</a>
 				<ul>
 					<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_password'))}">{$lng['login']['password']}</a></li>
 					<li><a href="{$linker->getLink(array('section' => 'index', 'page' => 'change_language'))}">{$lng['login']['language']}</a></li>
diff --git a/templates/Sparkle/misc/alreadyinstalledhint.tpl b/templates/Sparkle/misc/alreadyinstalledhint.tpl
index 3f206c41..e2baaff7 100644
--- a/templates/Sparkle/misc/alreadyinstalledhint.tpl
+++ b/templates/Sparkle/misc/alreadyinstalledhint.tpl
@@ -28,12 +28,14 @@
 			<h2>Welcome to Froxlor</h2>
 			<p>It seems that Froxlor has already been configured.</p>
 			<p>Click on the link below to go to the login page.</p>
-			<p class="submit">
+			<p>&nbsp;</p>
+			<aside class="right">
 				<a href="../index.php" title="Click to go to the login page">Go to login</a>
-			</p>
+			</aside>
 		</section>
 
 	</article>
+
 </div>
 <footer>
 	<span>
diff --git a/templates/Sparkle/misc/configurehint.tpl b/templates/Sparkle/misc/configurehint.tpl
index 3c77f6e0..2c806055 100644
--- a/templates/Sparkle/misc/configurehint.tpl
+++ b/templates/Sparkle/misc/configurehint.tpl
@@ -27,9 +27,10 @@
 			<h2>Welcome to Froxlor</h2>
 			<p>It seems that Froxlor has not been installed yet.</p>
 			<p>Click on the link below to start the installation.</p>
-			<p class="submit">
+			<p>&nbsp;</p>
+			<aside class="right">
 				<a href="./install/install.php" title="Click to start the install process">Start install</a>
-			</p>
+			</aside>
 		</section>
 
 	</article>