diff --git a/templates/Sparkle/admin/admins/admins.tpl b/templates/Sparkle/admin/admins/admins.tpl
index e0b9c320..d4e98ae2 100644
--- a/templates/Sparkle/admin/admins/admins.tpl
+++ b/templates/Sparkle/admin/admins/admins.tpl
@@ -16,7 +16,7 @@ $header
 			</div>
 
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/user_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />
 				<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['admin_add']}</a>
 			</div>
 
@@ -55,7 +55,7 @@ $header
 
 			<if 15 < $count >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/user_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />
 					<a href="{$linker->getLink(array('section' => 'admins', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['admin_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/admin/customers/customers.tpl b/templates/Sparkle/admin/customers/customers.tpl
index 72b43f83..26383551 100644
--- a/templates/Sparkle/admin/customers/customers.tpl
+++ b/templates/Sparkle/admin/customers/customers.tpl
@@ -11,16 +11,16 @@ $header
 
 			<form action="{$linker->getLink(array('section' => 'customers'))}" method="post" enctype="application/x-www-form-urlencoded">
 
-			<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
-				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/user_add.png" alt="" />&nbsp;
-					<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
-				</div>
-			</if>
-			
 			<div class="overviewsearch">
 				{$searchcode}
 			</div>
+			
+			<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
+				<div class="overviewadd">
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
+					<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
+				</div>
+			</if>
 
 			<table class="bradius">
 			<thead>
@@ -63,7 +63,7 @@ $header
 
 			<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $userinfo['customers_used'] >
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/user_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['customer_add']}</a>
 			</div>
 			</if>
diff --git a/templates/Sparkle/admin/domains/domains.tpl b/templates/Sparkle/admin/domains/domains.tpl
index 99e4bd2e..e853c5fe 100644
--- a/templates/Sparkle/admin/domains/domains.tpl
+++ b/templates/Sparkle/admin/domains/domains.tpl
@@ -17,7 +17,7 @@
 
 			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && $countcustomers !=0 >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/domain_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a>
 				</div>
 			</if>
@@ -63,7 +63,7 @@
 
 			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && 15 < $count && 0 < $countcustomers >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/domain_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'domains', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['domain_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/admin/index/change_password.tpl b/templates/Sparkle/admin/index/change_password.tpl
index 06056f55..b25df796 100644
--- a/templates/Sparkle/admin/index/change_password.tpl
+++ b/templates/Sparkle/admin/index/change_password.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/encrypted_big.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="" />&nbsp;
 				{$lng['menue']['main']['changepassword']}
 			</h2>
 		</header>
diff --git a/templates/Sparkle/admin/ipsandports/ipsandports.tpl b/templates/Sparkle/admin/ipsandports/ipsandports.tpl
index 505f97ca..32b9a7ac 100644
--- a/templates/Sparkle/admin/ipsandports/ipsandports.tpl
+++ b/templates/Sparkle/admin/ipsandports/ipsandports.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/ipsports.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/ipsports_big.png" alt="" />&nbsp;
 				{$lng['admin']['ipsandports']['ipsandports']}
 			</h2>
 		</header>
@@ -16,7 +16,7 @@ $header
 			</div>
 
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/ipsports_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a>
 			</div>
 
@@ -55,7 +55,7 @@ $header
 
 			<if 15 < $count>
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/ipsports_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'ipsandports', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['ipsandports']['add']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/admin/logger/logger.tpl b/templates/Sparkle/admin/logger/logger.tpl
index b5ba3828..6c4a3c83 100644
--- a/templates/Sparkle/admin/logger/logger.tpl
+++ b/templates/Sparkle/admin/logger/logger.tpl
@@ -17,7 +17,7 @@ $header
 
 			
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/syslog_truncate.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/delete.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'logger', 'page' => 'log', 'action' => 'truncate'))}">{$lng['logger']['truncate']}</a>
 			</div>
 
@@ -45,7 +45,7 @@ $header
 
 			<if 15 < $log_count >
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/syslog_truncate.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/delete.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'logger', 'page' => 'log', 'action' => 'truncate'))}">{$lng['logger']['truncate']}</a>
 			</div>
 			</if>
diff --git a/templates/Sparkle/admin/phpconfig/overview.tpl b/templates/Sparkle/admin/phpconfig/overview.tpl
index 72c48ed7..dc957005 100644
--- a/templates/Sparkle/admin/phpconfig/overview.tpl
+++ b/templates/Sparkle/admin/phpconfig/overview.tpl
@@ -10,7 +10,7 @@ $header
 		<section>
 
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/phpsettings_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
 			</div>
 
@@ -30,7 +30,7 @@ $header
 			
 			<if 15 < $count>
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/phpsettings_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'phpsettings', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['phpsettings']['addnew']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/admin/phpconfig/overview_add.tpl b/templates/Sparkle/admin/phpconfig/overview_add.tpl
index 618c1587..21e990f6 100644
--- a/templates/Sparkle/admin/phpconfig/overview_add.tpl
+++ b/templates/Sparkle/admin/phpconfig/overview_add.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/{$image}" alt="{$title}" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/phpsettings_add_big.png" alt="{$title}" />&nbsp;
 				{$title}
 			</h2>
 		</header>
diff --git a/templates/Sparkle/admin/phpconfig/overview_edit.tpl b/templates/Sparkle/admin/phpconfig/overview_edit.tpl
index 5150c087..1c5d077d 100644
--- a/templates/Sparkle/admin/phpconfig/overview_edit.tpl
+++ b/templates/Sparkle/admin/phpconfig/overview_edit.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/{$image}" alt="{$title}" />&nbsp;
+				<img src="templates/{$theme}/assets/img/phpsettings_edit_big.png" alt="{$title}" />&nbsp;
 				{$title}
 			</h2>
 		</header>
