diff --git a/src/main/resources/static/images/redact-auto.svg b/src/main/resources/static/images/redact-auto.svg
index e7d1cfcc..5c87b738 100644
--- a/src/main/resources/static/images/redact-auto.svg
+++ b/src/main/resources/static/images/redact-auto.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg  version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
         <symbol id="icon-redact-auto" viewBox="0 0 24 24">  <g id="Layer_2" data-name="Layer 2">
     <g id="Layer_1-2" data-name="Layer 1">
       <rect width="24" height="24" style="fill: none"/>
@@ -14,4 +14,5 @@
       </g>
     </g>
   </g>
+    </symbol>
 </svg>
diff --git a/src/main/resources/static/images/redact-manual.svg b/src/main/resources/static/images/redact-manual.svg
index 2b632266..62296625 100644
--- a/src/main/resources/static/images/redact-manual.svg
+++ b/src/main/resources/static/images/redact-manual.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg  version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
         <symbol id="icon-redact-manual" viewBox="-2 0 24 24">
   <g id="Layer_2" data-name="Layer 2">
     <g id="Layer_1-2" data-name="Layer 1">
diff --git a/src/main/resources/static/images/split-auto.svg b/src/main/resources/static/images/split-auto.svg
index 46a2bd30..1aa08fcc 100644
--- a/src/main/resources/static/images/split-auto.svg
+++ b/src/main/resources/static/images/split-auto.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg  version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-        <symbol id="icon-split-auto" viewBox="0 0 24 24">  <g id="Layer_2" data-name="Layer 2">  <g id="Layer_2" data-name="Layer 2">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
+        <symbol id="icon-split-auto" viewBox="0 0 24 24">
+           <g id="Layer_2" data-name="Layer 2">
     <g id="Layer_1-2" data-name="Layer 1">
       <g>
         <path d="M18.42466,20.16555,12,13.74089,9.84315,15.89774a2.45776,2.45776,0,0,1,.2524.73425,4.481,4.481,0,0,1,.06883.78013A3.53515,3.53515,0,0,1,9.086,20.00493a3.53516,3.53516,0,0,1-2.59281,1.07843,3.53516,3.53516,0,0,1-2.59281-1.07843,3.6561,3.6561,0,0,1,0-5.18561,3.53516,3.53516,0,0,1,2.59281-1.07843,4.48117,4.48117,0,0,1,.78014.06884,2.45778,2.45778,0,0,1,.73424.25239l2.15685-2.15685L8.00753,9.74842a2.45752,2.45752,0,0,1-.73424.2524,4.48117,4.48117,0,0,1-.78014.06884A3.53516,3.53516,0,0,1,3.90034,8.99123,3.53515,3.53515,0,0,1,2.82192,6.39842,3.53515,3.53515,0,0,1,3.90034,3.80561,3.53515,3.53515,0,0,1,6.49315,2.72719,3.53515,3.53515,0,0,1,9.086,3.80561a3.53515,3.53515,0,0,1,1.07842,2.59281,4.48107,4.48107,0,0,1-.06883.78014,2.45786,2.45786,0,0,1-.2524.73425L21.17808,19.24774v.91781Zm-3.67123-9.17809L12.91781,9.15185,18.42466,3.645h2.75342v.91781ZM6.49315,8.234A1.841,1.841,0,0,0,8.32877,6.39842,1.841,1.841,0,0,0,6.49315,4.56281,1.841,1.841,0,0,0,4.65753,6.39842,1.841,1.841,0,0,0,6.49315,8.234ZM12,12.36418a.47051.47051,0,1,0-.32123-.13767A.44026.44026,0,0,0,12,12.36418ZM6.49315,19.24774a1.83562,1.83562,0,1,0-1.29641-3.132,1.83562,1.83562,0,0,0,1.29641,3.132Z" style="fill: currentColor"/>
@@ -9,4 +10,5 @@
       <rect width="24" height="24" style="fill: none"/>
     </g>
   </g>
+    </symbol>
 </svg>
