diff --git a/code/formfields/FontAwesomeField.php b/code/formfields/FontAwesomeField.php
index f67a5dd..1b2c8f3 100644
--- a/code/formfields/FontAwesomeField.php
+++ b/code/formfields/FontAwesomeField.php
@@ -31,12 +31,8 @@ class FontAwesomeField extends TextField
 
         // Libraries
         Requirements::css('https://use.fontawesome.com/releases/v'.self::config()->get('version').'/css/all.css');
-        Requirements::css(FONT_AWESOME_DIR . '/client/dist/css/lib/fontawesome-iconpicker.min.css');
-        Requirements::javascript(FONT_AWESOME_DIR . '/client/dist/js/lib/fontawesome-iconpicker.min.js');
-
-        // Module
-        Requirements::css(FONT_AWESOME_DIR . '/client/dist/css/font-awesome-module.css');
-        Requirements::javascript(FONT_AWESOME_DIR . '/client/dist/js/font-awesome-module.js');
+        Requirements::css(FONT_AWESOME_DIR . '/dist/css/app.css');
+        Requirements::javascript(FONT_AWESOME_DIR . '/dist/js/app.js');
 
         Requirements::set_force_js_to_bottom(true);
 
diff --git a/dist/css/app.css b/dist/css/app.css
index b9221b9..32aa3c1 100644
--- a/dist/css/app.css
+++ b/dist/css/app.css
@@ -1 +1 @@
-.icon-picker-modal{background-color:rgba(68,69,69,0);bottom:0;left:0;position:fixed;right:0;top:0;transition:background-color .3s ease-out,visibility .3s ease-out;visibility:hidden;z-index:100000}.icon-picker-modal.is-visible{background-color:rgba(68,69,69,.6);visibility:visible}.icon-picker-modal.is-visible .icon-picker-modal__dialog{opacity:1;transform:translate(-50%,-50%)}.icon-picker-modal__dialog{background-color:#fff;border-radius:16px;display:flex;flex-direction:column;height:440px;left:50%;min-width:380px;opacity:0;padding:24px;position:absolute;top:50%;transform:translate(-50%,-55%);transition:transform .3s ease-in-out,opacity .3s ease;z-index:1}.icon-picker-modal__header{align-items:center;display:flex;justify-content:space-between}.icon-picker-modal__header h2{font-size:24px;margin-block-end:0;margin-block-start:0}.icon-picker-modal__header .icon-picker-modal--close{-webkit-appearance:none;background:none;border:none;border-radius:4px;cursor:pointer;margin-left:auto;padding:2px;transition:background-color .3s ease}.icon-picker-modal__header .icon-picker-modal--close:hover{background-color:#f3f3f3}.icon-picker-modal__search{margin:32px 0 24px}.icon-picker-modal__content{display:grid;grid-template-columns:repeat(7,40px);grid-gap:8px;overflow-y:scroll}.icon-picker-modal__content .is-empty{grid-column:1/-1;text-align:center}.icon-picker-modal__content .icon-element{align-items:center;background-color:transparent;border:1px solid #ced4da;border-radius:4px;cursor:pointer;display:flex;height:40px;justify-content:center;transition:background-color .3s ease,border-color .3s ease;width:40px}.icon-picker-modal__content .icon-element i,.icon-picker-modal__content .icon-element svg{color:#0983fd;font-size:24px}.icon-picker-modal__content .icon-element:hover{background-color:#0983fd;border-color:#0983fd}.icon-picker-modal__content .icon-element:hover i,.icon-picker-modal__content .icon-element:hover svg{color:#fff}.icon-picker-modal__content .icon-element.is-selected{background-color:#0983fd;border-color:#0983fd}.icon-picker-modal__content .icon-element.is-selected i,.icon-picker-modal__content .icon-element.is-selected svg{color:#fff}.icon-picker-modal__content .icon-element[hidden]{display:none}.icon-picker-modal__footer{align-self:flex-end;margin-top:auto;padding-top:24px}
\ No newline at end of file
+.icon-picker-modal{background-color:rgba(68,69,69,0);bottom:0;left:0;position:fixed;right:0;top:0;transition:background-color .3s ease-out,visibility .3s ease-out;visibility:hidden;z-index:100000}.icon-picker-modal.is-visible{background-color:rgba(68,69,69,.6);visibility:visible}.icon-picker-modal.is-visible .icon-picker-modal__dialog{opacity:1;transform:translate(-50%,-50%)}.icon-picker-modal__dialog{background-color:#fff;border-radius:16px;display:flex;flex-direction:column;height:440px;left:50%;min-width:380px;opacity:0;padding:24px;position:absolute;top:50%;transform:translate(-50%,-55%);transition:transform .3s ease-in-out,opacity .3s ease;z-index:1}.icon-picker-modal__header{align-items:center;display:flex;justify-content:space-between}.icon-picker-modal__header h2{font-size:24px;margin-block-end:0;margin-block-start:0}.icon-picker-modal__header .icon-picker-modal--close{-webkit-appearance:none;background:none;border:none;border-radius:4px;cursor:pointer;margin-left:auto;padding:2px;transition:background-color .3s ease}.icon-picker-modal__header .icon-picker-modal--close:hover{background-color:#f3f3f3}.icon-picker-modal__search{margin:32px 0 24px}.icon-picker-modal__content{display:grid;grid-template-columns:repeat(7,40px);grid-gap:8px;overflow-y:scroll}.icon-picker-modal__content .is-empty{grid-column:1/-1;text-align:center}.icon-picker-modal__content .icon-element{align-items:center;background-color:transparent;border:1px solid #ced4da;border-radius:4px;cursor:pointer;display:flex;height:40px;justify-content:center;transition:background-color .3s ease,border-color .3s ease;width:40px}.icon-picker-modal__content .icon-element i,.icon-picker-modal__content .icon-element svg{color:#0983fd;font-size:24px}.icon-picker-modal__content .icon-element:hover{background-color:#0983fd;border-color:#0983fd}.icon-picker-modal__content .icon-element:hover i,.icon-picker-modal__content .icon-element:hover svg{color:#fff}.icon-picker-modal__content .icon-element.is-selected{background-color:#0983fd;border-color:#0983fd}.icon-picker-modal__content .icon-element.is-selected i,.icon-picker-modal__content .icon-element.is-selected svg{color:#fff}.icon-picker-modal__content .icon-element[hidden]{display:none}.icon-picker-modal__footer{align-self:flex-end;margin-top:auto;padding-top:24px}.icon-picker-modal__content .icon-element i,.icon-picker-modal__content .icon-element svg{color:inherit}.icon-picker-modal__dialog{min-width:400px}
\ No newline at end of file
diff --git a/dist/records.json b/dist/records.json
index 850f196..65604e9 100644
--- a/dist/records.json
+++ b/dist/records.json
@@ -10,6 +10,33 @@
       524
     ]
   },
