From 4400125c7eef6b1f81cff8352b1077b2fe951c87 Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Sun, 13 Feb 2011 18:36:56 +0100
Subject: [PATCH] Fixed icon naming

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 ...{add_autoresponder.png => autoresponder_add.png} | Bin
 .../icons/{add_domain.png => domain_add.png}        | Bin
 .../icons/{edit_group.png => group_edit.png}        | Bin
 .../icons/{add_htaccess.png => htaccess_add.png}    | Bin
 .../icons/{add_htpasswd.png => htpasswd_add.png}    | Bin
 .../icons/{edit_htpasswd.png => htpasswd_edit.png}  | Bin
 .../Froxlor/icons/{add_mysql.png => mysql_add.png}  | Bin
 .../icons/{answer_ticket.png => ticket_answer.png}  | Bin
 ...archive_search.png => ticket_archive_search.png} | Bin
 .../icons/{close_ticket.png => ticket_close.png}    | Bin
 .../icons/{reopen_ticket.png => ticket_reopen.png}  | Bin
 .../icons/{show_ticket.png => ticket_show.png}      | Bin
 images/Froxlor/icons/{add_user.png => user_add.png} | Bin
 lib/formfields/admin/admin/formfield.admin_add.php  |   8 ++++----
 lib/formfields/admin/admin/formfield.admin_edit.php |   2 +-
 .../admin/customer/formfield.customer_add.php       |   8 ++++----
 .../admin/domains/formfield.domains_add.php         |  12 ++++++------
 .../customer/domains/formfield.domains_add.php      |   4 ++--
 .../email/formfield.emails_addforwarder.php         |   4 ++--
 .../customer/extras/formfield.htaccess_add.php      |   4 ++--
 .../customer/extras/formfield.htaccess_edit.php     |   4 ++--
 .../customer/extras/formfield.htpasswd_edit.php     |   4 ++--
 lib/formfields/customer/ftp/formfield.ftp_add.php   |   4 ++--
 .../customer/mysql/formfield.mysql_add.php          |   4 ++--
 templates/Froxlor/admin/admins/admins.tpl           |   6 +++---
 templates/Froxlor/admin/customers/customers.tpl     |   6 +++---
 templates/Froxlor/admin/domains/domains.tpl         |   4 ++--
 templates/Froxlor/admin/ticket/archive.tpl          |   2 +-
 templates/Froxlor/admin/ticket/archived_tickets.tpl |   2 +-
 templates/Froxlor/admin/ticket/tickets_tickets.tpl  |   8 ++++----
 templates/Froxlor/customer/domains/domainlist.tpl   |   4 ++--
 templates/Froxlor/customer/email/autoresponder.tpl  |   4 ++--
 templates/Froxlor/customer/extras/htaccess.tpl      |   4 ++--
 templates/Froxlor/customer/extras/htpasswds.tpl     |   4 ++--
 templates/Froxlor/customer/ftp/accounts.tpl         |   6 +++---
 templates/Froxlor/customer/mysql/mysqls.tpl         |   4 ++--
 .../Froxlor/customer/ticket/tickets_tickets.tpl     |   8 ++++----
 37 files changed, 60 insertions(+), 60 deletions(-)
 rename images/Froxlor/icons/{add_autoresponder.png => autoresponder_add.png} (100%)
 rename images/Froxlor/icons/{add_domain.png => domain_add.png} (100%)
 rename images/Froxlor/icons/{edit_group.png => group_edit.png} (100%)
 rename images/Froxlor/icons/{add_htaccess.png => htaccess_add.png} (100%)
 rename images/Froxlor/icons/{add_htpasswd.png => htpasswd_add.png} (100%)
 rename images/Froxlor/icons/{edit_htpasswd.png => htpasswd_edit.png} (100%)
 rename images/Froxlor/icons/{add_mysql.png => mysql_add.png} (100%)
 rename images/Froxlor/icons/{answer_ticket.png => ticket_answer.png} (100%)
 rename images/Froxlor/icons/{archive_search.png => ticket_archive_search.png} (100%)
 rename images/Froxlor/icons/{close_ticket.png => ticket_close.png} (100%)
 rename images/Froxlor/icons/{reopen_ticket.png => ticket_reopen.png} (100%)
 rename images/Froxlor/icons/{show_ticket.png => ticket_show.png} (100%)
 rename images/Froxlor/icons/{add_user.png => user_add.png} (100%)