diff --git a/src/main/resources/static/images/split-chapters.svg b/src/main/resources/static/images/split-chapters.svg
index e8b09842..4a3ad37d 100644
--- a/src/main/resources/static/images/split-chapters.svg
+++ b/src/main/resources/static/images/split-chapters.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg  version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
-        <symbol id="icon-split-chapters" viewBox="0 0 24 24">  <g id="Layer_2" data-name="Layer 2">  <g id="Layer_2" data-name="Layer 2">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
+        <symbol id="icon-split-chapters" viewBox="0 0 24 24">
+          <g id="Layer_2" data-name="Layer 2">
     <g id="Layer_1-2" data-name="Layer 1">
       <g>
         <path d="M17.632,9.18527v5.44l1.94-1.16,1.94,1.16v-5.44Z" style="fill: currentColor"/>
@@ -9,4 +10,5 @@
       <rect width="24" height="24" style="fill: none"/>
     </g>
   </g>
+    </symbol>
 </svg>
diff --git a/src/main/resources/static/images/split-size.svg b/src/main/resources/static/images/split-size.svg
index f05aaaf4..9fd1840f 100644
--- a/src/main/resources/static/images/split-size.svg
+++ b/src/main/resources/static/images/split-size.svg
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg  version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" style="padding-left: 20px; margin-right: -20px;">
-        <symbol id="icon-split-size" viewBox="0 0 24 24">  <g id="Layer_2" data-name="Layer 2">  <g id="Layer_2" data-name="Layer 2">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">
+        <symbol id="icon-split-size" viewBox="0 0 24 24">
+         <g id="Layer_2" data-name="Layer 2">
     <g id="Layer_1-2" data-name="Layer 1">
       <g>
         <path d="M17.90313,20.16555l-6.42466-6.42466L9.32162,15.89774a2.45776,2.45776,0,0,1,.2524.73425,4.481,4.481,0,0,1,.06883.78013,3.53515,3.53515,0,0,1-1.07842,2.59281,3.53516,3.53516,0,0,1-2.59281,1.07843,3.53516,3.53516,0,0,1-2.59281-1.07843,3.6561,3.6561,0,0,1,0-5.18561,3.53516,3.53516,0,0,1,2.59281-1.07843,4.48117,4.48117,0,0,1,.78014.06884,2.45778,2.45778,0,0,1,.73424.25239l2.15685-2.15685L7.486,9.74842a2.45752,2.45752,0,0,1-.73424.2524,4.48117,4.48117,0,0,1-.78014.06884A3.53516,3.53516,0,0,1,3.37881,8.99123,3.53515,3.53515,0,0,1,2.30039,6.39842,3.53515,3.53515,0,0,1,3.37881,3.80561,3.53515,3.53515,0,0,1,5.97162,2.72719,3.53515,3.53515,0,0,1,8.56443,3.80561,3.53515,3.53515,0,0,1,9.64285,6.39842a4.48107,4.48107,0,0,1-.06883.78014,2.45786,2.45786,0,0,1-.2524.73425L20.65655,19.24774v.91781Zm-3.67124-9.17809L12.39628,9.15185,17.90313,3.645h2.75342v.91781ZM5.97162,8.234A1.841,1.841,0,0,0,7.80724,6.39842,1.841,1.841,0,0,0,5.97162,4.56281,1.841,1.841,0,0,0,4.136,6.39842,1.841,1.841,0,0,0,5.97162,8.234Zm5.50685,4.13014a.47051.47051,0,1,0-.32123-.13767A.44026.44026,0,0,0,11.47847,12.36418ZM5.97162,19.24774a1.83562,1.83562,0,1,0-1.29641-3.132,1.83562,1.83562,0,0,0,1.29641,3.132Z" style="fill: currentColor"/>
@@ -13,4 +14,5 @@
       <rect width="24" height="24" style="fill: none"/>
     </g>
   </g>
+    </symbol>
 </svg>
diff --git a/src/main/resources/templates/auto-split-pdf.html b/src/main/resources/templates/auto-split-pdf.html
index 2ef7e23d..c9cd2b28 100644
--- a/src/main/resources/templates/auto-split-pdf.html
+++ b/src/main/resources/templates/auto-split-pdf.html
@@ -17,7 +17,9 @@
         <div class="row justify-content-center">
           <div class="col-md-6 bg-card">
             <div class="tool-header">
