diff --git a/customer_domains.php b/customer_domains.php
index 7c3644f4..fbb70a13 100644
--- a/customer_domains.php
+++ b/customer_domains.php
@@ -73,17 +73,20 @@ elseif($page == 'domains')
 				$parentdomains_count++;
 			}
 
-			$domains_count++;
-/*
-			$domainparts = explode('.', $row['domain']);
-			$domainparts = array_reverse($domainparts);
-			$sortkey = '';
-			foreach($domainparts as $key => $part)
-			{
-				$sortkey.= $part . '.';
+			/**
+			 * check for set ssl-certs to show either
+			 * a red or a green ssl-icon
+			 */
+			$row['domain_hascert'] = false;
+			$ssl_result = $db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid`='".(int)$row['id']."';");
+			if (is_array($ssl_result)
+				&& isset($ssl_result['ssl_cert_file'])
+				&& $ssl_result['ssl_cert_file'] != ''
+			) {
+				$row['domain_hascert'] = true;
 			}
-			$domain_array[$sortkey] = $row;
-*/
+
+			$domains_count++;
 			$domain_array[$row['domain']] = $row;
 		}
 
diff --git a/templates/Froxlor/assets/img/icons/ssl.png b/templates/Froxlor/assets/img/icons/ssl.png
deleted file mode 100644
index a54e26d3..00000000
Binary files a/templates/Froxlor/assets/img/icons/ssl.png and /dev/null differ
diff --git a/templates/Froxlor/assets/img/icons/ssl_green.png b/templates/Froxlor/assets/img/icons/ssl_green.png
new file mode 100644
index 00000000..c40835df
Binary files /dev/null and b/templates/Froxlor/assets/img/icons/ssl_green.png differ
diff --git a/templates/Froxlor/assets/img/icons/ssl_red.png b/templates/Froxlor/assets/img/icons/ssl_red.png
new file mode 100644
index 00000000..8e364164
Binary files /dev/null and b/templates/Froxlor/assets/img/icons/ssl_red.png differ
diff --git a/templates/Froxlor/customer/domains/domains_domain.tpl b/templates/Froxlor/customer/domains/domains_domain.tpl
index b5c3c737..37298570 100644
--- a/templates/Froxlor/customer/domains/domains_domain.tpl
+++ b/templates/Froxlor/customer/domains/domains_domain.tpl
@@ -17,7 +17,7 @@
 		</if>
 		<if $show_ssledit == 1>
 			<a href="{$linker->getLink(array('section' => 'domains', 'page' => 'domainssleditor', 'action' => 'view', 'id' => $row['id']))}" style="text-decoration:none;">
-				<img src="templates/{$theme}/assets/img/icons/ssl.png" alt="{$lng['panel']['ssleditor']}" />
+				<img src="templates/{$theme}/assets/img/icons/ssl_<if $row['domain_hascert'] == 1>green<else>red</if>.png" alt="{$lng['panel']['ssleditor']}" />
 			</a>&nbsp;
 		</if>
 		<if $row['parentdomainid'] == '0' && !(isset($row['domainaliasid']) && $row['domainaliasid'] != 0)>