diff --git a/owlplug-client/src/main/java/com/owlplug/core/components/ApplicationDefaults.java b/owlplug-client/src/main/java/com/owlplug/core/components/ApplicationDefaults.java
index 47851561..a8d8d934 100644
--- a/owlplug-client/src/main/java/com/owlplug/core/components/ApplicationDefaults.java
+++ b/owlplug-client/src/main/java/com/owlplug/core/components/ApplicationDefaults.java
@@ -65,10 +65,6 @@ public class ApplicationDefaults {
   public final Image auImage = new Image(getClass().getResourceAsStream("/icons/au-purple-16.png"));
   public final Image lv2Image = new Image(getClass().getResourceAsStream("/icons/lv2-orange-16.png"));
   public final Image pluginComponentImage = new Image(getClass().getResourceAsStream("/icons/cube-white-16.png"));
-  public final Image taskPendingImage = new Image(getClass().getResourceAsStream("/icons/loading-grey-16.png"));
-  public final Image taskSuccessImage = new Image(getClass().getResourceAsStream("/icons/check-green-16.png"));
-  public final Image taskFailImage = new Image(getClass().getResourceAsStream("/icons/cross-red-16.png"));
-  public final Image taskRunningImage = new Image(getClass().getResourceAsStream("/icons/play-green-16.png"));
   public final Image verifiedSourceImage = new Image(getClass().getResourceAsStream("/icons/doublecheck-grey-16.png"));
   public final Image suggestedSourceImage = new Image(
       ApplicationDefaults.class.getResourceAsStream("/icons/check-grey-16.png"));
diff --git a/owlplug-client/src/main/java/com/owlplug/core/controllers/fragments/PluginPathFragmentController.java b/owlplug-client/src/main/java/com/owlplug/core/controllers/fragments/PluginPathFragmentController.java
index 8f8f5ba7..f2a6bd5b 100644
--- a/owlplug-client/src/main/java/com/owlplug/core/controllers/fragments/PluginPathFragmentController.java
+++ b/owlplug-client/src/main/java/com/owlplug/core/controllers/fragments/PluginPathFragmentController.java
@@ -238,11 +238,11 @@ public void refresh() {
     if (checks.getExists().status()) {
       directoryExistLabel.getStyleClass().add("label-disabled");
       imv.setShape(checkPath);
-      imv.setStyle("-fx-background-color: disabled-color;");
+      imv.setStyle("-fx-background-color: -color-fg-muted;");
     } else {
       directoryExistLabel.getStyleClass().add("label-danger");
       imv.setShape(crossPath);
-      imv.setStyle("-fx-background-color: danger-color;");
+      imv.setStyle("-fx-background-color: -color-danger-emphasis;");
     }
     directoryExistLabel.setTooltip(new Tooltip(checks.getExists().message()));
 
@@ -251,11 +251,11 @@ public void refresh() {
     if (checks.getCanRead().status()) {
       canReadLabel.getStyleClass().add("label-disabled");
       imv.setShape(checkPath);
-      imv.setStyle("-fx-background-color: disabled-color;");
+      imv.setStyle("-fx-background-color: -color-fg-muted;");
     } else {
       canReadLabel.getStyleClass().add("label-danger");
       imv.setShape(crossPath);
-      imv.setStyle("-fx-background-color: danger-color;");
+      imv.setStyle("-fx-background-color: -color-danger-emphasis;");
     }
     canReadLabel.setTooltip(new Tooltip(checks.getCanRead().message()));
 
@@ -264,11 +264,11 @@ public void refresh() {
     if (checks.getCanWrite().status()) {
       canWriteLabel.getStyleClass().add("label-disabled");
       imv.setShape(checkPath);
-      imv.setStyle("-fx-background-color: disabled-color;");
+      imv.setStyle("-fx-background-color: -color-fg-muted;");
     } else {
       canWriteLabel.getStyleClass().add("label-danger");
       imv.setShape(crossPath);
-      imv.setStyle("-fx-background-color: danger-color;");
+      imv.setStyle("-fx-background-color: -color-danger-emphasis;");
     }
     canWriteLabel.setTooltip(new Tooltip(checks.getCanWrite().message()));
   }
diff --git a/owlplug-client/src/main/resources/fxml/HomeView.fxml b/owlplug-client/src/main/resources/fxml/HomeView.fxml
index c217f0e7..afddbe55 100644
--- a/owlplug-client/src/main/resources/fxml/HomeView.fxml
+++ b/owlplug-client/src/main/resources/fxml/HomeView.fxml
@@ -54,7 +54,7 @@
         </HBox>
 
         <!-- Setup Suggestions (conditionally shown) -->
-        <VBox fx:id="setupPane" spacing="14.0" styleClass="pane-card">
+        <VBox fx:id="setupPane" spacing="14.0" styleClass="dashboard-card">
             <Label styleClass="dashboard-section-title" text="GET STARTED"/>
 
             <VBox fx:id="noPluginDirectorySuggestion" spacing="6.0">
@@ -183,9 +183,7 @@
                         <Insets bottom="16.0" left="16.0" right="16.0" top="16.0"/>
                     </padding>
                     <HBox alignment="CENTER_LEFT" spacing="5.0">
-                        <ImageView fitHeight="12.0" fitWidth="12.0" preserveRatio="true">
-                            <Image url="@../icons/cross-red-16.png"/>
-                        </ImageView>
+                        <FontIcon iconLiteral="mdi2a-alert-circle-outline" />
                         <Label styleClass="dashboard-tile-label" text="Unresolved"/>
                     </HBox>
                     <Label fx:id="unresolvedPluginCountLabel" styleClass="dashboard-tile-value-small" text="0"/>
@@ -216,7 +214,7 @@
         <!-- Storage / File Size Chart -->
         <VBox spacing="8.0">
             <Label styleClass="dashboard-section-title" text="STORAGE"/>
-            <VBox spacing="8.0" styleClass="pane-card">
+            <VBox spacing="8.0" styleClass="dashboard-card">
                 <VBox fx:id="fileSizeChartContainer" prefHeight="160.0"/>
                 <Label fx:id="fileSizeEmptyLabel" styleClass="label-disabled"
                        text="No file statistics available. Run a plugin scan with file stat sync enabled in Options."/>
diff --git a/owlplug-client/src/main/resources/fxml/projects/ProjectsView.fxml b/owlplug-client/src/main/resources/fxml/projects/ProjectsView.fxml
index 3dbaf744..ff32b3ab 100644
--- a/owlplug-client/src/main/resources/fxml/projects/ProjectsView.fxml
+++ b/owlplug-client/src/main/resources/fxml/projects/ProjectsView.fxml
@@ -45,9 +45,6 @@
     </center>
     <right>
         <VBox prefHeight="200.0" prefWidth="100.0" BorderPane.alignment="CENTER">
-            <padding>
-                <Insets left="20.0"/>
-            </padding>
             <HBox alignment="CENTER_RIGHT" minHeight="-Infinity" prefHeight="38.0" prefWidth="500.0"
                   VBox.vgrow="NEVER" spacing="5.0">
                 <Button fx:id="syncProjectButton" text="Sync" defaultButton="true">
diff --git a/owlplug-client/src/main/resources/icons/check-green-16.png b/owlplug-client/src/main/resources/icons/check-green-16.png
deleted file mode 100644
index 41ec6424..00000000
Binary files a/owlplug-client/src/main/resources/icons/check-green-16.png and /dev/null differ
diff --git a/owlplug-client/src/main/resources/icons/cross-red-16.png b/owlplug-client/src/main/resources/icons/cross-red-16.png
deleted file mode 100644
index fba8c390..00000000
Binary files a/owlplug-client/src/main/resources/icons/cross-red-16.png and /dev/null differ
diff --git a/owlplug-client/src/main/resources/icons/loading-grey-16.png b/owlplug-client/src/main/resources/icons/loading-grey-16.png
deleted file mode 100644
index 79cc9f8b..00000000
Binary files a/owlplug-client/src/main/resources/icons/loading-grey-16.png and /dev/null differ
diff --git a/owlplug-client/src/main/resources/icons/pen-grey-16.png b/owlplug-client/src/main/resources/icons/pen-grey-16.png
deleted file mode 100644
index 74681626..00000000
Binary files a/owlplug-client/src/main/resources/icons/pen-grey-16.png and /dev/null differ
diff --git a/owlplug-client/src/main/resources/icons/play-green-16.png b/owlplug-client/src/main/resources/icons/play-green-16.png
deleted file mode 100644
index 62e261d1..00000000
Binary files a/owlplug-client/src/main/resources/icons/play-green-16.png and /dev/null differ
diff --git a/owlplug-client/src/main/resources/owlplug.css b/owlplug-client/src/main/resources/owlplug.css
index d933bc1c..b4b5e957 100644
--- a/owlplug-client/src/main/resources/owlplug.css
+++ b/owlplug-client/src/main/resources/owlplug.css
@@ -1,8 +1,6 @@
 /****************************************************************
  Global Theme rules
 ****************************************************************/
-
-
 .root {
 
     /* Atlantafx colors mapping
@@ -49,16 +47,8 @@
 
      */
     -fx-font-family: "Segoe UI";
-
-    disabled-color: -color-fg-muted;
-    danger-color: -color-danger-emphasis;
-    warning-color: -color-warning-emphasis;
-    success-color: -color-success-emphasis;
-
-    theme-primary-color: -color-accent-fg;
-
-    text-color: -color-fg-default;
-    text-emphase-color: -color-fg-emphasis;
+    -owlplug-color-text: -color-fg-default;
+    -owlplug-color-text-emphasis: -color-fg-emphasis;
 }
 
 #mainPane {
@@ -69,40 +59,38 @@
     -fx-background-color: -color-bg-default;
 }
 
-Label {
-    -fx-text-fill: text-color;
+.label {
+    -fx-text-fill: -owlplug-color-text;
 }
 
 .label-success {
-    -fx-text-fill: success-color;
+    -fx-text-fill: -color-success-fg;
 }
 
 .label-danger {
-    -fx-text-fill: danger-color;
+    -fx-text-fill: -color-danger-fg;
 }
 
 .label-warning {
-    -fx-text-fill: warning-color;
+    -fx-text-fill: -color-warning-emphasis;
 }
 
 .label-disabled {
-    -fx-text-fill: disabled-color;
+    -fx-text-fill: -color-fg-muted;
 }
 
 .label-emphase {
-    -fx-text-fill: text-emphase-color;
+    -fx-text-fill: -owlplug-color-text-emphasis;
 }
 
 .heading-title {
     -fx-font-size: 30px;
     -fx-font-weight: bold;
-    -fx-margin: 0, 0, 8, 0;
 }
 
 .heading-1 {
     -fx-font-size: 25px;
     -fx-font-weight: bold;
-    -fx-margin: 0, 0, 8, 0;
 }
 
 .heading-2 {
@@ -120,15 +108,15 @@ Label {
 }
 
 Text {
-    -fx-fill: text-color;
+    -fx-fill: -owlplug-color-text;
 }
 
 .text-disabled {
-    -fx-fill: disabled-color;
+    -fx-fill: -color-fg-muted;
 }
 
 .text-danger {
-    -fx-fill: danger-color;
+    -fx-fill: -color-danger-emphasis;
 }
 
 
@@ -138,15 +126,15 @@ Text {
 }
 
 .status-icon-found {
-    -fx-icon-color: success-color;
+    -fx-icon-color: -color-success-emphasis;
 }
 
 .status-icon-missing {
-    -fx-icon-color: danger-color;
+    -fx-icon-color: -color-danger-emphasis;
 }
 
 .status-icon-unknown {
-    -fx-icon-color: disabled-color;
+    -fx-icon-color: -color-fg-muted;
 }
 
 .search-bar-chip-view {
@@ -160,7 +148,7 @@ Text {
 }
 
 .chip-view .chips-pane .text-area {
-    -fx-text-fill: text-color;
+    -fx-text-fill: -owlplug-color-text;
 }
 
 .chip Button {
@@ -175,10 +163,6 @@ Text {
     -fx-text-fill: -color-fg-muted;
 }
 
-.chip Label {
-    -fx-text-fill: -color-fg-muted;
-}
-
 .chip-view .chip-brown {
     -fx-background-color: rgba(178, 103, 94, 0.15);
 }
@@ -227,43 +211,31 @@ Text {
 }
 
 .button-danger {
-    -fx-background-color: danger-color;
-}
-
-.button-danger:hover {
-    -fx-background-color: #c9302c;
-}
-
-.button-danger:pressed {
-    -fx-background-color: #ac2925;
+    -fx-background-color: -color-danger-emphasis;
 }
 
 .button-success {
-    -fx-background-color: success-color;
-}
-
-.button-default {
-    -fx-background-color: -color-fg-default;
+    -fx-background-color: -color-success-emphasis;
 }
 
 
 .hyperlink-button {
     -fx-underline: false;
-    -fx-text-fill: text-color;
+    -fx-text-fill: -owlplug-color-text;
 }
 
 .hyperlink-button:hover {
     -fx-underline: false;
-    -fx-text-fill: text-color;
+    -fx-text-fill: -owlplug-color-text;
 }
 
 .hyperlink-button:visited {
     -fx-underline: false;
-    -fx-text-fill: text-color;
+    -fx-text-fill: -owlplug-color-text;
 }
 
 .hyperlink-dark {
-    -fx-text-fill: rgb(40, 40, 40);
+    -fx-text-fill: -color-fg-muted
 }
 
 .hyperlink-dark:focused {
@@ -282,10 +254,6 @@ Text {
     -fx-border-width: 0px;
 }
 
-.hyperlink-web:visited {
-    -fx-text-fill: disabled-color;
-}
-
 .combo-box .combo-box-popup .list-view,
 .combo-box .combo-box-popup .list-cell {
     -fx-text-fill: white;
@@ -316,7 +284,7 @@ Text {
 
 
 .autocomplete-list .list-cell {
-    -fx-text-fill: text-color;
+    -fx-text-fill: -owlplug-color-text;
 }
 
 .popup,
@@ -325,21 +293,17 @@ Text {
     -fx-background-color: -color-bg-default;
 }
 
-.progress-bar-link {
-    dot_color: rgb(143, 143, 143);
-}
-
 ProgressIndicator {
-    -fx-progress-color: theme-primary-color;
+    -fx-progress-color: -color-accent-fg;;
 }
 
 .context-menu {
     -fx-background-color: -color-bg-default;
-    -fx-text-fill: text-color;
+    -fx-text-fill: -owlplug-color-text;
 }
 
 .tooltip {
-    -fx-text-fill: text-color;
+    -fx-text-fill: -owlplug-color-text;
 }
 
 /****************************************************************
@@ -353,7 +317,7 @@ ProgressIndicator {
 .header .combo-box-base {
     -fx-background-radius: 0;
     -fx-border-radius: 0;
-    -fx-text-fill: text-color;
+    -fx-text-fill: -owlplug-color-text;
 }
 
 /* Collapse the unused content area of the navigation TabPane */
@@ -406,6 +370,12 @@ ProgressIndicator {
 
 
 .pane-card {
+    -fx-padding: 10;
+    -fx-border-width: 1px;
+    -fx-border-color: -color-border-default;
+}
+
+.dashboard-card {
     -fx-padding: 14;
     -fx-background-color: -color-bg-subtle;
     -fx-background-radius: 8px;
@@ -415,16 +385,15 @@ ProgressIndicator {
 }
 
 .pane-card .card-title {
-    -fx-height: 37;
+    -fx-pref-height: 37;
     -fx-padding: 5, 5, 5, 5;
     -fx-background-color: -color-bg-subtle;
-    -fx-margin: 0, 0, 10, 0;
 }
 
 .pane-card .card-title Label {
     -fx-font-size: 14px;
     -fx-font-weight: bold;
-    -fx-text-fill: disabled-color;
+    -fx-text-fill: -color-fg-muted;
 }
 
 /* Plugin info view */
@@ -432,19 +401,12 @@ ProgressIndicator {
 .info-field-label {
     -fx-font-size: 10px;
     -fx-font-weight: bold;
-    -fx-text-fill: disabled-color;
+    -fx-text-fill: -color-fg-muted;
 }
 
 .info-field-value {
     -fx-font-size: 13px;
-    -fx-text-fill: text-emphase-color;
-}
-
-.plugin-action-bar {
-    -fx-background-color: -color-bg-subtle;
-    -fx-border-width: 0 0 1 0;
-    -fx-border-color: -color-border-default;
-    -fx-padding: 8 16 8 16;
+    -fx-text-fill: -owlplug-color-text-emphasis;
 }
 
 .package-bloc-title {
@@ -455,12 +417,12 @@ ProgressIndicator {
 
 .package-source-badge {
     -fx-background-color: rgba(245, 245, 241, 1);
-    -fx-text-fill: disabled-color;
+    -fx-text-fill: -color-fg-muted;
     -fx-background-radius: 0 0 0 5px;
     -fx-border-radius: 0 0 0 5px;
     -fx-padding: 5;
     -fx-border-style: solid;
-    -fx-border-color: disabled-color;
+    -fx-border-color: -color-fg-muted;
     -fx-border-width: 0 0 1 1;
 }
 
@@ -471,11 +433,11 @@ ProgressIndicator {
 }
 
 .shape-state-active {
-    -fx-fill: success-color;
+    -fx-fill: -color-success-emphasis;
 }
 
 .shape-state-unstable {
-    -fx-fill: danger-color;
+    -fx-fill: -color-danger-emphasis;
 }
 
 .shape-state-installed {
@@ -483,7 +445,7 @@ ProgressIndicator {
 }
 
 .shape-state-disabled {
-    -fx-fill: disabled-color;
+    -fx-fill: -color-fg-muted;
 }
 
 /****************************************************************
@@ -555,11 +517,11 @@ ProgressIndicator {
 }
 
 .chart-legend>.label {
-    -fx-text-fill: text-color;
+    -fx-text-fill: -owlplug-color-text;
 }
 
 .chart-pie-label {
-    -fx-fill: text-color;
+    -fx-fill: -owlplug-color-text;
 }
 
 .chart-pie-label-line {
@@ -572,7 +534,7 @@ ProgressIndicator {
 }
 
 .preloader .progress-bar {
-    dot_color: disabled-color;
+    dot_color: -color-fg-muted;
 }
 
 /****************************************************************
@@ -806,7 +768,7 @@ ProgressIndicator {
 }
 
 .dashboard-bar-chart .axis-line {
-    visibility: hidden;
+    -fx-opacity: 0
 }
 
 .dashboard-bar-label {
diff --git a/owlplug-theme/src/main/scss/owlplug-dark.scss b/owlplug-theme/src/main/scss/owlplug-dark.scss
index 20e84828..2ed6d454 100644
--- a/owlplug-theme/src/main/scss/owlplug-dark.scss
+++ b/owlplug-theme/src/main/scss/owlplug-dark.scss
@@ -50,29 +50,29 @@
   $success-8: #033a16,
   $success-9: #04260f,
 
-  // Warning (identical to Primer Dark)
-  $warning-0: #f8e3a1,
-  $warning-1: #f2cc60,
-  $warning-2: #e3b341,
-  $warning-3: #d29922,
-  $warning-4: #bb8009,
-  $warning-5: #9e6a03,
-  $warning-6: #845306,
-  $warning-7: #693e00,
-  $warning-8: #4b2900,
-  $warning-9: #341a00,
-
-  // Danger (identical to Primer Dark)
-  $danger-0: #ffdcd7,
-  $danger-1: #ffc1ba,
-  $danger-2: #ffa198,
-  $danger-3: #ff7b72,
-  $danger-4: #f85149,
-  $danger-5: #da3633,
-  $danger-6: #b62324,
-  $danger-7: #8e1519,
-  $danger-8: #67060c,
-  $danger-9: #490202
+  // Warning — shifted toward clean yellow (~53°) to separate from warm terracotta accent
+  $warning-0: #fef3c0,
+  $warning-1: #fde96a,
+  $warning-2: #f5d030,
+  $warning-3: #dbb820,
+  $warning-4: #b89610,
+  $warning-5: #927508,
+  $warning-6: #6e5706,
+  $warning-7: #4e3d04,
+  $warning-8: #312602,
+  $warning-9: #1c1601,
+
+  // Danger — cooler crimson to separate clearly from the warm terracotta accent
+  $danger-0: #ffe0de,
+  $danger-1: #ffbcba,
+  $danger-2: #f4948f,
+  $danger-3: #e06560,
+  $danger-4: #d45050,
+  $danger-5: #a82f2f,
+  $danger-6: #8b2020,
+  $danger-7: #6b1515,
+  $danger-8: #480d0d,
+  $danger-9: #2e0606
 );
 
 @use "../../../target/atlantafx/styles/settings/color-scale" as scale;