-              <span class="material-symbols-rounded tool-header-icon advance">cut</span>
+              <svg class="material-symbols-rounded tool-header-icon advance">
+                <use xlink:href="/images/split-auto.svg#icon-split-auto"></use>
+              </svg>
               <span class="tool-header-text" th:text="#{autoSplitPDF.header}"></span>
             </div>
 
diff --git a/src/main/resources/templates/fragments/navbarEntryCustom.html b/src/main/resources/templates/fragments/navbarEntryCustom.html
index 71c2fd41..c9cdb4f1 100644
--- a/src/main/resources/templates/fragments/navbarEntryCustom.html
+++ b/src/main/resources/templates/fragments/navbarEntryCustom.html
@@ -1,13 +1,14 @@
 <th:block th:fragment="navbarEntry(endpoint, toolIcon, titleKey, descKey, tagKey, toolGroup)"
-th:if="${@endpointConfiguration.isEndpointEnabled(endpoint)}">
+  th:if="${@endpointConfiguration.isEndpointEnabled(endpoint)}">
   <a th:id="@{${endpoint}}" class="dropdown-item" style="position:relative" th:href="@{${endpoint}}"
     th:data-bs-link="@{${endpoint}}"
     th:classappend="${endpoint.equals(currentPage)} ?  ${toolGroup} + ' active' : '' + ${toolGroup}"
     th:data-bs-tags="#{${tagKey}}" th:data-bs-title='#{${titleKey}}'>
     <div style="height:2.5rem;align-items: center;display: flex" th:title="#{${descKey}}" class="icon" alt="icon"
       th:class="@{${toolGroup}}">
-      <svg class="nav-icon" style="height: 2.7rem; width:2.7rem; align-items:center; display: flex; justify-content: center;">
-        <use th:href="@{${toolIcon}}"></use>
+      <svg class="nav-icon"
+        style="height: 2.7rem; width:2.7rem; align-items:center; display: flex; justify-content: center;">
+        <use th:xlink:href="@{${toolIcon}}"></use>
       </svg>
       <span class="icon-text" th:text="#{${titleKey}}"></span>
     </div>
diff --git a/src/main/resources/templates/security/auto-redact.html b/src/main/resources/templates/security/auto-redact.html
index 26bfb39e..2188540a 100644
--- a/src/main/resources/templates/security/auto-redact.html
+++ b/src/main/resources/templates/security/auto-redact.html
@@ -1,86 +1,96 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
-  <head>
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}"
+  xmlns:th="https://www.thymeleaf.org">
+
+<head>
   <th:block th:insert="~{fragments/common :: head(title=#{autoRedact.title}, header=#{autoRedact.header})}"></th:block>
-  </head>
+</head>
 
