diff --git a/js/bootstrap-iconpicker.js b/js/bootstrap-iconpicker.js
index a6e11aed..84dc4c54 100644
--- a/js/bootstrap-iconpicker.js
+++ b/js/bootstrap-iconpicker.js
@@ -68,7 +68,8 @@
         selectedClass: 'btn-warning',
         unselectedClass: 'btn-default',
         resetButton: true,
-		noIconSelectedClass: 'glyphicon glyphicon-ban-circle'
+		noIconSelectedClass: 'glyphicon glyphicon-ban-circle',
+        labelNoIcon: 'No Icon'
     };
 
     // ICONPICKER PRIVATE METHODS
@@ -329,7 +330,7 @@
     	var resetButton = [
     		'<tr>',
     			'<td colspan="' + op.cols + '">',
-    				'<button class="btn btn-danger btn-icon" style="width: ' + op.cols * 39 + 'px;" value=""><span class="glyphicon glyphicon-ban-circle"></span> No Icon</button>',
+    				'<button class="btn btn-danger btn-icon" style="width: ' + op.cols * 39 + 'px;" value=""><span class="glyphicon glyphicon-ban-circle"></span> ' + op.labelNoIcon + '</button>',
     			'</td>',
     		'</tr>'
     	];
diff --git a/js/modsForHesk-javascript.js b/js/modsForHesk-javascript.js
index 5c0b3828..d3b40d2f 100644
--- a/js/modsForHesk-javascript.js
+++ b/js/modsForHesk-javascript.js
@@ -1,4 +1,4 @@
-//-- Activate anything Hesk UI needs, such as tooltips.
+//-- Activate anything Mods for HESK needs, such as tooltips.
 var loadJquery = function()
 {
     //-- Activate tooltips
@@ -33,10 +33,17 @@ var loadJquery = function()
 
     $('[data-toggle="iconpicker"]').iconpicker({
         iconset: ['fontawesome', 'octicon'],
-        selectedClass: "btn-success"
+        selectedClass: "btn-warning",
+        labelNoIcon: $('#no-icon').text(),
+        searchText: $('#search-icon').text(),
+        labelFooter: $('#footer-icon').text()
     });
 };
 
+var setIcon = function(icon) {
+    $('[data-toggle="iconpicker"]').iconpicker('setIcon', icon);
+}
+
 function selectAll(id) {
     $('#' + id + ' option').prop('selected', true);
 }
diff --git a/language/en/text.php b/language/en/text.php
index c5216a6b..1c452d3e 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -24,6 +24,9 @@ $hesklang['EMAIL_HR']='------ Reply above this line ------';
 // ADDED OR MODIFIED IN Mods for HESK 2.3.0
 $hesklang['sm_icon'] = 'Icon';
 $hesklang['sm_icon_type'] = 'Icon Type';
+$hesklang['sm_no_icon'] = 'No Icon';
+$hesklang['sm_search_icon'] = 'Search Icon';
+$hesklang['sm_iconpicker_footer_label'] = '{0} - {1} of {2}'; // {0}: lower bound of page, {1}: upper bound of page, {2}: total number of icons
 
 // ADDED OR MODIFIED IN Mods for HESK 2.2.1
 $hesklang['popart_no_colon']='Top Knowledgebase Articles'; // same as $hesklang['popart'] but without a colon (:)