diff --git a/admin/service_messages.php b/admin/service_messages.php
index ccd9e84c..69e70fb0 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">
-                                <button name="icon" class="btn btn-default iconpicker-container" data-icon="<?php echo $icon; ?>"></button>
-                                <input type="checkbox" name="dont-use-icon"> Don't use icon
+                                <select class="form-control" name="icon" data-toggle="iconpicker"></select>
                             </div>
                         </div>
                         <div class="form-group">
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 4640dbec..84f0ee30 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -59,11 +59,14 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
     <?php } ?>
     <link href="//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/octicons.css" type="text/css">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fonticonpicker.min.css" type="text/css">
+    <link rel="stylesheet" href="<?php echo HESK_PATH; ?>css/jquery.fonticonpicker.bootstrap.min.css" type="text/css">
 	<script src="<?php echo HESK_PATH; ?>js/jquery-1.10.2.min.js"></script>
 	<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>hesk_javascript.js"></script>
     <script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/modsForHesk-javascript.js"></script>
 	<script language="Javascript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap.min.js"></script>
     <script language="JavaScript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/bootstrap-datepicker.js"></script>
+    <script language="JavaScript" type="text/javascript" src="<?php echo HESK_PATH; ?>js/jquery.fonticonpicker.min.js"></script>
 
     <?php
 	/* Prepare Javascript that browser should load on page load */
diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
index 35215178..c761f99f 100644
--- a/js/modsForHesk-javascript.js
+++ b/js/modsForHesk-javascript.js
@@ -30,6 +30,11 @@ var loadJquery = function()
             format: "yyyy-mm-dd"
         });
     });
+
+    //-- Activate jQuery iconpicker
+    $(function() {
+       $('[data-toggle="iconpicker"]').fontIconPicker();
+    });
 };
 
 function selectAll(id) {