diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index b94ae45c94..05d2b5f666 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -962,11 +962,11 @@ portfolio.pending.step5_seller.sold=You have sold
 portfolio.pending.step5_seller.received=You have received
 
 tradeFeedbackWindow.title=Congratulations on completing your trade
-tradeFeedbackWindow.msg.part1=We'd love to hear back from you about your experience. It'll help us to improve the software \
-  and to smooth out any rough edges. If you'd like to provide feedback, please fill out this short survey \
-  (no registration required) at:
-tradeFeedbackWindow.msg.part2=If you have any questions, or experienced any problems, please get in touch with other users and contributors via the Bisq forum at:
-tradeFeedbackWindow.msg.part3=Thanks for using Bisq!
+tradeFeedbackWindow.msg.feedback=We'd love to hear back from you about your experience. It'll help us to improve the software \
+  and to smooth out any rough edges.\n\n\
+  If you'd like to provide feedback, if you have any questions, or experienced any problems, \
+  please get in touch with other users and contributors via the Bisq forum at:
+tradeFeedbackWindow.msg.thanks=Thanks for using Bisq!
 
 portfolio.pending.role=My role
 portfolio.pending.tradeInformation=Trade information
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeFeedbackWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeFeedbackWindow.java
index e82273cccd..79b38b3518 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeFeedbackWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeFeedbackWindow.java
@@ -45,7 +45,7 @@ public class TradeFeedbackWindow extends Overlay<TradeFeedbackWindow> {
     @Override
     public void show() {
         headLine(Res.get("tradeFeedbackWindow.title"));
-        message(Res.get("tradeFeedbackWindow.msg.part1"));
+        message(Res.get("tradeFeedbackWindow.msg.feedback"));
         hideCloseButton();
         actionButtonText(Res.get("shared.close"));
 
@@ -56,25 +56,12 @@ public class TradeFeedbackWindow extends Overlay<TradeFeedbackWindow> {
     protected void addMessage() {
         super.addMessage();
 
-        HyperlinkWithIcon survey = addHyperlinkWithIcon(gridPane, ++rowIndex, "https://bisq.network/survey",
-                "https://bisq.network/survey");
-        GridPane.setMargin(survey, new Insets(-6, 0, 10, 0));
-
-        AutoTooltipLabel messageLabel2 = new AutoTooltipLabel(Res.get("tradeFeedbackWindow.msg.part2"));
-        messageLabel2.setMouseTransparent(true);
-        messageLabel2.setWrapText(true);
-        GridPane.setHalignment(messageLabel2, HPos.LEFT);
-        GridPane.setHgrow(messageLabel2, Priority.ALWAYS);
-        GridPane.setRowIndex(messageLabel2, ++rowIndex);
-        GridPane.setColumnIndex(messageLabel2, 0);
-        GridPane.setColumnSpan(messageLabel2, 2);
-        gridPane.getChildren().add(messageLabel2);
 
         HyperlinkWithIcon forum = addHyperlinkWithIcon(gridPane, ++rowIndex, "https://bisq.community",
                 "https://bisq.community", 40);
         GridPane.setMargin(forum, new Insets(-6, 0, 10, 0));
 
-        AutoTooltipLabel messageLabel3 = new AutoTooltipLabel(Res.get("tradeFeedbackWindow.msg.part3"));
+        AutoTooltipLabel messageLabel3 = new AutoTooltipLabel(Res.get("tradeFeedbackWindow.msg.thanks"));
         messageLabel3.setMouseTransparent(true);
         messageLabel3.setWrapText(true);
         GridPane.setHalignment(messageLabel3, HPos.LEFT);