diff --git a/build/scripts/remove_modules.sh b/build/scripts/remove_modules.sh
index 4cce59d..0622332 100755
--- a/build/scripts/remove_modules.sh
+++ b/build/scripts/remove_modules.sh
@@ -8,8 +8,9 @@ cd $DIR
 rm -rf {@babel,@pdf-lib,@types,core-js,core-js-pure,css-line-break,dompurify,fflate,pako,performance-now,raf,regnerator-runtime,rgbcolor,stackblur-canvas,svg-pathdata,tslib,type-fest}
 
 cd @fortawesome/fontawesome-free
-rm -rf {js,less,metadata,scss,sprites,svgs}
+rm -rf {less,metadata,scss,sprites,svgs}
 find css -type f -not -name 'all.min.css' -delete
+find js -type f -not -name 'all.min.js' -delete
 find webfonts -type f -not -name '*.woff*' -delete
 find . -type f -name '*.tgz' -delete # for some reason it's packaging an 18MB tarball sometimes
 cd $DIR
diff --git a/src/index.html b/src/index.html
index faf9f33..6c33f36 100644
--- a/src/index.html
+++ b/src/index.html
@@ -9,7 +9,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <link rel="stylesheet" href="css/bootstrap.min.css" />
-<link rel="stylesheet" href="node_modules/@fortawesome/fontawesome-free/css/all.min.css" />
 <link rel="stylesheet" href="css/main.css" />
 <link rel="icon" href="img/icon.svg" />
 
@@ -17,7 +16,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
     <div class="modal-dialog modal-fullscreen">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="settingsModalLabel">Settings</h5>
+                <h5 class="modal-title" id="settingsModalLabel"><i class="fas fa-cogs"></i> Settings</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
@@ -76,7 +75,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
                         <div class="btn btn-danger m-1" onclick="importPrivateKey()"><i class="fas fa-upload"></i> Restore private key</div>
                     </div>
                     <div class="col-12 col-md-6 col-lg-4" id="appOptionsSettings">
-                        <h5><i class="fas fa-cog"></i> App Options</h5>
+                        <h5><i class="fas fa-sliders-h"></i> App Options</h5>
                         Button size: <select class="form-control" id="button_size">
                             <option value="lg">Large</option>
                             <option value="" selected>Medium</option>
@@ -108,7 +107,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="signatureModalLabel">Signature Pad</h5>
+                <h5 class="modal-title" id="signatureModalLabel"><i class="fas fa-signature"></i> Signature Pad</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
@@ -133,7 +132,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="verifyModalLabel">Digital Signature Analysis Report</h5>
+                <h5 class="modal-title" id="verifyModalLabel"><i class="fas fa-search"></i> Digital Signature Analysis Report</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
@@ -151,7 +150,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
     <div class="modal-dialog modal-xl">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="certificateBuilderModalLabel">Notarial Certificate Builder</h5>
+                <h5 class="modal-title" id="certificateBuilderModalLabel"><i class="fas fa-sticky-note"></i> Notarial Certificate Builder</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
@@ -162,13 +161,17 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
                 Notarial act: <select class="form-control" id="cert_act">
                     <option value="acknowledged">Acknowledgement ("acknowledged")</option>
                     <option value="signed">Signature Witness ("signed")</option>
-                    <option value="signed and sworn to">Jurat/Verification on oath ("signed and sworn to")</option>
-                    <option value="signed and affirmed to">Jurat/Verification on affirmation ("signed and affirmed to")</option>
+                    <option value="signed and sworn">Jurat/Verification on oath ("signed and sworn")</option>
+                    <option value="signed and affirmed">Jurat/Verification on affirmation ("signed and affirmed")</option>
                     <option value="CERTIFIEDCOPYELECTRONIC">Certified copy of electronic record</option>
                 </select>
             </div>
-            <div class="modal-body">
-                <img id="certificate-preview" style="width: 6in; height: 4in;"/>
+            <div class="modal-body py-1">
+                <div class="card">
+                    <div class="card-body p-1 text-center">
+                        <img id="certificate-preview" style="width: 6in; height: 4in;"/>
+                    </div>
+                </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Cancel</button>
@@ -243,6 +246,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 <div id="svgtrimbox"></div>
 
 
+<script src="node_modules/@fortawesome/fontawesome-free/js/all.min.js"></script>
 <script src="node_modules/jquery/dist/jquery.min.js"></script>
 <script src="node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
 <script src="node_modules/pdfjs-dist/build/pdf.min.js"></script>