diff --git a/images/Froxlor/icons/add_autoresponder.png b/images/Froxlor/icons/autoresponder_add.png
similarity index 100%
rename from images/Froxlor/icons/add_autoresponder.png
rename to images/Froxlor/icons/autoresponder_add.png
diff --git a/images/Froxlor/icons/add_domain.png b/images/Froxlor/icons/domain_add.png
similarity index 100%
rename from images/Froxlor/icons/add_domain.png
rename to images/Froxlor/icons/domain_add.png
diff --git a/images/Froxlor/icons/edit_group.png b/images/Froxlor/icons/group_edit.png
similarity index 100%
rename from images/Froxlor/icons/edit_group.png
rename to images/Froxlor/icons/group_edit.png
diff --git a/images/Froxlor/icons/add_htaccess.png b/images/Froxlor/icons/htaccess_add.png
similarity index 100%
rename from images/Froxlor/icons/add_htaccess.png
rename to images/Froxlor/icons/htaccess_add.png
diff --git a/images/Froxlor/icons/add_htpasswd.png b/images/Froxlor/icons/htpasswd_add.png
similarity index 100%
rename from images/Froxlor/icons/add_htpasswd.png
rename to images/Froxlor/icons/htpasswd_add.png
diff --git a/images/Froxlor/icons/edit_htpasswd.png b/images/Froxlor/icons/htpasswd_edit.png
similarity index 100%
rename from images/Froxlor/icons/edit_htpasswd.png
rename to images/Froxlor/icons/htpasswd_edit.png
diff --git a/images/Froxlor/icons/add_mysql.png b/images/Froxlor/icons/mysql_add.png
similarity index 100%
rename from images/Froxlor/icons/add_mysql.png
rename to images/Froxlor/icons/mysql_add.png
diff --git a/images/Froxlor/icons/answer_ticket.png b/images/Froxlor/icons/ticket_answer.png
similarity index 100%
rename from images/Froxlor/icons/answer_ticket.png
rename to images/Froxlor/icons/ticket_answer.png
diff --git a/images/Froxlor/icons/archive_search.png b/images/Froxlor/icons/ticket_archive_search.png
similarity index 100%
rename from images/Froxlor/icons/archive_search.png
rename to images/Froxlor/icons/ticket_archive_search.png
diff --git a/images/Froxlor/icons/close_ticket.png b/images/Froxlor/icons/ticket_close.png
similarity index 100%
rename from images/Froxlor/icons/close_ticket.png
rename to images/Froxlor/icons/ticket_close.png
diff --git a/images/Froxlor/icons/reopen_ticket.png b/images/Froxlor/icons/ticket_reopen.png
similarity index 100%
rename from images/Froxlor/icons/reopen_ticket.png
rename to images/Froxlor/icons/ticket_reopen.png
diff --git a/images/Froxlor/icons/show_ticket.png b/images/Froxlor/icons/ticket_show.png
similarity index 100%
rename from images/Froxlor/icons/show_ticket.png
rename to images/Froxlor/icons/ticket_show.png
diff --git a/images/Froxlor/icons/add_user.png b/images/Froxlor/icons/user_add.png
similarity index 100%
rename from images/Froxlor/icons/add_user.png
rename to images/Froxlor/icons/user_add.png
diff --git a/lib/formfields/admin/admin/formfield.admin_add.php b/lib/formfields/admin/admin/formfield.admin_add.php
index 70ca9851..a35b25c4 100644
--- a/lib/formfields/admin/admin/formfield.admin_add.php
+++ b/lib/formfields/admin/admin/formfield.admin_add.php
@@ -18,11 +18,11 @@
 return array(
 	'admin_add' => array(
 		'title' => $lng['admin']['admin_add'],
-		'image' => 'icons/add_user.png',
+		'image' => 'icons/user_add.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['admin']['accountdata'],
-				'image' => 'icons/add_user.png',
+				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'loginname' => array(
 						'label' => $lng['login']['username'],
@@ -43,7 +43,7 @@ return array(
 			),
 			'section_b' => array(
 				'title' => $lng['admin']['contactdata'],
-				'image' => 'icons/add_user.png',
+				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'name' => array(
 						'label' => $lng['customer']['name'],
@@ -59,7 +59,7 @@ return array(
 			),
 			'section_c' => array(
 				'title' => $lng['admin']['servicedata'],
-				'image' => 'icons/add_user.png',
+				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'ipaddress' => array(
 						'label' => $lng['serversettings']['ipaddress']['title'],
diff --git a/lib/formfields/admin/admin/formfield.admin_edit.php b/lib/formfields/admin/admin/formfield.admin_edit.php
index 012077d1..e23598b7 100644
--- a/lib/formfields/admin/admin/formfield.admin_edit.php
+++ b/lib/formfields/admin/admin/formfield.admin_edit.php
@@ -68,7 +68,7 @@ return array(
 			),
 			'section_c' => array(
 				'title' => $lng['admin']['servicedata'],
-				'image' => 'icons/add_user.png',
+				'image' => 'icons/user_add.png',
 				'visible' => ($result['adminid'] != $userinfo['userid'] ? true : false),
 				'fields' => array(
 					'ipaddress' => array(
diff --git a/lib/formfields/admin/customer/formfield.customer_add.php b/lib/formfields/admin/customer/formfield.customer_add.php
index 5b326fa5..6c7e30bc 100644
--- a/lib/formfields/admin/customer/formfield.customer_add.php
+++ b/lib/formfields/admin/customer/formfield.customer_add.php
@@ -18,11 +18,11 @@
 return array(
 	'customer_add' => array(
 		'title' => $lng['admin']['customer_add'],
-		'image' => 'icons/add_user.png',
+		'image' => 'icons/user_add.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['admin']['accountdata'],
-				'image' => 'icons/add_user.png',
+				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'new_loginname' => array(
 						'label' => $lng['login']['username'],
@@ -56,7 +56,7 @@ return array(
 			),
 			'section_b' => array(
 				'title' => $lng['admin']['contactdata'],
-				'image' => 'icons/add_user.png',
+				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'name' => array(
 						'label' => $lng['customer']['name'],
@@ -106,7 +106,7 @@ return array(
 			),
 			'section_c' => array(
 				'title' => $lng['admin']['servicedata'],
-				'image' => 'icons/add_user.png',
+				'image' => 'icons/user_add.png',
 				'fields' => array(
 					'diskspace' => array(
 						'label' => $lng['customer']['diskspace'],
diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php
index 22ce7863..93dddf35 100644
--- a/lib/formfields/admin/domains/formfield.domains_add.php
+++ b/lib/formfields/admin/domains/formfield.domains_add.php
@@ -18,11 +18,11 @@
 return array(
 	'domain_add' => array(
 		'title' => $lng['admin']['domain_add'],
-		'image' => 'icons/add_domain.png',
+		'image' => 'icons/domain_add.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['domains']['domainsettings'],
-				'image' => 'icons/add_domain.png',
+				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'domain' => array(
 						'label' => 'Domain',
@@ -71,7 +71,7 @@ return array(
 			),
 			'section_b' => array(
 				'title' => $lng['admin']['webserversettings'],
-				'image' => 'icons/add_domain.png',
+				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'documentroot' => array(
 						'visible' => ($userinfo['change_serversettings'] == '1' ? true : false),
@@ -131,7 +131,7 @@ return array(
 			),
 			'section_c' => array(
 				'title' => $lng['admin']['phpserversettings'],
-				'image' => 'icons/add_domain.png',
+				'image' => 'icons/domain_add.png',
 				'visible' => (($userinfo['change_serversettings'] == '1' || $userinfo['caneditphpsettings'] == '1') ? true : false),
 				'fields' => array(
 					'openbasedir' => array(
@@ -164,7 +164,7 @@ return array(
 			),
 			'section_d' => array(
 				'title' => $lng['admin']['nameserversettings'],
-				'image' => 'icons/add_domain.png',
+				'image' => 'icons/domain_add.png',
 				'visible' => ($userinfo['change_serversettings'] == '1' ? true : false),
 				'fields' => array(
 					'isbinddomain' => array(
@@ -181,7 +181,7 @@ return array(
 			),
 			'section_e' => array(
 				'title' => $lng['admin']['mailserversettings'],
-				'image' => 'icons/add_domain.png',
+				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'isemaildomain' => array(
 						'label' => $lng['admin']['emaildomain'],
diff --git a/lib/formfields/customer/domains/formfield.domains_add.php b/lib/formfields/customer/domains/formfield.domains_add.php
index bf0dbc7e..ad88b3d3 100644
--- a/lib/formfields/customer/domains/formfield.domains_add.php
+++ b/lib/formfields/customer/domains/formfield.domains_add.php
@@ -18,11 +18,11 @@
 return array(
 	'domain_add' => array(
 		'title' => $lng['domains']['subdomain_add'],
-		'image' => 'icons/add_domain.png',
+		'image' => 'icons/domain_add.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['domains']['subdomain_add'],
-				'image' => 'icons/add_domain.png',
+				'image' => 'icons/domain_add.png',
 				'fields' => array(
 					'subdomain' => array(
 						'label' => $lng['domains']['domainname'],
diff --git a/lib/formfields/customer/email/formfield.emails_addforwarder.php b/lib/formfields/customer/email/formfield.emails_addforwarder.php
index 9532bd68..e247003f 100644
--- a/lib/formfields/customer/email/formfield.emails_addforwarder.php
+++ b/lib/formfields/customer/email/formfield.emails_addforwarder.php
@@ -18,11 +18,11 @@
 return array(
 	'emails_addforwarder' => array(
 		'title' => $lng['emails']['forwarder_add'],
-		'image' => 'icons/add_autoresponder.png',
+		'image' => 'icons/autoresponder_add.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['emails']['forwarder_add'],
-				'image' => 'icons/add_autoresponder.png',
+				'image' => 'icons/autoresponder_add.png',
 				'fields' => array(
 					'email_full' => array(
 						'label' => $lng['emails']['from'],
diff --git a/lib/formfields/customer/extras/formfield.htaccess_add.php b/lib/formfields/customer/extras/formfield.htaccess_add.php
index 81a58a61..57f489cb 100644
--- a/lib/formfields/customer/extras/formfield.htaccess_add.php
+++ b/lib/formfields/customer/extras/formfield.htaccess_add.php
@@ -18,11 +18,11 @@
 return array(
 	'htaccess_add' => array(
 		'title' => $lng['extras']['pathoptions_add'],
-		'image' => 'icons/add_htpasswd.png',
+		'image' => 'icons/htpasswd_add.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['extras']['pathoptions_add'],
-				'image' => 'icons/add_htpasswd.png',
+				'image' => 'icons/htpasswd_add.png',
 				'fields' => array(
 					'path' => array(
 						'label' => $lng['panel']['path'],
diff --git a/lib/formfields/customer/extras/formfield.htaccess_edit.php b/lib/formfields/customer/extras/formfield.htaccess_edit.php
index 8a4cf558..216a6114 100644
--- a/lib/formfields/customer/extras/formfield.htaccess_edit.php
+++ b/lib/formfields/customer/extras/formfield.htaccess_edit.php
@@ -18,11 +18,11 @@
 return array(
 	'htaccess_edit' => array(
 		'title' => $lng['extras']['pathoptions_edit'],
-		'image' => 'icons/edit_htpasswd.png',
+		'image' => 'icons/htpasswd_edit.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['extras']['pathoptions_edit'],
-				'image' => 'icons/edit_htpasswd.png',
+				'image' => 'icons/htpasswd_edit.png',
 				'fields' => array(
 					'path' => array(
 						'label' => $lng['panel']['path'],
diff --git a/lib/formfields/customer/extras/formfield.htpasswd_edit.php b/lib/formfields/customer/extras/formfield.htpasswd_edit.php
index 2be420f3..a21b085a 100644
--- a/lib/formfields/customer/extras/formfield.htpasswd_edit.php
+++ b/lib/formfields/customer/extras/formfield.htpasswd_edit.php
@@ -18,11 +18,11 @@
 return array(
 	'htpasswd_edit' => array(
 		'title' => $lng['extras']['directoryprotection_add'],
-		'image' => 'icons/add_htpasswd.png',
+		'image' => 'icons/htpasswd_add.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['extras']['directoryprotection_add'],
-				'image' => 'icons/add_htpasswd.png',
+				'image' => 'icons/htpasswd_add.png',
 				'fields' => array(
 					'path' => array(
 						'label' => $lng['panel']['path'],
diff --git a/lib/formfields/customer/ftp/formfield.ftp_add.php b/lib/formfields/customer/ftp/formfield.ftp_add.php
index a020cef3..19475ecc 100644
--- a/lib/formfields/customer/ftp/formfield.ftp_add.php
+++ b/lib/formfields/customer/ftp/formfield.ftp_add.php
@@ -17,11 +17,11 @@
 return array(
 	'ftp_add' => array(
 		'title' => $lng['ftp']['account_add'],
-		'image' => 'icons/add_user.png',
+		'image' => 'icons/user_add.png',
 		'sections' => array(
 			'section_a' => array(
 				'title' => $lng['ftp']['account_add'],
-                                'image' => 'icons/add_user.png',
+                                'image' => 'icons/user_add.png',
 				'fields' => array(
 					'ftp_username' => array(
 						'visible' => ($settings['customer']['ftpatdomain'] == '1' ? true : false),
diff --git a/lib/formfields/customer/mysql/formfield.mysql_add.php b/lib/formfields/customer/mysql/formfield.mysql_add.php
index efa46b91..adb166fb 100644
--- a/lib/formfields/customer/mysql/formfield.mysql_add.php
+++ b/lib/formfields/customer/mysql/formfield.mysql_add.php
@@ -17,11 +17,11 @@
 return array(
         'mysql_add' => array(
                 'title' => $lng['mysql']['database_create'],
-                'image' => 'icons/add_mysql.png',
+                'image' => 'icons/mysql_add.png',
                 'sections' => array(
                         'section_a' => array(
                                 'title' => $lng['mysql']['database_create'],
-                                'image' => 'icons/add_mysql.png',
+                                'image' => 'icons/mysql_add.png',
                                 'fields' => array(
 					'description' => array(
 						'label' => $lng['mysql']['databasedescription'],
diff --git a/templates/Froxlor/admin/admins/admins.tpl b/templates/Froxlor/admin/admins/admins.tpl
index 68cf48f3..20d9edab 100644
--- a/templates/Froxlor/admin/admins/admins.tpl
+++ b/templates/Froxlor/admin/admins/admins.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="images/Froxlor/icons/edit_group.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/group_edit.png" alt="" />&nbsp;
 				{$lng['admin']['admins']}&nbsp;({$admincount})
 			</h2>
 		</header>
@@ -17,7 +17,7 @@ $header
 
 			<if 15 < $count >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_user.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/user_add.png" alt="" />&nbsp;
 					<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['admin_add']}</a>
 				</div>
 			</if>
@@ -52,7 +52,7 @@ $header
 			</form>
 
 			<div class="overviewadd">
-				<img src="images/Froxlor/icons/add_user.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/user_add.png" alt="" />&nbsp;
 				<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['admin_add']}</a>
 			</div>
 
diff --git a/templates/Froxlor/admin/customers/customers.tpl b/templates/Froxlor/admin/customers/customers.tpl
index f2ded955..9b70d834 100644
--- a/templates/Froxlor/admin/customers/customers.tpl
+++ b/templates/Froxlor/admin/customers/customers.tpl
@@ -2,7 +2,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="images/Froxlor/icons/edit_group.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/group_edit.png" alt="" />&nbsp;
 				{$lng['admin']['customers']}&nbsp;({$customercount})
 			</h2>
 		</header>
@@ -17,7 +17,7 @@ $header
 
 			<if ($userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1') && 15 < $count && 0 < $countcustomers >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_user.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/user_add.png" alt="" />&nbsp;
 					<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['customer_add']}</a>
 				</div>
 			</if>
@@ -54,7 +54,7 @@ $header
 
 			<if $userinfo['customers_used'] < $userinfo['customers'] || $userinfo['customers'] == '-1'>
 			<div class="overviewadd">
-				<img src="images/Froxlor/icons/add_user.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/user_add.png" alt="" />&nbsp;
 				<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['customer_add']}</a>
 			</div>
 			</if>
diff --git a/templates/Froxlor/admin/domains/domains.tpl b/templates/Froxlor/admin/domains/domains.tpl
index e55d26b9..2f4370c5 100644
--- a/templates/Froxlor/admin/domains/domains.tpl
+++ b/templates/Froxlor/admin/domains/domains.tpl
@@ -17,7 +17,7 @@
 
 			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && 15 < $count && 0 < $countcustomers >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_domain.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/domain_add.png" alt="" />&nbsp;
 					<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['domain_add']}</a>
 				</div>
 			</if>
@@ -61,7 +61,7 @@
 
 			<if ($userinfo['domains_used'] < $userinfo['domains'] || $userinfo['domains'] == '-1') && $countcustomers !=0 >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_domain.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/domain_add.png" alt="" />&nbsp;
 					<a href="$filename?page=$page&amp;action=add&amp;s=$s">{$lng['admin']['domain_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Froxlor/admin/ticket/archive.tpl b/templates/Froxlor/admin/ticket/archive.tpl
index a0b24ff8..c1be28c8 100644
--- a/templates/Froxlor/admin/ticket/archive.tpl
+++ b/templates/Froxlor/admin/ticket/archive.tpl
@@ -32,7 +32,7 @@ $header
 	<article>
 		<header>
 			<h2>
-				<img src="images/Froxlor/icons/archive_search.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/ticket_archive_search.png" alt="" />&nbsp;
 				{$lng['ticket']['search']}
 			</h2>
 		</header>
diff --git a/templates/Froxlor/admin/ticket/archived_tickets.tpl b/templates/Froxlor/admin/ticket/archived_tickets.tpl
index 43b1afad..62ce25d9 100644
--- a/templates/Froxlor/admin/ticket/archived_tickets.tpl
+++ b/templates/Froxlor/admin/ticket/archived_tickets.tpl
@@ -6,7 +6,7 @@
 	<td>{$ticket['priority']}</td>
 	<td>
 		<a href="$filename?page=archive&amp;action=view&amp;id={$ticket['id']}&amp;s=$s" style="text-decoration:none;">
-			<img src="images/Froxlor/icons/show_ticket.png" alt="{$lng['ticket']['show']}"/>
+			<img src="images/Froxlor/icons/ticket_show.png" alt="{$lng['ticket']['show']}"/>
 		</a>
 	</td>
 </tr>
diff --git a/templates/Froxlor/admin/ticket/tickets_tickets.tpl b/templates/Froxlor/admin/ticket/tickets_tickets.tpl
index a465fec9..f4527d98 100644
--- a/templates/Froxlor/admin/ticket/tickets_tickets.tpl
+++ b/templates/Froxlor/admin/ticket/tickets_tickets.tpl
@@ -8,20 +8,20 @@
 	<td>
 		<a href="$filename?page=tickets&amp;action=answer&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
 			<if $cananswer < 1 >
-				<img src="images/Froxlor/icons/show_ticket.png" alt="{$lng['ticket']['show']}"/>
+				<img src="images/Froxlor/icons/ticket_show.png" alt="{$lng['ticket']['show']}"/>
 			</if>
 			<if 0 < $cananswer >
-				<img src="images/Froxlor/icons/answer_ticket.png" alt="{$lng['ticket']['answer']}"/>
+				<img src="images/Froxlor/icons/ticket_answer.png" alt="{$lng['ticket']['answer']}"/>
 			</if>
 		</a>
 		<if $reopen < 1 >
 			&nbsp;<a href="$filename?page=tickets&amp;action=close&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
-				<img src="images/Froxlor/icons/close_ticket.png" alt="{$lng['ticket']['close']}"/>
+				<img src="images/Froxlor/icons/ticket_close.png" alt="{$lng['ticket']['close']}"/>
 			</a>
 		</if>
 		<if 0 < $reopen >
 			&nbsp;<a href="$filename?page=tickets&amp;action=reopen&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
-				<img src="images/Froxlor/icons/reopen_ticket.png" alt="{$lng['ticket']['reopen']}"/>
+				<img src="images/Froxlor/icons/ticket_reopen.png" alt="{$lng['ticket']['reopen']}"/>
 			</a>
 		</if>
 		&nbsp;<a href="$filename?page=tickets&amp;action=archive&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
diff --git a/templates/Froxlor/customer/domains/domainlist.tpl b/templates/Froxlor/customer/domains/domainlist.tpl
index 6dafb306..a5a934ec 100644
--- a/templates/Froxlor/customer/domains/domainlist.tpl
+++ b/templates/Froxlor/customer/domains/domainlist.tpl
@@ -17,7 +17,7 @@
 
 			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && 15 < $domains_count && $parentdomains_count != 0 >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_domain.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/domain_add.png" alt="" />&nbsp;
 					<a href="$filename?page=domains&amp;action=add&amp;s=$s">{$lng['domains']['subdomain_add']}</a>
 				</div>
 			</if>
@@ -51,7 +51,7 @@
 
 			<if ($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') && $parentdomains_count != 0 >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_domain.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/domain_add.png" alt="" />&nbsp;
 					<a href="$filename?page=domains&amp;action=add&amp;s=$s">{$lng['domains']['subdomain_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Froxlor/customer/email/autoresponder.tpl b/templates/Froxlor/customer/email/autoresponder.tpl
index 67f42fb7..a9fb3417 100644
--- a/templates/Froxlor/customer/email/autoresponder.tpl
+++ b/templates/Froxlor/customer/email/autoresponder.tpl
@@ -11,7 +11,7 @@
 
 			<if ($userinfo['email_autoresponder_used'] < $userinfo['email_autoresponder'] || $userinfo['email_autoresponder'] == '-1') && 15 < $count >
 			<div class="overviewadd">
-				<img src="images/Froxlor/icons/add_autoresponder.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/autoresponder_add.png" alt="" />&nbsp;
 				<a href="$filename?&amp;action=add&amp;s=$s">{$lng['autoresponder']['autoresponder_add']}</a>
 			</div>
 			</if>
@@ -33,7 +33,7 @@
 
 			<if ($userinfo['email_autoresponder_used'] < $userinfo['email_autoresponder'] || $userinfo['email_autoresponder'] == '-1') >
 			<div class="overviewadd">
-				<img src="images/Froxlor/icons/add_autoresponder.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/autoresponder_add.png" alt="" />&nbsp;
 				<a href="$filename?&amp;action=add&amp;s=$s">{$lng['autoresponder']['autoresponder_add']}</a>
 			</div>
 			</if>
diff --git a/templates/Froxlor/customer/extras/htaccess.tpl b/templates/Froxlor/customer/extras/htaccess.tpl
index 86bf55a8..9a1e2a19 100644
--- a/templates/Froxlor/customer/extras/htaccess.tpl
+++ b/templates/Froxlor/customer/extras/htaccess.tpl
@@ -17,7 +17,7 @@
 
 			<if 15 < $count >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_htaccess.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/htaccess_add.png" alt="" />&nbsp;
 					<a href="$filename?page=htaccess&amp;action=add&amp;s=$s">{$lng['extras']['pathoptions_add']}</a>
 				</div>
 			</if>
@@ -54,7 +54,7 @@
 			</p>
 
 			<div class="overviewadd">
-				<img src="images/Froxlor/icons/add_htaccess.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/htaccess_add.png" alt="" />&nbsp;
 				<a href="$filename?page=htaccess&amp;action=add&amp;s=$s">{$lng['extras']['pathoptions_add']}</a>
 			</div>
 
diff --git a/templates/Froxlor/customer/extras/htpasswds.tpl b/templates/Froxlor/customer/extras/htpasswds.tpl
index 3aca3a01..477828ff 100644
--- a/templates/Froxlor/customer/extras/htpasswds.tpl
+++ b/templates/Froxlor/customer/extras/htpasswds.tpl
@@ -17,7 +17,7 @@
 
 			<if 15 < $count >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_htpasswd.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/htpasswd_add.png" alt="" />&nbsp;
 					<a href="$filename?page=htpasswds&amp;action=add&amp;s=$s">{$lng['extras']['directoryprotection_add']}</a>
 				</div>
 			</if>
@@ -50,7 +50,7 @@
 			</form>
 
 			<div class="overviewadd">
-				<img src="images/Froxlor/icons/add_htpasswd.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/htpasswd_add.png" alt="" />&nbsp;
 				<a href="$filename?page=htpasswds&amp;action=add&amp;s=$s">{$lng['extras']['directoryprotection_add']}</a>
 			</div>
 
diff --git a/templates/Froxlor/customer/ftp/accounts.tpl b/templates/Froxlor/customer/ftp/accounts.tpl
index f54b131b..6e73f9b0 100644
--- a/templates/Froxlor/customer/ftp/accounts.tpl
+++ b/templates/Froxlor/customer/ftp/accounts.tpl
@@ -2,7 +2,7 @@
 	<article>
 		<header>
 			<h2>
-				<img src="images/Froxlor/icons/edit_group.png" alt="" />&nbsp;
+				<img src="images/Froxlor/icons/group_edit.png" alt="" />&nbsp;
 				{$lng['menue']['ftp']['accounts']}&nbsp;({$ftps_count})
 			</h2>
 		</header>
@@ -17,7 +17,7 @@
 
 			<if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') && 15 < $ftps_count >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_user.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/user_add.png" alt="" />&nbsp;
 					<a href="$filename?page=accounts&amp;action=add&amp;s=$s">{$lng['ftp']['account_add']}</a>
 				</div>
 			</if>
@@ -51,7 +51,7 @@
 
 			<if ($userinfo['ftps_used'] < $userinfo['ftps'] || $userinfo['ftps'] == '-1') >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_user.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/user_add.png" alt="" />&nbsp;
 					<a href="$filename?page=accounts&amp;action=add&amp;s=$s">{$lng['ftp']['account_add']}</a>
 				</div>
 			</if>
diff --git a/templates/Froxlor/customer/mysql/mysqls.tpl b/templates/Froxlor/customer/mysql/mysqls.tpl
index 765558e8..54641b9e 100644
--- a/templates/Froxlor/customer/mysql/mysqls.tpl
+++ b/templates/Froxlor/customer/mysql/mysqls.tpl
@@ -17,7 +17,7 @@
 
 			<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') && 15 < $mysqls_count >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_mysql.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/mysql_add.png" alt="" />&nbsp;
 					<a href="$filename?page=mysqls&amp;action=add&amp;s=$s">{$lng['mysql']['database_create']}</a>
 				</div>
 			</if>
@@ -52,7 +52,7 @@
 
 			<if ($userinfo['mysqls_used'] < $userinfo['mysqls'] || $userinfo['mysqls'] == '-1') >
 				<div class="overviewadd">
-					<img src="images/Froxlor/icons/add_mysql.png" alt="" />&nbsp;
+					<img src="images/Froxlor/icons/mysql_add.png" alt="" />&nbsp;
 					<a href="$filename?page=mysqls&amp;action=add&amp;s=$s">{$lng['mysql']['database_create']}</a>
 				</div>
 			</if>
diff --git a/templates/Froxlor/customer/ticket/tickets_tickets.tpl b/templates/Froxlor/customer/ticket/tickets_tickets.tpl
index 26330d4e..3a0b60fa 100644
--- a/templates/Froxlor/customer/ticket/tickets_tickets.tpl
+++ b/templates/Froxlor/customer/ticket/tickets_tickets.tpl
@@ -8,20 +8,20 @@
 	<td>
 		<a href="$filename?page=tickets&amp;action=answer&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
 			<if $cananswer < 1 >
-				<img src="images/Froxlor/icons/show_ticket.png" alt="{$lng['ticket']['show']}"/>
+				<img src="images/Froxlor/icons/ticket_show.png" alt="{$lng['ticket']['show']}"/>
 			</if>
 			<if 0 < $cananswer >
-				<img src="images/Froxlor/icons/answer_ticket.png" alt="{$lng['ticket']['answer']}"/>
+				<img src="images/Froxlor/icons/ticket_answer.png" alt="{$lng['ticket']['answer']}"/>
 			</if>
 		</a>
 		<if $reopen < 1 >
 			&nbsp;<a href="$filename?page=tickets&amp;action=close&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
-				<img src="images/Froxlor/icons/close_ticket.png" alt="{$lng['ticket']['close']}"/>
+				<img src="images/Froxlor/icons/ticket_close.png" alt="{$lng['ticket']['close']}"/>
 			</a>
 		</if>
 		<if 0 < $reopen >
 			&nbsp;<a href="$filename?page=tickets&amp;action=reopen&amp;id={$row['id']}&amp;s=$s" style="text-decoration:none;">
-				<img src="images/Froxlor/icons/reopen_ticket.png" alt="{$lng['ticket']['reopen']}"/>
+				<img src="images/Froxlor/icons/ticket_reopen.png" alt="{$lng['ticket']['reopen']}"/>
 			</a>
 		</if>
 	</td>