diff --git a/desktop/src/main/java/bisq/desktop/bisq.css b/desktop/src/main/java/bisq/desktop/bisq.css
index f8e2387563..82e8c86c5c 100644
--- a/desktop/src/main/java/bisq/desktop/bisq.css
+++ b/desktop/src/main/java/bisq/desktop/bisq.css
@@ -838,6 +838,7 @@ textfield */
     -fx-border-width: 0px;
     -fx-underline: true;
     -fx-text-fill: -bs-rd-font-dark;
+    -fx-fill: -bs-rd-font-dark;
 }
 
 .hyperlink.no-underline {
@@ -846,6 +847,7 @@ textfield */
 
 .hyperlink:hover {
     -fx-text-fill: -bs-text-color;
+    -fx-fill: -bs-text-color;
 }
 
 .hyperlink:hover,
diff --git a/desktop/src/main/java/bisq/desktop/components/HyperlinkWithIcon.java b/desktop/src/main/java/bisq/desktop/components/HyperlinkWithIcon.java
index c9504c9da4..8834e001a9 100644
--- a/desktop/src/main/java/bisq/desktop/components/HyperlinkWithIcon.java
+++ b/desktop/src/main/java/bisq/desktop/components/HyperlinkWithIcon.java
@@ -81,9 +81,6 @@ public class HyperlinkWithIcon extends Hyperlink {
 
         setContentDisplay(ContentDisplay.RIGHT);
         setGraphicTextGap(7.0);
-
-        //TODO: replace workaround of setting the style this way
-        tooltipProperty().addListener((observable, oldValue, newValue) -> newValue.getStyleClass().add("tooltip-hyperlink-icon"));
     }
 
     public void clear() {