diff --git a/templates/Sparkle/admin/templates/templates.tpl b/templates/Sparkle/admin/templates/templates.tpl
index 88e6a726..61657d65 100644
--- a/templates/Sparkle/admin/templates/templates.tpl
+++ b/templates/Sparkle/admin/templates/templates.tpl
@@ -10,7 +10,7 @@ $header
 		<section>
 			<if $add>
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/templates_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'add'))}">{$lng['admin']['templates']['template_add']}</a>
 				</div>
 			</if>
@@ -42,7 +42,7 @@ $header
 		<section>
 			<if $filetemplateadd>
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/templates_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'templates', 'page' => $page, 'action' => 'add', 'files' => 'files'))}">{$lng['admin']['templates']['template_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/admin/tickets/archived_tickets.tpl b/templates/Sparkle/admin/tickets/archived_tickets.tpl
index e5d2174e..fd025b67 100644
--- a/templates/Sparkle/admin/tickets/archived_tickets.tpl
+++ b/templates/Sparkle/admin/tickets/archived_tickets.tpl
@@ -6,7 +6,7 @@
 	<td>{$ticket['priority']}</td>
 	<td>
 		<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'archive', 'action' => 'view', 'id' => $ticket['id']))}" style="text-decoration:none;">
-			<img src="templates/{$theme}/assets/img/icons/ticket_show.png" alt="{$lng['ticket']['show']}"/>
+			<img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['ticket']['show']}"/>
 		</a>
 	</td>
 </tr>
diff --git a/templates/Sparkle/admin/tickets/categories.tpl b/templates/Sparkle/admin/tickets/categories.tpl
index 45a4f132..ea8a9288 100644
--- a/templates/Sparkle/admin/tickets/categories.tpl
+++ b/templates/Sparkle/admin/tickets/categories.tpl
@@ -16,7 +16,7 @@ $header
 			</div>
 
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/categories_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'categories', 'action' => 'addcategory'))}">{$lng['ticket']['ticket_newcateory']}</a>
 			</div>
 
@@ -51,7 +51,7 @@ $header
 
 			<if 15 < $categories_count >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/categories_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'categories', 'action' => 'addcategory'))}">{$lng['ticket']['ticket_newcateory']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/admin/tickets/tickets.tpl b/templates/Sparkle/admin/tickets/tickets.tpl
index 31d7d02a..27f2f797 100644
--- a/templates/Sparkle/admin/tickets/tickets.tpl
+++ b/templates/Sparkle/admin/tickets/tickets.tpl
@@ -17,7 +17,7 @@ $header
 
 			<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && $countcustomers !=0 >
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/ticket_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a>
 			</div>
 			</if>
@@ -56,7 +56,7 @@ $header
 
 			<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && 15 < $tickets_count >
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/ticket_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a>
 			</div>
 			</if>
diff --git a/templates/Sparkle/admin/tickets/tickets_tickets.tpl b/templates/Sparkle/admin/tickets/tickets_tickets.tpl
index 2dd54cb5..d618966d 100644
--- a/templates/Sparkle/admin/tickets/tickets_tickets.tpl
+++ b/templates/Sparkle/admin/tickets/tickets_tickets.tpl
@@ -8,24 +8,24 @@
 	<td>
 		<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'answer', 'id' => $row['id']))}" style="text-decoration:none;">
 			<if $cananswer < 1 >
-				<img src="templates/{$theme}/assets/img/icons/ticket_show.png" alt="{$lng['ticket']['show']}"/>
+				<img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['ticket']['show']}"/>
 			</if>
 			<if 0 < $cananswer >
-				<img src="templates/{$theme}/assets/img/icons/ticket_answer.png" alt="{$lng['ticket']['answer']}"/>
+				<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['ticket']['answer']}"/>
 			</if>
 		</a>
 		<if $reopen < 1 >
 			&nbsp;<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'close', 'id' => $row['id']))}" style="text-decoration:none;">
-				<img src="templates/{$theme}/assets/img/icons/ticket_close.png" alt="{$lng['ticket']['close']}"/>
+				<img src="templates/{$theme}/assets/img/icons/lock.png" alt="{$lng['ticket']['close']}"/>
 			</a>
 		</if>
 		<if 0 < $reopen >
 			&nbsp;<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'reopen', 'id' => $row['id']))}" style="text-decoration:none;">
-				<img src="templates/{$theme}/assets/img/icons/ticket_reopen.png" alt="{$lng['ticket']['reopen']}"/>
+				<img src="templates/{$theme}/assets/img/icons/unlock.png" alt="{$lng['ticket']['reopen']}"/>
 			</a>
 		</if>
 		&nbsp;<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'archive', 'id' => $row['id']))}" style="text-decoration:none;">
-			<img src="templates/{$theme}/assets/img/icons/ticket_archive.png" alt="{$lng['ticket']['archive']}"/>
+			<img src="templates/{$theme}/assets/img/icons/archive.png" alt="{$lng['ticket']['archive']}"/>
 		</a>
 		&nbsp;<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
 			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}"/>
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 00a66f3e..becb223a 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -197,12 +197,8 @@ footer img {
 	margin: 10px !important;
 }
 
