diff --git a/pom.xml b/pom.xml
index e3f69197..83741a32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,9 @@
 
     <module.name>${project.groupId}.forensics.api</module.name>
 
+    <jenkins.baseline>2.346</jenkins.baseline>
+    <jenkins.version>2.346.3</jenkins.version>
+
     <!-- Library Dependencies Versions -->
     <eclipse-collections.version>9.2.0</eclipse-collections.version>
     <testcontainers.version>1.17.3</testcontainers.version>
@@ -55,6 +58,7 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>font-awesome-api</artifactId>
+      <version>6.2.0-1</version>
     </dependency>
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
diff --git a/src/main/java/io/jenkins/plugins/forensics/miner/ForensicsBuildAction.java b/src/main/java/io/jenkins/plugins/forensics/miner/ForensicsBuildAction.java
index fd48892a..fbe2353f 100644
--- a/src/main/java/io/jenkins/plugins/forensics/miner/ForensicsBuildAction.java
+++ b/src/main/java/io/jenkins/plugins/forensics/miner/ForensicsBuildAction.java
@@ -136,7 +136,7 @@ protected String getBuildResultBaseName() {
 
     @Override
     public String getIconFileName() {
-        return ForensicsJobAction.SMALL_ICON;
+        return ForensicsJobAction.ICON;
     }
 
     @Override
diff --git a/src/main/java/io/jenkins/plugins/forensics/miner/ForensicsJobAction.java b/src/main/java/io/jenkins/plugins/forensics/miner/ForensicsJobAction.java
index f667e772..aa009d31 100644
--- a/src/main/java/io/jenkins/plugins/forensics/miner/ForensicsJobAction.java
+++ b/src/main/java/io/jenkins/plugins/forensics/miner/ForensicsJobAction.java
@@ -27,7 +27,7 @@
  * @author Ullrich Hafner
  */
 public class ForensicsJobAction extends AsyncConfigurableTrendJobAction<ForensicsBuildAction> {
-    static final String SMALL_ICON = "/plugin/forensics-api/icons/forensics.svg";
+    static final String ICON = "symbol-solid/microscope plugin-font-awesome-api";
     static final String FORENSICS_ID = "forensics";
     private static final JacksonFacade JACKSON_FACADE = new JacksonFacade();
 
@@ -96,7 +96,7 @@ public String getDisplayName() {
     @Override
     @CheckForNull
     public String getIconFileName() {
-        return SMALL_ICON;
+        return ICON;
     }
 
     @Override
diff --git a/src/main/resources/images/symbols/diff-stat.svg b/src/main/resources/images/symbols/diff-stat.svg
new file mode 100644
index 00000000..17efdbd2
--- /dev/null
+++ b/src/main/resources/images/symbols/diff-stat.svg
@@ -0,0 +1 @@
+<svg height="18.290051mm" viewBox="0 0 18.154884 18.290051" width="18.154884mm" xmlns="http://www.w3.org/2000/svg"><g stroke-width=".007102" transform="translate(-26.391102 -26.391101)"><path fill="currentColor" stroke="currentColor" d="m34.57292 31.163828v.454546q0 .09943-.06392.163352-.06392.06392-.163353.06392h-2.5v2.499999q0 .09943-.06392.163353-.06392.06392-.163352.06392h-.454546q-.09943 0-.163352-.06392-.06392-.06392-.06392-.163353v-2.499999h-2.5q-.09943 0-.163353-.06392-.06392-.06392-.06392-.163352v-.454546q0-.09943.06392-.163352.06392-.06392.163353-.06392h2.5v-2.5q0-.09943.06392-.163353.06392-.06392.163352-.06392h.454546q.09943 0 .163352.06392.06392.06392.06392.163353v2.5h2.5q.09943 0 .163353.06392.06392.06392.06392.163352zm.909091 3.181818v-5.90909q0-.46875-.333807-.802557-.333807-.333807-.802557-.333807h-5.90909q-.46875 0-.802557.333807-.333807.333807-.333807.802557v5.90909q0 .46875.333807.802557.333807.333807.802557.333807h5.90909q.46875 0 .802557-.333807.333807-.333807.333807-.802557zm.909091-5.90909v5.90909q0 .845171-.600142 1.445313-.600142.600142-1.445313.600142h-5.90909q-.845171 0-1.445313-.600142-.600142-.600142-.600142-1.445313v-5.90909q0-.845171.600142-1.445313.600142-.600142 1.445313-.600142h5.90909q.845171 0 1.445313.600142.600142.600142.600142 1.445313z"/><path fill="currentColor" stroke="currentColor" d="m42.727805 39.453881v.45454q0 .0994-.06392.16336-.06392.0639-.163353.0639h-5.90909q-.09943 0-.163353-.0639-.06392-.0639-.06392-.16336v-.45454q0-.0994.06392-.16336.06392-.0639.163353-.0639h5.90909q.09943 0 .163353.0639.06392.0639.06392.16336zm.909091 3.18182v-5.9091q0-.46875-.333807-.80255-.333807-.33381-.802557-.33381h-5.90909q-.46875 0-.802557.33381-.333807.3338-.333807.80255v5.9091q0 .46875.333807.80255.333807.33381.802557.33381h5.90909q.46875 0 .802557-.33381.333807-.3338.333807-.80255zm.909091-5.9091v5.9091q0 .84517-.600142 1.44531-.600142.60014-1.445313.60014h-5.90909q-.845171 0-1.445313-.60014-.600142-.60014-.600142-1.44531v-5.9091q0-.84517.600142-1.44531.600142-.60014 1.445313-.60014h5.90909q.845171 0 1.445313.60014.600142.60014.600142 1.44531z"/></g></svg>
diff --git a/src/main/resources/io/jenkins/plugins/forensics/miner/CommitStatisticsBuildAction/summary.jelly b/src/main/resources/io/jenkins/plugins/forensics/miner/CommitStatisticsBuildAction/summary.jelly
index 7897e0a3..ebdcf348 100644
--- a/src/main/resources/io/jenkins/plugins/forensics/miner/CommitStatisticsBuildAction/summary.jelly
+++ b/src/main/resources/io/jenkins/plugins/forensics/miner/CommitStatisticsBuildAction/summary.jelly
@@ -1,7 +1,7 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson">
 
-  <t:summary icon="/plugin/forensics-api/icons/diff-stat.svg">
+  <t:summary icon="symbol-diff-stat plugin-forensics-api">
     <span id="commits-statistics-of-${it.scmKey.hashCode()}">
       ${%title}: ${it.scmKey}
       <j:set var="s" value="${it.commitStatistics}"/>
diff --git a/src/main/resources/io/jenkins/plugins/forensics/miner/ForensicsBuildAction/summary.jelly b/src/main/resources/io/jenkins/plugins/forensics/miner/ForensicsBuildAction/summary.jelly
index 15d32223..95f2815e 100644
--- a/src/main/resources/io/jenkins/plugins/forensics/miner/ForensicsBuildAction/summary.jelly
+++ b/src/main/resources/io/jenkins/plugins/forensics/miner/ForensicsBuildAction/summary.jelly
@@ -1,7 +1,7 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson">
 
-  <t:summary icon="/plugin/forensics-api/icons/forensics.svg">
+  <t:summary icon="symbol-solid/microscope plugin-font-awesome-api">
     <span id="scm-forensics-of-${it.scmKey.hashCode()}">
       ${%title}: ${it.scmKey}
       <j:set var="s" value="${it.result.latestStatistics}"/>
diff --git a/src/main/resources/io/jenkins/plugins/forensics/reference/ReferenceBuild/summary.jelly b/src/main/resources/io/jenkins/plugins/forensics/reference/ReferenceBuild/summary.jelly
index 35bd7be8..5ed42f49 100644
--- a/src/main/resources/io/jenkins/plugins/forensics/reference/ReferenceBuild/summary.jelly
+++ b/src/main/resources/io/jenkins/plugins/forensics/reference/ReferenceBuild/summary.jelly
@@ -1,7 +1,7 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:t="/lib/hudson"  xmlns:fa="/font-awesome">
 
-  <t:summary icon="/plugin/forensics-api/icons/crosshair.svg">
+  <t:summary icon="symbol-solid/crosshairs plugin-font-awesome-api">
     <span id="reference-build">
       <j:choose>
         <j:when test="${it.hasReferenceBuild()}">
diff --git a/src/main/webapp/icons/LICENSE.txt b/src/main/webapp/icons/LICENSE.txt
deleted file mode 100644
index b5d249c5..00000000
--- a/src/main/webapp/icons/LICENSE.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-License for FontAwesome icons: CC BY 4.0 License
-https://fontawesome.com/license/free
-
-
diff --git a/src/main/webapp/icons/crosshair.svg b/src/main/webapp/icons/crosshair.svg
deleted file mode 100644
index 0c2c90ac..00000000
--- a/src/main/webapp/icons/crosshair.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="crosshairs" class="svg-inline--fa fa-crosshairs fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-    <path fill="#B4B4B4" d="M500 224h-30.364C455.724 130.325 381.675 56.276 288 42.364V12c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v30.364C130.325 56.276 56.276 130.325 42.364 224H12c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h30.364C56.276 381.675 130.325 455.724 224 469.636V500c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12v-30.364C381.675 455.724 455.724 381.675 469.636 288H500c6.627 0 12-5.373 12-12v-40c0-6.627-5.373-12-12-12zM288 404.634V364c0-6.627-5.373-12-12-12h-40c-6.627 0-12 5.373-12 12v40.634C165.826 392.232 119.783 346.243 107.366 288H148c6.627 0 12-5.373 12-12v-40c0-6.627-5.373-12-12-12h-40.634C119.768 165.826 165.757 119.783 224 107.366V148c0 6.627 5.373 12 12 12h40c6.627 0 12-5.373 12-12v-40.634C346.174 119.768 392.217 165.757 404.634 224H364c-6.627 0-12 5.373-12 12v40c0 6.627 5.373 12 12 12h40.634C392.232 346.174 346.243 392.217 288 404.634zM288 256c0 17.673-14.327 32-32 32s-32-14.327-32-32c0-17.673 14.327-32 32-32s32 14.327 32 32z"></path>
-</svg>
diff --git a/src/main/webapp/icons/diff-stat.svg b/src/main/webapp/icons/diff-stat.svg
deleted file mode 100644
index f255197a..00000000
--- a/src/main/webapp/icons/diff-stat.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="18.154884mm" height="18.290051mm" viewBox="0 0 18.154884 18.290051" version="1.1" id="svg5" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
-  <sodipodi:namedview id="namedview7" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:document-units="mm" showgrid="false" inkscape:zoom="5.8725028" inkscape:cx="57.215809" inkscape:cy="34.312457" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="layer1" />
-  <defs id="defs2" />
-  <g inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" transform="translate(-26.391102,-26.391101)">
-    <path d="m 34.57292,31.163828 v 0.454546 q 0,0.09943 -0.06392,0.163352 -0.06392,0.06392 -0.163353,0.06392 h -2.5 v 2.499999 q 0,0.09943 -0.06392,0.163353 -0.06392,0.06392 -0.163352,0.06392 h -0.454546 q -0.09943,0 -0.163352,-0.06392 -0.06392,-0.06392 -0.06392,-0.163353 v -2.499999 h -2.5 q -0.09943,0 -0.163353,-0.06392 -0.06392,-0.06392 -0.06392,-0.163352 v -0.454546 q 0,-0.09943 0.06392,-0.163352 0.06392,-0.06392 0.163353,-0.06392 h 2.5 v -2.5 q 0,-0.09943 0.06392,-0.163353 0.06392,-0.06392 0.163352,-0.06392 h 0.454546 q 0.09943,0 0.163352,0.06392 0.06392,0.06392 0.06392,0.163353 v 2.5 h 2.5 q 0.09943,0 0.163353,0.06392 0.06392,0.06392 0.06392,0.163352 z m 0.909091,3.181818 v -5.90909 q 0,-0.46875 -0.333807,-0.802557 -0.333807,-0.333807 -0.802557,-0.333807 h -5.90909 q -0.46875,0 -0.802557,0.333807 -0.333807,0.333807 -0.333807,0.802557 v 5.90909 q 0,0.46875 0.333807,0.802557 0.333807,0.333807 0.802557,0.333807 h 5.90909 q 0.46875,0 0.802557,-0.333807 0.333807,-0.333807 0.333807,-0.802557 z m 0.909091,-5.90909 v 5.90909 q 0,0.845171 -0.600142,1.445313 -0.600142,0.600142 -1.445313,0.600142 h -5.90909 q -0.845171,0 -1.445313,-0.600142 -0.600142,-0.600142 -0.600142,-1.445313 v -5.90909 q 0,-0.845171 0.600142,-1.445313 0.600142,-0.600142 1.445313,-0.600142 h 5.90909 q 0.845171,0 1.445313,0.600142 0.600142,0.600142 0.600142,1.445313 z" id="path824" style="stroke-width:0.00710226;fill:#B4B4B4" />
-    <path d="m 42.727805,39.453881 v 0.45454 q 0,0.0994 -0.06392,0.16336 -0.06392,0.0639 -0.163353,0.0639 h -5.90909 q -0.09943,0 -0.163353,-0.0639 -0.06392,-0.0639 -0.06392,-0.16336 v -0.45454 q 0,-0.0994 0.06392,-0.16336 0.06392,-0.0639 0.163353,-0.0639 h 5.90909 q 0.09943,0 0.163353,0.0639 0.06392,0.0639 0.06392,0.16336 z m 0.909091,3.18182 v -5.9091 q 0,-0.46875 -0.333807,-0.80255 -0.333807,-0.33381 -0.802557,-0.33381 h -5.90909 q -0.46875,0 -0.802557,0.33381 -0.333807,0.3338 -0.333807,0.80255 v 5.9091 q 0,0.46875 0.333807,0.80255 0.333807,0.33381 0.802557,0.33381 h 5.90909 q 0.46875,0 0.802557,-0.33381 0.333807,-0.3338 0.333807,-0.80255 z m 0.909091,-5.9091 v 5.9091 q 0,0.84517 -0.600142,1.44531 -0.600142,0.60014 -1.445313,0.60014 h -5.90909 q -0.845171,0 -1.445313,-0.60014 -0.600142,-0.60014 -0.600142,-1.44531 v -5.9091 q 0,-0.84517 0.600142,-1.44531 0.600142,-0.60014 1.445313,-0.60014 h 5.90909 q 0.845171,0 1.445313,0.60014 0.600142,0.60014 0.600142,1.44531 z" id="path833" style="stroke-width:0.00710226;fill:#B4B4B4" /> </g>
-</svg>
diff --git a/src/main/webapp/icons/forensics.svg b/src/main/webapp/icons/forensics.svg
deleted file mode 100644
index 36863a31..00000000
--- a/src/main/webapp/icons/forensics.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="chart-line" class="svg-inline--fa fa-chart-line fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-    <path fill="#B4B4B4" d="M496 384H64V80c0-8.84-7.16-16-16-16H16C7.16 64 0 71.16 0 80v336c0 17.67 14.33 32 32 32h464c8.84 0 16-7.16 16-16v-32c0-8.84-7.16-16-16-16zM464 96H345.94c-21.38 0-32.09 25.85-16.97 40.97l32.4 32.4L288 242.75l-73.37-73.37c-12.5-12.5-32.76-12.5-45.25 0l-68.69 68.69c-6.25 6.25-6.25 16.38 0 22.63l22.62 22.62c6.25 6.25 16.38 6.25 22.63 0L192 237.25l73.37 73.37c12.5 12.5 32.76 12.5 45.25 0l96-96 32.4 32.4c15.12 15.12 40.97 4.41 40.97-16.97V112c.01-8.84-7.15-16-15.99-16z"></path>
-</svg>