diff --git a/admin/service_messages.php b/admin/service_messages.php
index 9513c460..44af9248 100644
--- a/admin/service_messages.php
+++ b/admin/service_messages.php
@@ -342,8 +342,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             //
                             ?>
                             <div class="col-md-10">
-                                <div name="icon" class="btn btn-default iconpicker-container" data-toggle="iconpicker" data-icon="<?php echo $icon; ?>"></button>
-                                <input type="checkbox" name="dont-use-icon"> Don't use icon
+                                <div name="icon" class="btn btn-default iconpicker-container" data-toggle="iconpicker" data-icon="<?php //echo $icon; ?>"></button>
                             </div>
                         </div>
                         <div class="form-group">
diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
index 1f0a4fea..5c0b3828 100644
--- a/js/modsForHesk-javascript.js
+++ b/js/modsForHesk-javascript.js
@@ -32,7 +32,8 @@ var loadJquery = function()
     });
 
     $('[data-toggle="iconpicker"]').iconpicker({
-        iconset: ['fontawesome', 'octicon']
+        iconset: ['fontawesome', 'octicon'],
+        selectedClass: "btn-success"
     });
 };