-.tinyform input {
-	/*width:50%;*/
-}
-
-.tinyform input[type="checkbox"] {
-	width:auto;
+table.tinyform input {
+	width:120px;
 }
 
 .fullform,.midform,.installsec {
@@ -667,7 +663,7 @@ input[type="text"], input[type="password"] {
 }
 
 input[type="password"] {
-	background:#fff url(../img/icons/password.png) no-repeat 5px 4px;
+	background:#fff url(../img/icons/lock.png) no-repeat 5px 4px;
 }
 
 /*
@@ -680,7 +676,7 @@ input[type="button"],input[type="submit"],input[type="reset"] {
 	border: 0;
 	background-color: #eee;
 	min-width: 80px;
-	height: 26px;
+	height: 28px;
 	background-image: none;
 	border-width: 0px;
 }
diff --git a/templates/Sparkle/assets/img/icons/sort_up.png b/templates/Sparkle/assets/img/icons/add.png
similarity index 83%
rename from templates/Sparkle/assets/img/icons/sort_up.png
rename to templates/Sparkle/assets/img/icons/add.png
index 956e1d4a..63a3f17e 100644
Binary files a/templates/Sparkle/assets/img/icons/sort_up.png and b/templates/Sparkle/assets/img/icons/add.png differ
diff --git a/templates/Sparkle/assets/img/icons/aps.png b/templates/Sparkle/assets/img/icons/archive.png
similarity index 77%
rename from templates/Sparkle/assets/img/icons/aps.png
rename to templates/Sparkle/assets/img/icons/archive.png
index 95b23e7d..671ff139 100644
Binary files a/templates/Sparkle/assets/img/icons/aps.png and b/templates/Sparkle/assets/img/icons/archive.png differ
diff --git a/templates/Sparkle/assets/img/icons/archive_ticket.png b/templates/Sparkle/assets/img/icons/archive_ticket.png
deleted file mode 100644
index 38ccf819..00000000
Binary files a/templates/Sparkle/assets/img/icons/archive_ticket.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/autoresponder.png b/templates/Sparkle/assets/img/icons/autoresponder.png
deleted file mode 100644
index 7d9c6420..00000000
Binary files a/templates/Sparkle/assets/img/icons/autoresponder.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/autoresponder_add.png b/templates/Sparkle/assets/img/icons/autoresponder_add.png
deleted file mode 100644
index b4163f29..00000000
Binary files a/templates/Sparkle/assets/img/icons/autoresponder_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/autoresponder_edit.png b/templates/Sparkle/assets/img/icons/autoresponder_edit.png
deleted file mode 100644
index 1e9a31b4..00000000
Binary files a/templates/Sparkle/assets/img/icons/autoresponder_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/backup.png b/templates/Sparkle/assets/img/icons/backup.png
deleted file mode 100644
index 913ab437..00000000
Binary files a/templates/Sparkle/assets/img/icons/backup.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/categories.png b/templates/Sparkle/assets/img/icons/categories.png
deleted file mode 100644
index 913ab437..00000000
Binary files a/templates/Sparkle/assets/img/icons/categories.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/categories_add.png b/templates/Sparkle/assets/img/icons/categories_add.png
deleted file mode 100644
index 25bacbe4..00000000
Binary files a/templates/Sparkle/assets/img/icons/categories_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/categories_edit.png b/templates/Sparkle/assets/img/icons/categories_edit.png
deleted file mode 100644
index 0fca50f6..00000000
Binary files a/templates/Sparkle/assets/img/icons/categories_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_add.png b/templates/Sparkle/assets/img/icons/clock_add.png
deleted file mode 100644
index ed98a65e..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_add_big.png b/templates/Sparkle/assets/img/icons/clock_add_big.png
deleted file mode 100644
index 23aaa99c..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_add_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_delete.png b/templates/Sparkle/assets/img/icons/clock_delete.png
deleted file mode 100644
index a9556459..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_delete.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_delete_big.png b/templates/Sparkle/assets/img/icons/clock_delete_big.png
deleted file mode 100644
index 1ec63ff3..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_delete_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_edit.png b/templates/Sparkle/assets/img/icons/clock_edit.png
deleted file mode 100644
index e1733730..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_error.png b/templates/Sparkle/assets/img/icons/clock_error.png
deleted file mode 100644
index 0d4ff82c..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_error.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_go.png b/templates/Sparkle/assets/img/icons/clock_go.png
deleted file mode 100644
index 8465083b..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_go.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_link.png b/templates/Sparkle/assets/img/icons/clock_link.png
deleted file mode 100644
index 481cf04c..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_link.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_pause.png b/templates/Sparkle/assets/img/icons/clock_pause.png
deleted file mode 100644
index c469d03e..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_pause.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_play.png b/templates/Sparkle/assets/img/icons/clock_play.png
deleted file mode 100644
index 62063bf8..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_play.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_red.png b/templates/Sparkle/assets/img/icons/clock_red.png
deleted file mode 100644
index 2842cc33..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_red.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/clock_stop.png b/templates/Sparkle/assets/img/icons/clock_stop.png
deleted file mode 100644
index 6fe8a6f9..00000000
Binary files a/templates/Sparkle/assets/img/icons/clock_stop.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/delete_big.png b/templates/Sparkle/assets/img/icons/delete_big.png
deleted file mode 100644
index 8c2df452..00000000
Binary files a/templates/Sparkle/assets/img/icons/delete_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/display.png b/templates/Sparkle/assets/img/icons/display.png
deleted file mode 100644
index 4855df01..00000000
Binary files a/templates/Sparkle/assets/img/icons/display.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/domain_add.png b/templates/Sparkle/assets/img/icons/domain_add.png
deleted file mode 100644
index c9b8de3a..00000000
Binary files a/templates/Sparkle/assets/img/icons/domain_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/domain_edit.png b/templates/Sparkle/assets/img/icons/domain_edit.png
deleted file mode 100644
index 93796b2e..00000000
Binary files a/templates/Sparkle/assets/img/icons/domain_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/domains.png b/templates/Sparkle/assets/img/icons/domains.png
deleted file mode 100644
index 3f5a02bd..00000000
Binary files a/templates/Sparkle/assets/img/icons/domains.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/edit_big.png b/templates/Sparkle/assets/img/icons/edit_big.png
deleted file mode 100644
index 577a3ed8..00000000
Binary files a/templates/Sparkle/assets/img/icons/edit_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/email_add.png b/templates/Sparkle/assets/img/icons/email_add.png
deleted file mode 100644
index 21989cd3..00000000
Binary files a/templates/Sparkle/assets/img/icons/email_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/email_edit.png b/templates/Sparkle/assets/img/icons/email_edit.png
deleted file mode 100644
index 090bc682..00000000
Binary files a/templates/Sparkle/assets/img/icons/email_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/email_forwarder_add.png b/templates/Sparkle/assets/img/icons/email_forwarder_add.png
deleted file mode 100644
index 97ded37c..00000000
Binary files a/templates/Sparkle/assets/img/icons/email_forwarder_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/emails.png b/templates/Sparkle/assets/img/icons/emails.png
deleted file mode 100644
index d60f46c4..00000000
Binary files a/templates/Sparkle/assets/img/icons/emails.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/error.png b/templates/Sparkle/assets/img/icons/error.png
deleted file mode 100644
index 1f010b77..00000000
Binary files a/templates/Sparkle/assets/img/icons/error.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/find.png b/templates/Sparkle/assets/img/icons/find.png
deleted file mode 100644
index 6896a4bd..00000000
Binary files a/templates/Sparkle/assets/img/icons/find.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/find_big.png b/templates/Sparkle/assets/img/icons/find_big.png
deleted file mode 100644
index 6fcc05a4..00000000
Binary files a/templates/Sparkle/assets/img/icons/find_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/folder.gif b/templates/Sparkle/assets/img/icons/folder.gif
deleted file mode 100644
index 648dfcd9..00000000
Binary files a/templates/Sparkle/assets/img/icons/folder.gif and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/group_edit.png b/templates/Sparkle/assets/img/icons/group_edit.png
deleted file mode 100644
index 4c66760d..00000000
Binary files a/templates/Sparkle/assets/img/icons/group_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/help.png b/templates/Sparkle/assets/img/icons/help.png
deleted file mode 100644
index d42f972a..00000000
Binary files a/templates/Sparkle/assets/img/icons/help.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/htaccess.png b/templates/Sparkle/assets/img/icons/htaccess.png
deleted file mode 100644
index 3c722765..00000000
Binary files a/templates/Sparkle/assets/img/icons/htaccess.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/htaccess_add.png b/templates/Sparkle/assets/img/icons/htaccess_add.png
deleted file mode 100644
index 627580ab..00000000
Binary files a/templates/Sparkle/assets/img/icons/htaccess_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/htaccess_edit_big copy.png b/templates/Sparkle/assets/img/icons/htaccess_edit_big copy.png
deleted file mode 100644
index fc218367..00000000
Binary files a/templates/Sparkle/assets/img/icons/htaccess_edit_big copy.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/htpasswd.png b/templates/Sparkle/assets/img/icons/htpasswd.png
deleted file mode 100644
index 3c722765..00000000
Binary files a/templates/Sparkle/assets/img/icons/htpasswd.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/htpasswd_add.png b/templates/Sparkle/assets/img/icons/htpasswd_add.png
deleted file mode 100644
index 627580ab..00000000
Binary files a/templates/Sparkle/assets/img/icons/htpasswd_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/htpasswd_edit.png b/templates/Sparkle/assets/img/icons/htpasswd_edit.png
deleted file mode 100644
index dbcfacd8..00000000
Binary files a/templates/Sparkle/assets/img/icons/htpasswd_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/htpasswd_edit_big copy.png b/templates/Sparkle/assets/img/icons/htpasswd_edit_big copy.png
deleted file mode 100644
index fc218367..00000000
Binary files a/templates/Sparkle/assets/img/icons/htpasswd_edit_big copy.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/info.png b/templates/Sparkle/assets/img/icons/info.png
deleted file mode 100644
index 97a405c4..00000000
Binary files a/templates/Sparkle/assets/img/icons/info.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ipsports.png b/templates/Sparkle/assets/img/icons/ipsports.png
deleted file mode 100644
index 2c161f29..00000000
Binary files a/templates/Sparkle/assets/img/icons/ipsports.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ipsports_add.png b/templates/Sparkle/assets/img/icons/ipsports_add.png
deleted file mode 100644
index 43998539..00000000
Binary files a/templates/Sparkle/assets/img/icons/ipsports_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ipsports_edit.png b/templates/Sparkle/assets/img/icons/ipsports_edit.png
deleted file mode 100644
index 6a454563..00000000
Binary files a/templates/Sparkle/assets/img/icons/ipsports_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/link.gif b/templates/Sparkle/assets/img/icons/link.gif
deleted file mode 100644
index 7640489a..00000000
Binary files a/templates/Sparkle/assets/img/icons/link.gif and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/link.png b/templates/Sparkle/assets/img/icons/link.png
deleted file mode 100644
index 045b1a55..00000000
Binary files a/templates/Sparkle/assets/img/icons/link.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/link_big.png b/templates/Sparkle/assets/img/icons/link_big.png
deleted file mode 100644
index f200b700..00000000
Binary files a/templates/Sparkle/assets/img/icons/link_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/encrypted.png b/templates/Sparkle/assets/img/icons/lock.png
similarity index 100%
rename from templates/Sparkle/assets/img/icons/encrypted.png
rename to templates/Sparkle/assets/img/icons/lock.png
diff --git a/templates/Sparkle/assets/img/icons/encrypted_big.png b/templates/Sparkle/assets/img/icons/lock_big.png
similarity index 100%
rename from templates/Sparkle/assets/img/icons/encrypted_big.png
rename to templates/Sparkle/assets/img/icons/lock_big.png
diff --git a/templates/Sparkle/assets/img/icons/mail.png b/templates/Sparkle/assets/img/icons/mail.png
deleted file mode 100644
index d60f46c4..00000000
Binary files a/templates/Sparkle/assets/img/icons/mail.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/mail_big.png b/templates/Sparkle/assets/img/icons/mail_big.png
deleted file mode 100644
index 36cf4091..00000000
Binary files a/templates/Sparkle/assets/img/icons/mail_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/messages.png b/templates/Sparkle/assets/img/icons/messages.png
deleted file mode 100644
index 152da025..00000000
Binary files a/templates/Sparkle/assets/img/icons/messages.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/mysql.png b/templates/Sparkle/assets/img/icons/mysql.png
deleted file mode 100644
index af2ce4a1..00000000
Binary files a/templates/Sparkle/assets/img/icons/mysql.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/mysql_add.png b/templates/Sparkle/assets/img/icons/mysql_add.png
deleted file mode 100644
index c77b9938..00000000
Binary files a/templates/Sparkle/assets/img/icons/mysql_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/mysql_edit.png b/templates/Sparkle/assets/img/icons/mysql_edit.png
deleted file mode 100644
index fa00fdbc..00000000
Binary files a/templates/Sparkle/assets/img/icons/mysql_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/mysqls.png b/templates/Sparkle/assets/img/icons/mysqls.png
deleted file mode 100644
index 58b85a87..00000000
Binary files a/templates/Sparkle/assets/img/icons/mysqls.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/mysqls_big.png b/templates/Sparkle/assets/img/icons/mysqls_big.png
deleted file mode 100644
index 28f74c99..00000000
Binary files a/templates/Sparkle/assets/img/icons/mysqls_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/parent.gif b/templates/Sparkle/assets/img/icons/parent.gif
deleted file mode 100644
index 33ad0253..00000000
Binary files a/templates/Sparkle/assets/img/icons/parent.gif and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/password.png b/templates/Sparkle/assets/img/icons/password.png
deleted file mode 100644
index e08c49ad..00000000
Binary files a/templates/Sparkle/assets/img/icons/password.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/password_big.png b/templates/Sparkle/assets/img/icons/password_big.png
deleted file mode 100644
index 0b715edb..00000000
Binary files a/templates/Sparkle/assets/img/icons/password_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/phpsettings.png b/templates/Sparkle/assets/img/icons/phpsettings.png
deleted file mode 100644
index ab47c874..00000000
Binary files a/templates/Sparkle/assets/img/icons/phpsettings.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/phpsettings_add.png b/templates/Sparkle/assets/img/icons/phpsettings_add.png
deleted file mode 100644
index e4c13b3c..00000000
Binary files a/templates/Sparkle/assets/img/icons/phpsettings_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/phpsettings_edit.png b/templates/Sparkle/assets/img/icons/phpsettings_edit.png
deleted file mode 100644
index f1fbe24b..00000000
Binary files a/templates/Sparkle/assets/img/icons/phpsettings_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/phpsettings_edit_big copy.png b/templates/Sparkle/assets/img/icons/phpsettings_edit_big copy.png
deleted file mode 100644
index 07649f7e..00000000
Binary files a/templates/Sparkle/assets/img/icons/phpsettings_edit_big copy.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/rename.gif b/templates/Sparkle/assets/img/icons/rename.gif
deleted file mode 100644
index eb0971f0..00000000
Binary files a/templates/Sparkle/assets/img/icons/rename.gif and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/res_recalculate.png b/templates/Sparkle/assets/img/icons/res_recalculate.png
deleted file mode 100644
index 419ca2f2..00000000
Binary files a/templates/Sparkle/assets/img/icons/res_recalculate.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/settings.png b/templates/Sparkle/assets/img/icons/settings.png
deleted file mode 100644
index 2c7200b0..00000000
Binary files a/templates/Sparkle/assets/img/icons/settings.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/sort_both.png b/templates/Sparkle/assets/img/icons/sort_both.png
deleted file mode 100644
index f20ab2e8..00000000
Binary files a/templates/Sparkle/assets/img/icons/sort_both.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/sort_down.png b/templates/Sparkle/assets/img/icons/sort_down.png
deleted file mode 100644
index 5f49df2a..00000000
Binary files a/templates/Sparkle/assets/img/icons/sort_down.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ssl.png b/templates/Sparkle/assets/img/icons/ssl.png
deleted file mode 100644
index e08c49ad..00000000
Binary files a/templates/Sparkle/assets/img/icons/ssl.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ssl_big.png b/templates/Sparkle/assets/img/icons/ssl_big.png
deleted file mode 100644
index 0b715edb..00000000
Binary files a/templates/Sparkle/assets/img/icons/ssl_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ssl_customer_big.png b/templates/Sparkle/assets/img/icons/ssl_customer_big.png
deleted file mode 100644
index 2c1b2de1..00000000
Binary files a/templates/Sparkle/assets/img/icons/ssl_customer_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ssl_global_big.png b/templates/Sparkle/assets/img/icons/ssl_global_big.png
deleted file mode 100644
index 010e7f89..00000000
Binary files a/templates/Sparkle/assets/img/icons/ssl_global_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ssl_shared_big.png b/templates/Sparkle/assets/img/icons/ssl_shared_big.png
deleted file mode 100644
index 50cb4b9f..00000000
Binary files a/templates/Sparkle/assets/img/icons/ssl_shared_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/syslog.png b/templates/Sparkle/assets/img/icons/syslog.png
deleted file mode 100644
index d343a8ce..00000000
Binary files a/templates/Sparkle/assets/img/icons/syslog.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/syslog_truncate.png b/templates/Sparkle/assets/img/icons/syslog_truncate.png
deleted file mode 100644
index 416e0622..00000000
Binary files a/templates/Sparkle/assets/img/icons/syslog_truncate.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/syslog_truncate_big.png b/templates/Sparkle/assets/img/icons/syslog_truncate_big.png
deleted file mode 100644
index bf897ccd..00000000
Binary files a/templates/Sparkle/assets/img/icons/syslog_truncate_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/tag_orange.png b/templates/Sparkle/assets/img/icons/tag_orange.png
deleted file mode 100644
index e69c9812..00000000
Binary files a/templates/Sparkle/assets/img/icons/tag_orange.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/templates.png b/templates/Sparkle/assets/img/icons/templates.png
deleted file mode 100644
index 49d406a9..00000000
Binary files a/templates/Sparkle/assets/img/icons/templates.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/templates_add.png b/templates/Sparkle/assets/img/icons/templates_add.png
deleted file mode 100644
index b733906f..00000000
Binary files a/templates/Sparkle/assets/img/icons/templates_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/templates_edit.png b/templates/Sparkle/assets/img/icons/templates_edit.png
deleted file mode 100644
index 9158452e..00000000
Binary files a/templates/Sparkle/assets/img/icons/templates_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_add.png b/templates/Sparkle/assets/img/icons/ticket_add.png
deleted file mode 100644
index e3146dc6..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_answer.png b/templates/Sparkle/assets/img/icons/ticket_answer.png
deleted file mode 100644
index 314f2e8f..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_answer.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_answer_big.png b/templates/Sparkle/assets/img/icons/ticket_answer_big.png
deleted file mode 100644
index ceb667a8..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_answer_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_archive.png b/templates/Sparkle/assets/img/icons/ticket_archive.png
deleted file mode 100644
index db002caf..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_archive.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_archive_search.png b/templates/Sparkle/assets/img/icons/ticket_archive_search.png
deleted file mode 100644
index f4a500c5..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_archive_search.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_archive_search_big.png b/templates/Sparkle/assets/img/icons/ticket_archive_search_big.png
deleted file mode 100644
index add6c33b..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_archive_search_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_close.png b/templates/Sparkle/assets/img/icons/ticket_close.png
deleted file mode 100644
index 0366b9cf..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_close.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_close_big.png b/templates/Sparkle/assets/img/icons/ticket_close_big.png
deleted file mode 100644
index 74379900..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_close_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_new.png b/templates/Sparkle/assets/img/icons/ticket_new.png
deleted file mode 100644
index e3146dc6..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_new.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_new_big.png b/templates/Sparkle/assets/img/icons/ticket_new_big.png
deleted file mode 100644
index 4873a072..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_new_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_reopen.png b/templates/Sparkle/assets/img/icons/ticket_reopen.png
deleted file mode 100644
index 1e47a9d7..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_reopen.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_reopen_big.png b/templates/Sparkle/assets/img/icons/ticket_reopen_big.png
deleted file mode 100644
index e4531f38..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_reopen_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_reply.png b/templates/Sparkle/assets/img/icons/ticket_reply.png
deleted file mode 100644
index 314f2e8f..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_reply.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_show.png b/templates/Sparkle/assets/img/icons/ticket_show.png
deleted file mode 100644
index f4a500c5..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_show.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/ticket_show_big.png b/templates/Sparkle/assets/img/icons/ticket_show_big.png
deleted file mode 100644
index add6c33b..00000000
Binary files a/templates/Sparkle/assets/img/icons/ticket_show_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/tickets.png b/templates/Sparkle/assets/img/icons/tickets.png
deleted file mode 100644
index 45089ee4..00000000
Binary files a/templates/Sparkle/assets/img/icons/tickets.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/traffic.png b/templates/Sparkle/assets/img/icons/traffic.png
deleted file mode 100644
index 8ccd347c..00000000
Binary files a/templates/Sparkle/assets/img/icons/traffic.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/traffic_big_old.png b/templates/Sparkle/assets/img/icons/traffic_big_old.png
deleted file mode 100644
index ad44f5a7..00000000
Binary files a/templates/Sparkle/assets/img/icons/traffic_big_old.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/trash.png b/templates/Sparkle/assets/img/icons/trash.png
deleted file mode 100644
index 86c3a002..00000000
Binary files a/templates/Sparkle/assets/img/icons/trash.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/trash_big.png b/templates/Sparkle/assets/img/icons/trash_big.png
deleted file mode 100644
index 113a1e4e..00000000
Binary files a/templates/Sparkle/assets/img/icons/trash_big.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/user.png b/templates/Sparkle/assets/img/icons/user.png
deleted file mode 100644
index d20bc799..00000000
Binary files a/templates/Sparkle/assets/img/icons/user.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/user_add.png b/templates/Sparkle/assets/img/icons/user_add.png
deleted file mode 100644
index c0c92a0e..00000000
Binary files a/templates/Sparkle/assets/img/icons/user_add.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/user_edit.png b/templates/Sparkle/assets/img/icons/user_edit.png
deleted file mode 100644
index 371f1bfe..00000000
Binary files a/templates/Sparkle/assets/img/icons/user_edit.png and /dev/null differ
diff --git a/templates/Sparkle/assets/img/icons/aps_upload.png b/templates/Sparkle/assets/img/icons/view.png
similarity index 76%
rename from templates/Sparkle/assets/img/icons/aps_upload.png
rename to templates/Sparkle/assets/img/icons/view.png
index 4f7fd9d0..d6d3bfd3 100644
Binary files a/templates/Sparkle/assets/img/icons/aps_upload.png and b/templates/Sparkle/assets/img/icons/view.png differ
diff --git a/templates/Sparkle/assets/img/icons/warning.png b/templates/Sparkle/assets/img/icons/warning.png
deleted file mode 100644
index 8031ec99..00000000
Binary files a/templates/Sparkle/assets/img/icons/warning.png and /dev/null differ
diff --git a/templates/Sparkle/customer/autoresponder/autoresponder.tpl b/templates/Sparkle/customer/autoresponder/autoresponder.tpl
index 1e44a12e..46d90a1c 100644
--- a/templates/Sparkle/customer/autoresponder/autoresponder.tpl
+++ b/templates/Sparkle/customer/autoresponder/autoresponder.tpl
@@ -11,7 +11,7 @@
 
 			<if ($userinfo['email_autoresponder_used'] < $userinfo['email_autoresponder'] || $userinfo['email_autoresponder'] == '-1') >
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/autoresponder_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'add'))}">{$lng['autoresponder']['autoresponder_add']}</a>
 			</div>
 			</if>
@@ -33,7 +33,7 @@
 
 			<if ($userinfo['email_autoresponder_used'] < $userinfo['email_autoresponder'] || $userinfo['email_autoresponder'] == '-1') && 15 < $count >
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/autoresponder_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'autoresponder', 'action' => 'add'))}">{$lng['autoresponder']['autoresponder_add']}</a>
 			</div>
 			</if>
diff --git a/templates/Sparkle/customer/domains/domain_ssleditor.tpl b/templates/Sparkle/customer/domains/domain_ssleditor.tpl
index 45fee2b8..328d06b4 100644
--- a/templates/Sparkle/customer/domains/domain_ssleditor.tpl
+++ b/templates/Sparkle/customer/domains/domain_ssleditor.tpl
@@ -2,7 +2,7 @@ $header
 <article>
 	<header>
 		<h2>
-			<img src="templates/{$theme}/assets/img/icons/ssl_big.png" alt="{$title}" />&nbsp;
+			<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="{$title}" />&nbsp;
 			{$title}
 		</h2>
 	</header>
diff --git a/templates/Sparkle/customer/domains/domainlist.tpl b/templates/Sparkle/customer/domains/domainlist.tpl
index 68b2a787..2075e679 100644
--- a/templates/Sparkle/customer/domains/domainlist.tpl
+++ b/templates/Sparkle/customer/domains/domainlist.tpl
@@ -17,7 +17,7 @@
 
 			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0 >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/domain_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a>
 				</div>
 			</if>
@@ -51,7 +51,7 @@
 
 			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && 15 < $domains_count && $parentdomains_count != 0 >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/domain_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domains', 'action' => 'add'))}">{$lng['domains']['subdomain_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/customer/email/emails.tpl b/templates/Sparkle/customer/email/emails.tpl
index a1584c3d..38efae08 100644
--- a/templates/Sparkle/customer/email/emails.tpl
+++ b/templates/Sparkle/customer/email/emails.tpl
@@ -18,7 +18,7 @@
 			
 			<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && $emaildomains_count !=0 >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/email_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a>
 				</div>
 			</if>
@@ -57,7 +57,7 @@
 
 			<if ($userinfo['emails_used'] < $userinfo['emails'] || $userinfo['emails'] == '-1') && 15 < $emails_count && $emaildomains_count !=0 >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/email_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'email', 'page' => $page, 'action' => 'add'))}">{$lng['emails']['emails_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/customer/extras/htaccess.tpl b/templates/Sparkle/customer/extras/htaccess.tpl
index a8c691c0..41e3de5c 100644
--- a/templates/Sparkle/customer/extras/htaccess.tpl
+++ b/templates/Sparkle/customer/extras/htaccess.tpl
@@ -16,7 +16,7 @@
 			</div>
 
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/htaccess_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{$lng['extras']['pathoptions_add']}</a>
 			</div>
 		
@@ -53,7 +53,7 @@
 			
 			<if 15 < $count >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/htaccess_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htaccess', 'action' => 'add'))}">{$lng['extras']['pathoptions_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/customer/extras/htpasswds.tpl b/templates/Sparkle/customer/extras/htpasswds.tpl
index 3dbf7259..5a9c212b 100644
--- a/templates/Sparkle/customer/extras/htpasswds.tpl
+++ b/templates/Sparkle/customer/extras/htpasswds.tpl
@@ -17,7 +17,7 @@
 
 			
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/htpasswd_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{$lng['extras']['directoryprotection_add']}</a>
 			</div>
 
@@ -50,7 +50,7 @@
 			
 			<if 15 < $count >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/htpasswd_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'extras', 'page' => 'htpasswds', 'action' => 'add'))}">{$lng['extras']['directoryprotection_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/customer/ftp/accounts.tpl b/templates/Sparkle/customer/ftp/accounts.tpl
index ad866211..65447ed5 100644
--- a/templates/Sparkle/customer/ftp/accounts.tpl
+++ b/templates/Sparkle/customer/ftp/accounts.tpl
@@ -17,7 +17,7 @@
 
 			<if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/user_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'ftp', 'page' => 'accounts', 'action' => 'add'))}">{$lng['ftp']['account_add']}</a>
 				</div>
 			</if>
@@ -51,7 +51,7 @@
 
 			<if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') && 15 < $ftps_count >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/user_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'ftp', 'page' => 'accounts', 'action' => 'add'))}">{$lng['ftp']['account_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/customer/index/change_password.tpl b/templates/Sparkle/customer/index/change_password.tpl
index 9f99a39b..ed1a51c6 100644
--- a/templates/Sparkle/customer/index/change_password.tpl
+++ b/templates/Sparkle/customer/index/change_password.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/encrypted.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/lock_big.png" alt="" />&nbsp;
 				{$lng['menue']['main']['changepassword']}
 			</h2>
 		</header>
diff --git a/templates/Sparkle/customer/index/change_theme.tpl b/templates/Sparkle/customer/index/change_theme.tpl
index b1c41e61..329ecdb5 100644
--- a/templates/Sparkle/customer/index/change_theme.tpl
+++ b/templates/Sparkle/customer/index/change_theme.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="templates/{$theme}/assets/img/icons/display.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/display_big.png" alt="" />&nbsp;
 				{$lng['menue']['main']['changetheme']}
 			</h2>
 		</header>
diff --git a/templates/Sparkle/customer/mysql/mysqls.tpl b/templates/Sparkle/customer/mysql/mysqls.tpl
index 92f3ab0d..869c2e42 100644
--- a/templates/Sparkle/customer/mysql/mysqls.tpl
+++ b/templates/Sparkle/customer/mysql/mysqls.tpl
@@ -17,7 +17,7 @@
 
 			<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/mysql_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a>
 				</div>
 			</if>
@@ -53,7 +53,7 @@
 
 			<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') && 15 < $mysqls_count >
 				<div class="overviewadd">
-					<img src="templates/{$theme}/assets/img/icons/mysql_add.png" alt="" />&nbsp;
+					<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 					<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'add'))}">{$lng['mysql']['database_create']}</a>
 				</div>
 			</if>
diff --git a/templates/Sparkle/customer/tickets/tickets.tpl b/templates/Sparkle/customer/tickets/tickets.tpl
index 4b6ad6b8..55995a7b 100644
--- a/templates/Sparkle/customer/tickets/tickets.tpl
+++ b/templates/Sparkle/customer/tickets/tickets.tpl
@@ -30,7 +30,7 @@ $header
 
 			<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && ($ticketsopen < $settings['ticket']['concurrently_open'] || ($settings['ticket']['concurrently_open'] == '-1' || $settings['ticket']['concurrently_open'] == '')) >
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/ticket_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a>
 			</div>
 			</if>
@@ -69,7 +69,7 @@ $header
 
 			<if ($userinfo['tickets_used'] < $userinfo['tickets'] || $userinfo['tickets'] == '-1') && 15 < $tickets_count && ($ticketsopen < $settings['ticket']['concurrently_open'] || ($settings['ticket']['concurrently_open'] == '-1' || $settings['ticket']['concurrently_open'] == '')) >
 			<div class="overviewadd">
-				<img src="templates/{$theme}/assets/img/icons/ticket_add.png" alt="" />&nbsp;
+				<img src="templates/{$theme}/assets/img/icons/add.png" alt="" />&nbsp;
 				<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'new'))}">{$lng['ticket']['ticket_new']}</a>
 			</div>
 			</if>
diff --git a/templates/Sparkle/customer/tickets/tickets_tickets.tpl b/templates/Sparkle/customer/tickets/tickets_tickets.tpl
index e02bbc7a..0e9e4145 100644
--- a/templates/Sparkle/customer/tickets/tickets_tickets.tpl
+++ b/templates/Sparkle/customer/tickets/tickets_tickets.tpl
@@ -8,20 +8,20 @@
 	<td>
 		<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'answer', 'id' => $row['id']))}" style="text-decoration:none;">
 			<if $cananswer < 1 >
-				<img src="templates/{$theme}/assets/img/icons/ticket_show.png" alt="{$lng['ticket']['show']}"/>
+				<img src="templates/{$theme}/assets/img/icons/view.png" alt="{$lng['ticket']['show']}"/>
 			</if>
 			<if 0 < $cananswer >
-				<img src="templates/{$theme}/assets/img/icons/ticket_answer.png" alt="{$lng['ticket']['answer']}"/>
+				<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['ticket']['answer']}"/>
 			</if>
 		</a>
 		<if $reopen < 1 >
 			&nbsp;<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'close', 'id' => $row['id']))}" style="text-decoration:none;">
-				<img src="templates/{$theme}/assets/img/icons/ticket_close.png" alt="{$lng['ticket']['close']}"/>
+				<img src="templates/{$theme}/assets/img/icons/lock.png" alt="{$lng['ticket']['close']}"/>
 			</a>
 		</if>
 		<if 0 < $reopen >
 			&nbsp;<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets', 'action' => 'reopen', 'id' => $row['id']))}" style="text-decoration:none;">
-				<img src="templates/{$theme}/assets/img/icons/ticket_reopen.png" alt="{$lng['ticket']['reopen']}"/>
+				<img src="templates/{$theme}/assets/img/icons/unlock.png" alt="{$lng['ticket']['reopen']}"/>
 			</a>
 		</if>
 	</td>