+  "mini-css-extract-plugin /mnt/data/srv/dist/repositories/silverstripe-font-awesome/node_modules/.pnpm/css-loader@6.11.0_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].use[1]!./node_modules/.pnpm/sass-loader@13.3.3_sass@1.77.8_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].use[2]!./src/scss/app.scss": [
+    {
+      "chunks": {
+        "byName": {
+          "child": 615
+        },
+        "bySource": {
+          "0 child": 615
+        },
+        "usedIds": [
+          615
+        ]
+      },
+      "modules": {
+        "byIdentifier": {
+          "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.24.9_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/css-loader@6.11.0_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/css-loader/dist/runtime/api.js": 221,
+          "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.24.9_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/css-loader@6.11.0_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/css-loader/dist/runtime/sourceMaps.js": 991,
+          "./node_modules/.pnpm/css-loader@6.11.0_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].use[1]!./node_modules/.pnpm/sass-loader@13.3.3_sass@1.77.8_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].use[2]!./src/scss/app.scss": 196
+        },
+        "usedIds": [
+          196,
+          221,
+          991
+        ]
+      }
+    }
+  ],
   "modules": {
     "byIdentifier": {
       "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.24.9_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/vanilla-icon-picker@1.3.0/node_modules/vanilla-icon-picker/dist/icon-picker.min.js": 155,
diff --git a/dist/report.html b/dist/report.html
index f5b7246..64dd28e 100644
--- a/dist/report.html
+++ b/dist/report.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-    <title>@a2nt/ss-bootstrap-ui-webpack-boilerplate-react [27 Jul 2024 at 11:24]</title>
+    <title>@a2nt/ss-bootstrap-ui-webpack-boilerplate-react [27 Jul 2024 at 11:38]</title>
     <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABrVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////+O1foceMD///+J0/qK1Pr7/v8Xdr/9///W8P4UdL7L7P0Scr2r4Pyj3vwad8D5/f/2/f+55f3E6f34+/2H0/ojfMKpzOd0rNgQcb3F3O/j9f7c8v6g3Pz0/P/w+v/q+P7n9v6T1/uQ1vuE0vqLut/y+v+Z2fvt+f+15Pzv9fuc2/vR7v2V2Pvd6/bg9P7I6/285/2y4/yp3/zp8vk8i8kqgMT7/P31+fyv4vxGkcz6/P6/6P3j7vfS5PNnpNUxhcbO7f7F6v3O4vHK3/DA2u631Ouy0eqXweKJud5wqthfoNMMbLvY8f73+v2dxeR8sNtTmdDx9/zX6PSjyeaCtd1YnNGX2PuQveCGt95Nls42h8dLlM3F4vBtAAAAM3RSTlMAAyOx0/sKBvik8opWGBMOAe3l1snDm2E9LSb06eHcu5JpHbarfHZCN9CBb08zzkdNS0kYaptYAAAFV0lEQVRYw92X51/aYBDHHS2O2qqttVbrqNq9m+TJIAYIShBkWwqIiCgoWvfeq7Z2/s29hyQNyUcR7LveGwVyXy6XH8/9rqxglLfUPLxVduUor3h0rfp2TYvpivk37929TkG037hffoX0+peVtZQc1589rigVUdXS/ABSAyEmGIO/1XfvldSK8vs3OqB6u3m0nxmIrvgB0dj7rr7Y9IbuF68hnfFaiHA/sxqm0wciIG43P60qKv9WXWc1RXGh/mFESFABTSBi0sNAKzqet17eCtOb3kZIDwxEEU0oAIJGYxNBDhBND29e0rtXXbcpuPmED9IhEAAQ/AXEaF8EPmnrrKsv0LvWR3fg5sWDNAFZOgAgaKvZDogHNU9MFwnnYROkc56RD5CjAbQX9Ow4g7upCsvYu55aSI/Nj0H1akgKQEUM94dwK65hYRmFU9MIcH/fqJYOZYcnuJSU/waKDgTOEVaVKhwrTRP5XzgSpAITYzom7UvkhFX5VutmxeNnWDjjswTKTyfgluNDGbUpWissXhF3s7mlSml+czWkg3D0l1nNjGNjz3myOQOa1KM/jOS6ebdbAVTCi4gljHSFrviza7tOgRWcS0MOUX9zdNgag5w7rRqA44Lzw0hr1WqES36dFliSJFlh2rXIae3FFcDDgKdxrUIDePr8jGcSClV1u7A9xeN0ModY/pHMxmR1EzRh8TJiwqsHmKW0l4FCEZI+jHio+JdPPE9qwQtTRxku2D8sIeRL2LnxWSllANCQGOIiqVHAz2ye2JR0DcH+HoxDkaADLjgxjKQ+AwCX/g0+DNgdG0ukYCONAe+dbc2IAc6fwt1ARoDSezNHxV2Cmzwv3O6lDMV55edBGwGK9n1+x2F8EDfAGCxug8MhpsMEcTEAWf3rx2vZhe/LAmtIn/6apE6PN0ULKgywD9mmdxbmFl3OvD5AS5fW5zLbv/YHmcsBTjf/afDz3MaZTVCfAP9z6/Bw6ycv8EUBWJIn9zYcoAWWlW9+OzO3vkTy8H+RANLmdrpOuYWdZYEXpo+TlCJrW5EARb7fF+bWdqf3hhyZI1nWJQHgznErZhbjoEsWqi8dQNoE294aldzFurwSABL2XXMf9+H1VQGke9exw5P/AnA5Pv5ngMul7LOvO922iwACu8WkCwLCafvM4CeWPxfA8lNHcWZSoi8EwMAIciKX2Z4SWCMAa3snCZ/G4EA8D6CMLNFsGQhkkz/gQNEBbPCbWsxGUpYVu3z8IyNAknwJkfPMEhLyrdi5RTyUVACkw4GSFRNWJNEW+fgPGwHD8/JxnRuLabN4CGNRkAE23na2+VmEAUmrYymSGjMAYqH84YUIyzgzs3XC7gNgH36Vcc4zKY9o9fgPBXUAiHHwVboBHGLiX6Zcjp1f2wu4tvzZKo0ecPnDtQYDQvJXaBeNzce45Fp28ZQLrEZVuFqgBwOalArKXnW1UzlnSusQKJqKYNuz4tOnI6sZG4zanpemv+7ySU2jbA9h6uhcgpfy6G2PahirDZ6zvq6zDduMVFTKvzw8wgyEdelwY9in3XkEPs3osJuwRQ4qTkfzifndg9Gfc4pdsu82+tTnHZTBa2EAMrqr2t43pguc8tNm7JQVQ2S0ukj2d22dhXYP0/veWtwKrCkNoNimAN5+Xr/oLrxswKbVJjteWrX7eR63o4j9q0GxnaBdWgGA5VStpanIjQmEhV0/nVt5VOFUvix6awJhPcAaTEShgrG+iGyvb5a0Ndb1YGHFPEwoqAinoaykaID1o1pdPNu7XsnCKQ3R+hwWIIhGvORcJUBYXe3Xa3vq/mF/N9V13ugufMkfXn+KHsRD0B8AAAAASUVORK5CYII=" type="image/x-icon" />
 
     <script>
diff --git a/src/js/app.js b/src/js/app.js
index 18049a3..8f6dc2f 100755
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -1,10 +1,10 @@
 'use strict'
 
-import '../scss/app.scss'
-
 import 'vanilla-icon-picker/src/scss/themes/icon-picker.bootstrap-5.scss'
 import IconPicker from 'vanilla-icon-picker'
 
+import '../scss/app.scss'
+
 (function($) {
   $.entwine(($) => {
 
diff --git a/src/scss/app.scss b/src/scss/app.scss
index e69de29..54bc6f6 100755
--- a/src/scss/app.scss
+++ b/src/scss/app.scss
@@ -0,0 +1,13 @@
+.icon-picker {
+    &-modal__content{
+        .icon-element {
+            i,
+            svg {
+                color: inherit;
+            }
+        }
+    }
+    &-modal__dialog {
+        min-width: 400px;
+    }
+}