diff --git a/src/main/java/com/sparrowwallet/sparrow/MainApp.java b/src/main/java/com/sparrowwallet/sparrow/MainApp.java
index 26ff588e..497bb3ff 100644
--- a/src/main/java/com/sparrowwallet/sparrow/MainApp.java
+++ b/src/main/java/com/sparrowwallet/sparrow/MainApp.java
@@ -8,7 +8,6 @@ import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
-import com.sparrowwallet.sparrow.net.Bwt;
 import com.sparrowwallet.sparrow.net.PublicElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
diff --git a/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java b/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java
index 4d7eb5d4..36c0b343 100644
--- a/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java
+++ b/src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java
@@ -189,7 +189,7 @@ public class TransactionDiagram extends GridPane {
         if(numSets > 1) {
             double setHeight = (height / numSets) - 5;
             for(int set = 0; set < numSets; set++) {
-                StackPane stackPane = getBracket(width, setHeight, getUserGlyph(), "Contributor " + (set+1));
+                StackPane stackPane = getBracket(width, setHeight, getUserGlyph(), walletTx.getWallet().getFullDisplayName() + "\nClick to replace with an external contributor");
                 allBrackets.getChildren().add(stackPane);
             }
         } else if(walletTx.isCoinControlUsed()) {
@@ -248,6 +248,8 @@ public class TransactionDiagram extends GridPane {
 
         glyph.getStyleClass().add("inputs-type");
         Tooltip tooltip = new Tooltip(tooltipText);
+        tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
+        tooltip.setShowDuration(Duration.INDEFINITE);
         glyph.setTooltip(tooltip);
         stackPane.getChildren().addAll(pane, glyph);
 
@@ -752,9 +754,11 @@ public class TransactionDiagram extends GridPane {
     }
 
     private Glyph getUserGlyph() {
-        Glyph userGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER);
+        Glyph userGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COINS);
         userGlyph.getStyleClass().add("user-icon");
         userGlyph.setFontSize(12);
+        userGlyph.setOnMouseEntered(event -> userGlyph.setIcon(FontAwesome5.Glyph.USER_PLUS));
+        userGlyph.setOnMouseExited(event -> userGlyph.setIcon(FontAwesome5.Glyph.COINS));
         return userGlyph;
     }
 
diff --git a/src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java b/src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java
index 1df73d82..e4a502ff 100644
--- a/src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java
+++ b/src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java
@@ -72,6 +72,7 @@ public class FontAwesome5 extends GlyphFont {
         UNDO('\uf0e2'),
         USER('\uf007'),
         USER_FRIENDS('\uf500'),
+        USER_PLUS('\uf234'),
         WALLET('\uf555'),
         WEIGHT('\uf496');
 
diff --git a/src/main/resources/com/sparrowwallet/sparrow/wallet/send.css b/src/main/resources/com/sparrowwallet/sparrow/wallet/send.css
index ceb7e37b..547c7288 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/wallet/send.css
+++ b/src/main/resources/com/sparrowwallet/sparrow/wallet/send.css
@@ -114,4 +114,8 @@
         linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
         linear-gradient(to bottom, derive(-fx-control-inner-background, -9%), derive(-fx-control-inner-background, 0%), derive(-fx-control-inner-background, -5%), derive(-fx-control-inner-background, -12%)),
         linear-gradient(to right, #c8416466 0%, #a0a1a766 50%, #a0a1a700 100%);
+}
+
+#transactionDiagram .user-icon {
+    -fx-text-fill: -fx-text-base-color;
 }
\ No newline at end of file