diff --git a/CRM/Admin/Form.php b/CRM/Admin/Form.php
index 5fa9ba5b06dd..be00bd95a601 100644
--- a/CRM/Admin/Form.php
+++ b/CRM/Admin/Form.php
@@ -69,7 +69,7 @@ public function getDefaultContext() {
    */
   public function preProcess() {
     Civi::resources()->addStyleFile('civicrm', 'css/admin.css');
-    Civi::resources()->addScriptFile('civicrm', 'js/crm.admin.js');
+    Civi::resources()->addScriptFile('civicrm', 'js/jquery/jquery.crmIconPicker.js');
 
     $this->_id = $this->get('id');
     $this->_BAOName = $this->get('BAOName');
diff --git a/js/crm.admin.js b/js/crm.admin.js
deleted file mode 100644
index 2884ae90f0e6..000000000000
--- a/js/crm.admin.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// https://civicrm.org/licensing
-(function($) {
-  "use strict";
-  $(document)
-    .on('crmLoad', function(e) {
-      $('.crm-icon-picker', e.target).not('.iconpicker-widget').each(function() {
-        var $el = $(this);
-        CRM.loadScript(CRM.config.resourceBase + 'js/jquery/jquery.crmIconPicker.js').done(function() {
-          $el.crmIconPicker();
-        });
-        // Hack to get the strings in this lazy-loaded file translated
-        ts('None');
-        ts('Normal');
-        ts('Rotate right');
-        ts('Rotate left');
-        ts('Rotate 180');
-        ts('Flip horizontal');
-        ts('Flip vertical');
-      });
-    });
-})(CRM.$);
diff --git a/js/jquery/jquery.crmIconPicker.js b/js/jquery/jquery.crmIconPicker.js
index 6e84df5c026e..5dea481a856b 100644
--- a/js/jquery/jquery.crmIconPicker.js
+++ b/js/jquery/jquery.crmIconPicker.js
@@ -80,9 +80,9 @@
 
         function displayDialog() {
           dialog.append('<style type="text/css">' +
-            '#crmIconPicker {font-size: 2em;}' +
+            '#crmIconPicker {font-size: 20px;}' +
             '#crmIconPicker .icon-search input {font-family: FontAwesome; padding-left: .5em; margin-bottom: 1em;}' +
-            '#crmIconPicker a.ui-button {width: 2em; height: 2em; color: #222;}' +
+            '#crmIconPicker a.ui-button {width: 1em; height: 1em; color: #222;}' +
             '#crmIconPicker a.ui-button .ui-icon {margin-top: -0.5em; width: auto; height: auto;}' +
             '</style>' +
             '<div class="icon-search"><input class="crm-form-text" name="search" placeholder="&#xf002"/></div>' +
@@ -117,4 +117,9 @@
 
     });
   };
+
+  $(document)
+    .on('crmLoad', function(e) {
+      $('.crm-icon-picker', e.target).not('.iconpicker-widget').crmIconPicker();
+    });
 }(CRM.$, CRM._));