-  <body>
-    <div id="page-container">
-      <div id="content-wrap">
-        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br><br>
-        <div class="container">
-          <div class="row justify-content-center">
-            <div class="col-md-6 bg-card">
-              <div class="tool-header">
-                <span class="material-symbols-rounded tool-header-icon security">playlist_remove</span>
-                <span class="tool-header-text" th:text="#{autoRedact.header}"></span>
-              </div>
-              <form th:action="@{'api/v1/security/auto-redact'}" method="post" enctype="multipart/form-data">
-                <div class="mb-3">
-                  <input type="file" class="form-control" id="fileInput" name="fileInput" required accept="application/pdf">
-                </div>
-
-                <div class="mb-3">
-                  <label for="listOfText" class="form-label" th:text="#{autoRedact.textsToRedactLabel}"></label>
-                  <textarea class="form-control" id="listOfText" name="listOfText" rows="4" required th:placeholder="#{autoRedact.textsToRedactPlaceholder}"></textarea>
-                </div>
-
-                <div class="mb-3">
-                  <label for="defaultColor" class="form-label" th:text="#{autoRedact.colorLabel}">Color</label>
-                  <select class="form-control" id="defaultColor" name="defaultColor" onchange="handleColorChange(this.value)">
-                    <option value="#000000" th:text="#{black}">Black</option>
-                    <option value="#FFFFFF" th:text="#{white}">White</option>
-                    <option value="#FF0000" th:text="#{red}">Red</option>
-                    <option value="#00FF00" th:text="#{green}">Green</option>
-                    <option value="#0000FF" th:text="#{blue}">Blue</option>
-                    <option value="custom" th:text="#{custom}">Custom...</option>
-                  </select>
-                </div>
-
-                <!-- Custom Color Input -->
-                <div class="mb-3" id="customColorContainer" style="display: none;">
-                  <label for="customColor" class="form-label" th:text="#{autoRedact.colorLabel}">Custom Color</label>
-                  <input type="text" class="form-control" id="customColor" name="redactColor" placeholder="#FF00FF">
-                </div>
-
-                <script>
-                  function handleColorChange(selectedValue) {
-                    if (selectedValue === "custom") {
-                      document.getElementById('customColorContainer').style.display = 'block';
-                    } else {
-                      document.getElementById('customColorContainer').style.display = 'none';
-                      document.getElementById('customColor').value = selectedValue;
-                    }
-                  }
-                </script>
-                <div class="mb-3 form-check">
-                  <input type="checkbox" id="useRegex" name="useRegex">
-                  <label for="useRegex" th:text="#{autoRedact.useRegexLabel}"></label>
-                </div>
-
-                <div class="mb-3 form-check">
-                  <input type="checkbox" id="wholeWordSearch" name="wholeWordSearch">
-                  <label for="wholeWordSearch" th:text="#{autoRedact.wholeWordSearchLabel}"></label>
-                </div>
-
-                <div class="mb-3">
-                  <label for="customPadding" class="form-label" th:text="#{autoRedact.customPaddingLabel}"></label>
-                  <input type="number" step="0.1" class="form-control" id="customPadding" name="customPadding" value="0.1">
-                </div>
-
-                <div class="mb-3 form-check">
-                  <input type="checkbox" id="convertPDFToImage" name="convertPDFToImage" checked>
-                  <label for="convertPDFToImage" th:text="#{autoRedact.convertPDFToImageLabel}"></label>
-                </div>
-
-                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{autoRedact.submitButton}"></button>
-              </form>
+<body>
+  <div id="page-container">
+    <div id="content-wrap">
+      <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+      <br><br>
+      <div class="container">
+        <div class="row justify-content-center">
+          <div class="col-md-6 bg-card">
+            <div class="tool-header">
+              <svg class="material-symbols-rounded tool-header-icon security">
+                <use xlink:href="/images/redact-auto.svg#icon-redact-auto"></use>
+              </svg>
+              <span class="tool-header-text" th:text="#{autoRedact.header}"></span>
             </div>
