diff --git a/admin_customers.php b/admin_customers.php
index 10bcc1a5..075b9365 100644
--- a/admin_customers.php
+++ b/admin_customers.php
@@ -104,13 +104,11 @@ if($page == 'customers'
 					$traffic_doublepercent = 0;
 				}
 
-				$column_style = '';
-				$unlock_link = '';
+				$islocked = 0;
 				if($row['loginfail_count'] >= $settings['login']['maxloginattempts']
 					&& $row['lastlogin_fail'] > (time() - $settings['login']['deactivatetime'])
 				) {
-					$column_style = ' style="background-color: #f99122;"';
-					$unlock_link = '<a href="'.$filename.'?s='.$s.'&amp;page='.$page.'&amp;action=unlock&amp;id='.$row['customerid'].'">'.$lng['panel']['unlock'].'</a><br />';
+					$islocked = 1;
 				}
 
 				$row = str_replace_array('-1', 'UL', $row, 'diskspace traffic mysqls emails email_accounts email_forwarders ftps tickets subdomains email_autoresponder');
diff --git a/templates/Froxlor/admin/customers/customers_customer.tpl b/templates/Froxlor/admin/customers/customers_customer.tpl
index f9f070c5..f68dc8d4 100644
--- a/templates/Froxlor/admin/customers/customers_customer.tpl
+++ b/templates/Froxlor/admin/customers/customers_customer.tpl
@@ -1,4 +1,4 @@
-<tr>
+<tr <if $row['deactivated'] == 1>class="disabled"</if>>
 	<td>
 		<strong>
 		<if $row['name'] != '' && $row['firstname'] != ''>
@@ -55,6 +55,11 @@
 		</a>&nbsp;
 		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'delete', 'id' => $row['customerid']))}" style="text-decoration:none;">
 			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" />
+		</a>&nbsp;
+		<if $islocked == 1>
+		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'unlock', 'id' => $row['customerid']))}">
+			<img src="templates/{$theme}/assets/img/icons/unlock.png" alt="{$lng['panel']['unlock']}" />
 		</a>
+		</if>
 	</td>
 </tr>
diff --git a/templates/Froxlor/assets/css/main.css b/templates/Froxlor/assets/css/main.css
index 9db67ee2..6d610246 100644
--- a/templates/Froxlor/assets/css/main.css
+++ b/templates/Froxlor/assets/css/main.css
@@ -483,6 +483,10 @@ table tbody td {
 	border-right: 1px solid #666;
 }
 
+.disabled td, .disabled td a {
+	color: #cfcfcf;
+}
+
 .formtable {
 	width: 100%;
 	border-spacing: 0;
@@ -751,3 +755,25 @@ caption {
 	font-weight: bold;
 	margin-bottom: 0.2em;
 }
+
+/* dataTables */
+table thead th.sorting_asc {
+    background-image: url('../img/icons/sort_down.png');
+    background-repeat: no-repeat;
+    background-position: 10px center;
+    padding-left: 25px;
+}
+ 
+table thead th.sorting_desc {
+    background-image: url('../img/icons/sort_up.png');
+    background-repeat: no-repeat;
+    background-position: 10px center;
+    padding-left: 25px;
+}
+ 
+table thead th.sorting {
+    background-image: url('../img/icons/sort_both.png');
+    background-repeat: no-repeat;
+    background-position: 10px center;
+    padding-left: 25px;
+}
\ No newline at end of file
diff --git a/templates/Froxlor/assets/img/icons/unlock.png b/templates/Froxlor/assets/img/icons/unlock.png
new file mode 100644
index 00000000..80de8034
Binary files /dev/null and b/templates/Froxlor/assets/img/icons/unlock.png differ
diff --git a/templates/Sparkle/admin/customers/customers_customer.tpl b/templates/Sparkle/admin/customers/customers_customer.tpl
index 07e25314..41421510 100644
--- a/templates/Sparkle/admin/customers/customers_customer.tpl
+++ b/templates/Sparkle/admin/customers/customers_customer.tpl
@@ -1,4 +1,4 @@
-<tr>
+<tr <if $row['deactivated'] == 1>class="disabled"</if>>
 	<td>
 		<if $row['company'] != ''>
 			{$row['company']}<br />
@@ -56,13 +56,18 @@
 			</span>
 		</div>
 	</td>
-	<td>
+	<td style="white-space: nowrap;>
 		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'edit', 'id' => $row['customerid']))}" style="text-decoration:none;">
 			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" />
 		</a>&nbsp;
 		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'delete', 'id' => $row['customerid']))}" style="text-decoration:none;">
 			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" />
+		</a>&nbsp;
+		<if $islocked == 1>
+		<a href="{$linker->getLink(array('section' => 'customers', 'page' => $page, 'action' => 'unlock', 'id' => $row['customerid']))}">
+			<img src="templates/{$theme}/assets/img/icons/unlock.png" alt="{$lng['panel']['unlock']}" />
 		</a>
+		</if>
 	</td>
 
 </tr>
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 7fb83365..35c119d8 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -522,6 +522,10 @@ table thead:first-child th {
 	border-top: 0;
 }
 
+.disabled td, .disabled td a {
+	color: #cfcfcf;
+}
+
 /* dataTables */
 table thead th.sorting_asc {
     background-image: url('../img/icons/sort_down.png');
diff --git a/templates/Sparkle/assets/img/icons/unlock.png b/templates/Sparkle/assets/img/icons/unlock.png
new file mode 100644
index 00000000..80de8034
Binary files /dev/null and b/templates/Sparkle/assets/img/icons/unlock.png differ