+            <form th:action="@{'api/v1/security/auto-redact'}" method="post" enctype="multipart/form-data">
+              <div class="mb-3">
+                <input type="file" class="form-control" id="fileInput" name="fileInput" required
+                  accept="application/pdf">
+              </div>
+
+              <div class="mb-3">
+                <label for="listOfText" class="form-label" th:text="#{autoRedact.textsToRedactLabel}"></label>
+                <textarea class="form-control" id="listOfText" name="listOfText" rows="4" required
+                  th:placeholder="#{autoRedact.textsToRedactPlaceholder}"></textarea>
+              </div>
+
+              <div class="mb-3">
+                <label for="defaultColor" class="form-label" th:text="#{autoRedact.colorLabel}">Color</label>
+                <select class="form-control" id="defaultColor" name="defaultColor"
+                  onchange="handleColorChange(this.value)">
+                  <option value="#000000" th:text="#{black}">Black</option>
+                  <option value="#FFFFFF" th:text="#{white}">White</option>
+                  <option value="#FF0000" th:text="#{red}">Red</option>
+                  <option value="#00FF00" th:text="#{green}">Green</option>
+                  <option value="#0000FF" th:text="#{blue}">Blue</option>
+                  <option value="custom" th:text="#{custom}">Custom...</option>
+                </select>
+              </div>
+
+              <!-- Custom Color Input -->
+              <div class="mb-3" id="customColorContainer" style="display: none;">
+                <label for="customColor" class="form-label" th:text="#{autoRedact.colorLabel}">Custom Color</label>
+                <input type="text" class="form-control" id="customColor" name="redactColor" placeholder="#FF00FF">
+              </div>
+
+              <script>
+                function handleColorChange(selectedValue) {
+                  if (selectedValue === "custom") {
+                    document.getElementById('customColorContainer').style.display = 'block';
+                  } else {
+                    document.getElementById('customColorContainer').style.display = 'none';
+                    document.getElementById('customColor').value = selectedValue;
+                  }
+                }
+              </script>
+              <div class="mb-3 form-check">
+                <input type="checkbox" id="useRegex" name="useRegex">
+                <label for="useRegex" th:text="#{autoRedact.useRegexLabel}"></label>
+              </div>
+
+              <div class="mb-3 form-check">
+                <input type="checkbox" id="wholeWordSearch" name="wholeWordSearch">
+                <label for="wholeWordSearch" th:text="#{autoRedact.wholeWordSearchLabel}"></label>
+              </div>
+
+              <div class="mb-3">
+                <label for="customPadding" class="form-label" th:text="#{autoRedact.customPaddingLabel}"></label>
+                <input type="number" step="0.1" class="form-control" id="customPadding" name="customPadding"
+                  value="0.1">
+              </div>
+
+              <div class="mb-3 form-check">
+                <input type="checkbox" id="convertPDFToImage" name="convertPDFToImage" checked>
+                <label for="convertPDFToImage" th:text="#{autoRedact.convertPDFToImageLabel}"></label>
+              </div>
+
+              <button type="submit" id="submitBtn" class="btn btn-primary"
+                th:text="#{autoRedact.submitButton}"></button>
+            </form>
           </div>
         </div>
       </div>
-      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
-  </body>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/security/redact.html b/src/main/resources/templates/security/redact.html
index 961b4b13..cdea8015 100644
--- a/src/main/resources/templates/security/redact.html
+++ b/src/main/resources/templates/security/redact.html
@@ -31,7 +31,9 @@
     <div class="row justify-content-center">
       <div class="col-md-6 bg-card">
         <div class="tool-header">
-          <span class="material-symbols-rounded tool-header-icon security">playlist_remove</span>
+          <svg class="material-symbols-rounded tool-header-icon security">
+            <use xlink:href="/images/redact-manual.svg#icon-redact-manual"></use>
+          </svg>
           <span class="tool-header-text" th:text="#{redact.header}"></span>
         </div>
         <form th:action="@{'api/v1/security/redact'}" method="post" enctype="multipart/form-data">
diff --git a/src/main/resources/templates/split-by-size-or-count.html b/src/main/resources/templates/split-by-size-or-count.html
index 93e7186d..ce7cb2f0 100644
--- a/src/main/resources/templates/split-by-size-or-count.html
+++ b/src/main/resources/templates/split-by-size-or-count.html
@@ -1,41 +1,52 @@
 <!DOCTYPE html>
-<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="https://www.thymeleaf.org">
-  <head>
-  <th:block th:insert="~{fragments/common :: head(title=#{split-by-size-or-count.title}, header=#{split-by-size-or-count.header})}"></th:block>
-  </head>
+<html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}"
+  xmlns:th="https://www.thymeleaf.org">
 
-  <body>
-    <th:block th:insert="~{fragments/common :: game}"></th:block>
-    <div id="page-container">
-      <div id="content-wrap">
-        <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-        <br><br>
-        <div class="container">
-          <div class="row justify-content-center">
-            <div class="col-md-6 bg-card">
-              <div class="tool-header">
-                <span class="material-symbols-rounded tool-header-icon advance">vertical_split</span>
-                <span class="tool-header-text" th:text="#{split-by-size-or-count.header}"></span>
-              </div>
-              <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/general/split-by-size-or-count'}">
-                <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}"></div>
-                <label for="splitType" th:text="#{split-by-size-or-count.type.label}">Split Type</label>
-                <select id="splitType" name="splitType" class="form-control">
-                  <option value="0" th:text="#{split-by-size-or-count.type.size}">Size</option>
-                  <option value="1" th:text="#{split-by-size-or-count.type.pageCount}">Page Count</option>
-                  <option value="2" th:text="#{split-by-size-or-count.type.docCount}">Document Count</option>
-                </select>
-                <br>
-                <label for="splitValue" th:text="#{split-by-size-or-count.value.label}">Split Value</label>
-                <input type="text" id="splitValue" name="splitValue" class="form-control" required th:placeholder="#{split-by-size-or-count.value.placeholder}">
-                <br>
-                <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{split-by-size-or-count.submit}">Submit</button>
-              </form>
+<head>
+  <th:block
+    th:insert="~{fragments/common :: head(title=#{split-by-size-or-count.title}, header=#{split-by-size-or-count.header})}">
+  </th:block>
+</head>
+
+<body>
+  <th:block th:insert="~{fragments/common :: game}"></th:block>
+  <div id="page-container">
+    <div id="content-wrap">
+      <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+      <br><br>
+      <div class="container">
+        <div class="row justify-content-center">
+          <div class="col-md-6 bg-card">
+            <div class="tool-header">
+              <svg class="material-symbols-rounded tool-header-icon advance">
+                <use xlink:href="/images/split-size.svg#icon-split-size"></use>
+              </svg>
+              <span class="tool-header-text" th:text="#{split-by-size-or-count.header}"></span>
             </div>
+            <form method="post" enctype="multipart/form-data" th:action="@{'/api/v1/general/split-by-size-or-count'}">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}">
+              </div>
+              <label for="splitType" th:text="#{split-by-size-or-count.type.label}">Split Type</label>
+              <select id="splitType" name="splitType" class="form-control">
+                <option value="0" th:text="#{split-by-size-or-count.type.size}">Size</option>
+                <option value="1" th:text="#{split-by-size-or-count.type.pageCount}">Page Count</option>
+                <option value="2" th:text="#{split-by-size-or-count.type.docCount}">Document Count</option>
+              </select>
+              <br>
+              <label for="splitValue" th:text="#{split-by-size-or-count.value.label}">Split Value</label>
+              <input type="text" id="splitValue" name="splitValue" class="form-control" required
+                th:placeholder="#{split-by-size-or-count.value.placeholder}">
+              <br>
+              <button type="submit" id="submitBtn" class="btn btn-primary"
+                th:text="#{split-by-size-or-count.submit}">Submit</button>
+            </form>
           </div>
         </div>
       </div>
-      <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
     </div>
-  </body>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
+  </div>
+</body>
+
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/split-pdf-by-chapters.html b/src/main/resources/templates/split-pdf-by-chapters.html
index 38d0164b..26838b83 100644
--- a/src/main/resources/templates/split-pdf-by-chapters.html
+++ b/src/main/resources/templates/split-pdf-by-chapters.html
@@ -1,66 +1,72 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}"
-      xmlns:th="https://www.thymeleaf.org">
+  xmlns:th="https://www.thymeleaf.org">
 
 <head>
-  <th:block th:insert="~{fragments/common :: head(title=#{splitByChapters.title}, header=#{splitByChapters.header})}"></th:block>
+  <th:block th:insert="~{fragments/common :: head(title=#{splitByChapters.title}, header=#{splitByChapters.header})}">
+  </th:block>
 </head>
 
 <body>
-<div id="page-container">
-  <div id="content-wrap">
-    <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
-    <br><br>
-    <div class="container">
-      <div class="row justify-content-center">
-        <div class="col-md-6 bg-card">
-          <div class="tool-header">
-            <span class="material-symbols-rounded tool-header-icon organize">book</span>
-            <span class="tool-header-text" th:text="#{splitByChapters.header}"></span>
+  <div id="page-container">
+    <div id="content-wrap">
+      <th:block th:insert="~{fragments/navbar.html :: navbar}"></th:block>
+      <br><br>
+      <div class="container">
+        <div class="row justify-content-center">
+          <div class="col-md-6 bg-card">
+            <div class="tool-header">
+              <svg class="material-symbols-rounded tool-header-icon advance">
+                <use xlink:href="/images/split-chapters.svg#icon-split-chapters"></use>
+              </svg>
+              <span class="tool-header-text" th:text="#{splitByChapters.header}"></span>
+            </div>
+            <form th:action="@{'/api/v1/general/split-pdf-by-chapters'}" method="post" enctype="multipart/form-data">
+              <div
+                th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}">
+              </div>
+
+              <div class="mb-3">
+                <label for="bookmarkLevel" th:text="#{splitByChapters.bookmarkLevel}"></label>
+                <input type="number" class="form-control" id="bookmarkLevel" name="bookmarkLevel" min="0" value="0"
+                  required>
+              </div>
+
+              <div class="mb-3 form-check">
+                <input type="checkbox" class="form-check-input" id="includeMetadata" name="includeMetadata">
+                <label class="form-check-label" for="includeMetadata"
+                  th:text="#{splitByChapters.includeMetadata}"></label>
+                <input type="hidden" name="includeMetadata" value="false" />
+              </div>
+
+              <div class="mb-3 form-check">
+                <input type="checkbox" class="form-check-input" id="allowDuplicates" name="allowDuplicates">
+                <label class="form-check-label" for="allowDuplicates"
+                  th:text="#{splitByChapters.allowDuplicates}"></label>
+                <input type="hidden" name="allowDuplicates" value="false" />
+              </div>
+
+              <p>
+                <a class="btn btn-outline-primary" data-bs-toggle="collapse" href="#info" role="button"
+                  aria-expanded="false" aria-controls="info" th:text="#{info}"></a>
+              </p>
+              <div class="collapse" id="info">
+                <p th:text="#{splitByChapters.desc.1}"></p>
+                <p th:text="#{splitByChapters.desc.2}"></p>
+                <p th:text="#{splitByChapters.desc.3}"></p>
+                <p th:text="#{splitByChapters.desc.4}"></p>
+              </div>
+
+              <br>
+              <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{splitByChapters.submit}"></button>
+            </form>
+
           </div>
-          <form th:action="@{'/api/v1/general/split-pdf-by-chapters'}" method="post" enctype="multipart/form-data">
-            <div
-                    th:replace="~{fragments/common :: fileSelector(name='fileInput', multipleInputsForSingleRequest=false, accept='application/pdf')}">
-            </div>
-
-            <div class="mb-3">
-              <label for="bookmarkLevel" th:text="#{splitByChapters.bookmarkLevel}"></label>
-              <input type="number" class="form-control" id="bookmarkLevel" name="bookmarkLevel" min="0" value="0" required>
-            </div>
-
-            <div class="mb-3 form-check">
-              <input type="checkbox" class="form-check-input" id="includeMetadata" name="includeMetadata">
-              <label class="form-check-label" for="includeMetadata" th:text="#{splitByChapters.includeMetadata}"></label>
-              <input type="hidden" name="includeMetadata" value="false" />
-            </div>
-
-            <div class="mb-3 form-check">
-              <input type="checkbox" class="form-check-input" id="allowDuplicates" name="allowDuplicates">
-              <label class="form-check-label" for="allowDuplicates" th:text="#{splitByChapters.allowDuplicates}"></label>
-              <input type="hidden" name="allowDuplicates" value="false" />
-            </div>
-
-            <p>
-              <a class="btn btn-outline-primary" data-bs-toggle="collapse" href="#info" role="button"
-                 aria-expanded="false" aria-controls="info" th:text="#{info}"></a>
-            </p>
-            <div class="collapse" id="info">
-              <p th:text="#{splitByChapters.desc.1}"></p>
-              <p th:text="#{splitByChapters.desc.2}"></p>
-              <p th:text="#{splitByChapters.desc.3}"></p>
-              <p th:text="#{splitByChapters.desc.4}"></p>
-            </div>
-
-            <br>
-            <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{splitByChapters.submit}"></button>
-          </form>
-
         </div>
       </div>
     </div>
+    <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
   </div>
-  <th:block th:insert="~{fragments/footer.html :: footer}"></th:block>
-</div>
 </body>
 
 </html>
\ No newline at end of file