diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e14772a3c..4f9a7cf9ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,10 @@
 - Add `user.id`, `user.name` and `user.email` to log attributes ([#4486](https://github.com/getsentry/sentry-java/pull/4486))
 - Serialize `preContext` and `postContext` in `SentryStackFrame` ([#4482](https://github.com/getsentry/sentry-java/pull/4482))
 
+### Internal
+
+- User Feedback now uses SentryUser.username instead of SentryUser.name ([#4494](https://github.com/getsentry/sentry-java/pull/4494))
+
 ## 8.13.3
 
 ### Fixes
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/SentryUserFeedbackDialog.java b/sentry-android-core/src/main/java/io/sentry/android/core/SentryUserFeedbackDialog.java
index 77c9a61d2d..730dad62d6 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/SentryUserFeedbackDialog.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/SentryUserFeedbackDialog.java
@@ -105,7 +105,7 @@ protected void onCreate(Bundle savedInstanceState) {
     if (feedbackOptions.isUseSentryUser()) {
       final @Nullable User user = Sentry.getCurrentScopes().getScope().getUser();
       if (user != null) {
-        edtName.setText(user.getName());
+        edtName.setText(user.getUsername());
         edtEmail.setText(user.getEmail());
       }
     }
diff --git a/sentry-android-core/src/main/res/drawable-hdpi/sentry_logo_dark.webp b/sentry-android-core/src/main/res/drawable-hdpi/sentry_logo_dark.webp
deleted file mode 100644
index 107533bbf2..0000000000
Binary files a/sentry-android-core/src/main/res/drawable-hdpi/sentry_logo_dark.webp and /dev/null differ
diff --git a/sentry-android-core/src/main/res/drawable-mdpi/sentry_logo_dark.webp b/sentry-android-core/src/main/res/drawable-mdpi/sentry_logo_dark.webp
deleted file mode 100644
index 6237c1c7e8..0000000000
Binary files a/sentry-android-core/src/main/res/drawable-mdpi/sentry_logo_dark.webp and /dev/null differ
diff --git a/sentry-android-core/src/main/res/drawable-xhdpi/sentry_logo_dark.webp b/sentry-android-core/src/main/res/drawable-xhdpi/sentry_logo_dark.webp
deleted file mode 100644
index d072a19a43..0000000000
Binary files a/sentry-android-core/src/main/res/drawable-xhdpi/sentry_logo_dark.webp and /dev/null differ
diff --git a/sentry-android-core/src/main/res/drawable-xxhdpi/sentry_logo_dark.webp b/sentry-android-core/src/main/res/drawable-xxhdpi/sentry_logo_dark.webp
deleted file mode 100644
index 7dceaec7fa..0000000000
Binary files a/sentry-android-core/src/main/res/drawable-xxhdpi/sentry_logo_dark.webp and /dev/null differ
diff --git a/sentry-android-core/src/main/res/drawable-xxxhdpi/sentry_logo_dark.webp b/sentry-android-core/src/main/res/drawable-xxxhdpi/sentry_logo_dark.webp
deleted file mode 100644
index 0e61b7ebce..0000000000
Binary files a/sentry-android-core/src/main/res/drawable-xxxhdpi/sentry_logo_dark.webp and /dev/null differ
diff --git a/sentry-android-core/src/main/res/drawable/sentry_logo_dark.xml b/sentry-android-core/src/main/res/drawable/sentry_logo_dark.xml
new file mode 100644
index 0000000000..72bae31335
--- /dev/null
+++ b/sentry-android-core/src/main/res/drawable/sentry_logo_dark.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="184dp"
+    android:viewportWidth="72"
+    android:viewportHeight="66">
+  <path
+      android:pathData="M40,13.26a4.67,4.67 0,0 0,-8 0L25.42,24.53A32.21,32.21 0,0 1,43.17 51.19L38.55,51.19A27.68,27.68 0,0 0,23.09 28.47L17,39a15.92,15.92 0,0 1,9.23 12.17L15.62,51.17A0.76,0.76 0,0 1,15 50.06l2.94,-5a10.74,10.74 0,0 0,-3.36 -1.9l-2.91,5a4.54,4.54 0,0 0,1.69 6.24A4.66,4.66 0,0 0,15.62 55L30.15,55a19.4,19.4 0,0 0,-8 -17.31l2.31,-4A23.87,23.87 0,0 1,34.76 55L47.07,55a35.88,35.88 0,0 0,-16.41 -31.8l4.67,-8a0.77,0.77 0,0 1,1.05 -0.27c0.53,0.29 20.29,34.77 20.66,35.17a0.76,0.76 0,0 1,-0.68 1.13L51.6,51.23q0.09,1.91 0,3.81h4.78A4.59,4.59 0,0 0,61 50.43a4.49,4.49 0,0 0,-0.62 -2.28Z"
+      android:fillColor="#362d59"/>
+</vector>
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt
index 5a94dfb5d4..dc63cda6d0 100644
--- a/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt
+++ b/sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt
@@ -439,6 +439,7 @@ class UserFeedbackUiTest : BaseUiTest() {
         Sentry.setUser(
             User().apply {
                 name = "Test User"
+                username = "Test UserName"
                 email = "Test User Email"
             }
         )
@@ -446,7 +447,7 @@ class UserFeedbackUiTest : BaseUiTest() {
             // Name and email are filled with Sentry user properties
             onView(withId(R.id.sentry_dialog_user_feedback_edt_name))
                 .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
-                .check(matches(withText("Test User")))
+                .check(matches(withText("Test UserName")))
 
             // Even if the field is hidden
             onView(withId(R.id.sentry_dialog_user_feedback_edt_email))
@@ -464,6 +465,7 @@ class UserFeedbackUiTest : BaseUiTest() {
         Sentry.setUser(
             User().apply {
                 name = "Test User"
+                username = "Test UserName"
                 email = "Test User Email"
             }
         )
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
index 2449e93b87..4e38e81feb 100644
--- a/sentry/api/sentry.api
+++ b/sentry/api/sentry.api
@@ -2976,37 +2976,37 @@ public final class io/sentry/SentryExecutorService : io/sentry/ISentryExecutorSe
 public final class io/sentry/SentryFeedbackOptions {
 	public fun <init> ()V
 	public fun <init> (Lio/sentry/SentryFeedbackOptions;)V
-	public fun getCancelButtonLabel ()Ljava/lang/String;
-	public fun getEmailLabel ()Ljava/lang/String;
-	public fun getEmailPlaceholder ()Ljava/lang/String;
-	public fun getFormTitle ()Ljava/lang/String;
-	public fun getIsRequiredLabel ()Ljava/lang/String;
-	public fun getMessageLabel ()Ljava/lang/String;
-	public fun getMessagePlaceholder ()Ljava/lang/String;
-	public fun getNameLabel ()Ljava/lang/String;
-	public fun getNamePlaceholder ()Ljava/lang/String;
+	public fun getCancelButtonLabel ()Ljava/lang/CharSequence;
+	public fun getEmailLabel ()Ljava/lang/CharSequence;
+	public fun getEmailPlaceholder ()Ljava/lang/CharSequence;
+	public fun getFormTitle ()Ljava/lang/CharSequence;
+	public fun getIsRequiredLabel ()Ljava/lang/CharSequence;
+	public fun getMessageLabel ()Ljava/lang/CharSequence;
+	public fun getMessagePlaceholder ()Ljava/lang/CharSequence;
+	public fun getNameLabel ()Ljava/lang/CharSequence;
+	public fun getNamePlaceholder ()Ljava/lang/CharSequence;
 	public fun getOnFormClose ()Ljava/lang/Runnable;
 	public fun getOnFormOpen ()Ljava/lang/Runnable;
 	public fun getOnSubmitError ()Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;
 	public fun getOnSubmitSuccess ()Lio/sentry/SentryFeedbackOptions$SentryFeedbackCallback;
-	public fun getSubmitButtonLabel ()Ljava/lang/String;
-	public fun getSuccessMessageText ()Ljava/lang/String;
+	public fun getSubmitButtonLabel ()Ljava/lang/CharSequence;
+	public fun getSuccessMessageText ()Ljava/lang/CharSequence;
 	public fun isEmailRequired ()Z
 	public fun isNameRequired ()Z
 	public fun isShowBranding ()Z
 	public fun isShowEmail ()Z
 	public fun isShowName ()Z
 	public fun isUseSentryUser ()Z
-	public fun setCancelButtonLabel (Ljava/lang/String;)V
-	public fun setEmailLabel (Ljava/lang/String;)V
-	public fun setEmailPlaceholder (Ljava/lang/String;)V
+	public fun setCancelButtonLabel (Ljava/lang/CharSequence;)V
+	public fun setEmailLabel (Ljava/lang/CharSequence;)V
+	public fun setEmailPlaceholder (Ljava/lang/CharSequence;)V
 	public fun setEmailRequired (Z)V
-	public fun setFormTitle (Ljava/lang/String;)V
-	public fun setIsRequiredLabel (Ljava/lang/String;)V
-	public fun setMessageLabel (Ljava/lang/String;)V
-	public fun setMessagePlaceholder (Ljava/lang/String;)V
-	public fun setNameLabel (Ljava/lang/String;)V
-	public fun setNamePlaceholder (Ljava/lang/String;)V
+	public fun setFormTitle (Ljava/lang/CharSequence;)V
+	public fun setIsRequiredLabel (Ljava/lang/CharSequence;)V
+	public fun setMessageLabel (Ljava/lang/CharSequence;)V
+	public fun setMessagePlaceholder (Ljava/lang/CharSequence;)V
+	public fun setNameLabel (Ljava/lang/CharSequence;)V
+	public fun setNamePlaceholder (Ljava/lang/CharSequence;)V
 	public fun setNameRequired (Z)V
 	public fun setOnFormClose (Ljava/lang/Runnable;)V
 	public fun setOnFormOpen (Ljava/lang/Runnable;)V
@@ -3015,8 +3015,8 @@ public final class io/sentry/SentryFeedbackOptions {
 	public fun setShowBranding (Z)V
 	public fun setShowEmail (Z)V
 	public fun setShowName (Z)V
-	public fun setSubmitButtonLabel (Ljava/lang/String;)V
-	public fun setSuccessMessageText (Ljava/lang/String;)V
+	public fun setSubmitButtonLabel (Ljava/lang/CharSequence;)V
+	public fun setSuccessMessageText (Ljava/lang/CharSequence;)V
 	public fun setUseSentryUser (Z)V
 	public fun toString ()Ljava/lang/String;
 }
diff --git a/sentry/src/main/java/io/sentry/SentryFeedbackOptions.java b/sentry/src/main/java/io/sentry/SentryFeedbackOptions.java
index 2a4782d4d0..5e94423beb 100644
--- a/sentry/src/main/java/io/sentry/SentryFeedbackOptions.java
+++ b/sentry/src/main/java/io/sentry/SentryFeedbackOptions.java
@@ -32,33 +32,33 @@ public final class SentryFeedbackOptions {
 
   // Text Customization
   /** The title of the feedback form. Defaults to "Report a Bug". */
-  private @NotNull String formTitle = "Report a Bug";
+  private @NotNull CharSequence formTitle = "Report a Bug";
   /** The label of the submit button. Defaults to "Send Bug Report". */
-  private @NotNull String submitButtonLabel = "Send Bug Report";
+  private @NotNull CharSequence submitButtonLabel = "Send Bug Report";
   /** The label of the cancel button. Defaults to "Cancel". */
-  private @NotNull String cancelButtonLabel = "Cancel";
+  private @NotNull CharSequence cancelButtonLabel = "Cancel";
   /** The label next to the name input field. Defaults to "Name". */
-  private @NotNull String nameLabel = "Name";
+  private @NotNull CharSequence nameLabel = "Name";
   /** The placeholder in the name input field. Defaults to "Your Name". */
-  private @NotNull String namePlaceholder = "Your Name";
+  private @NotNull CharSequence namePlaceholder = "Your Name";
   /** The label next to the email input field. Defaults to "Email". */
-  private @NotNull String emailLabel = "Email";
+  private @NotNull CharSequence emailLabel = "Email";
   /** The placeholder in the email input field. Defaults to "your.email@example.org". */
-  private @NotNull String emailPlaceholder = "your.email@example.org";
+  private @NotNull CharSequence emailPlaceholder = "your.email@example.org";
   /** The text to attach to the title label for a required field. Defaults to " (Required)". */
-  private @NotNull String isRequiredLabel = " (Required)";
+  private @NotNull CharSequence isRequiredLabel = " (Required)";
   /** The label of the feedback description input field. Defaults to "Description". */
-  private @NotNull String messageLabel = "Description";
+  private @NotNull CharSequence messageLabel = "Description";
   /**
    * The placeholder in the feedback description input field. Defaults to "What's the bug? What did
    * you expect?".
    */
-  private @NotNull String messagePlaceholder = "What's the bug? What did you expect?";
+  private @NotNull CharSequence messagePlaceholder = "What's the bug? What did you expect?";
   /**
    * The message displayed after a successful feedback submission. Defaults to "Thank you for your
    * report!".
    */
-  private @NotNull String successMessageText = "Thank you for your report!";
+  private @NotNull CharSequence successMessageText = "Thank you for your report!";
 
   // Callbacks
   /** Callback called when the feedback form is opened. */
@@ -216,7 +216,7 @@ public void setShowBranding(final boolean showBranding) {
    *
    * @return the title of the feedback form
    */
-  public @NotNull String getFormTitle() {
+  public @NotNull CharSequence getFormTitle() {
     return formTitle;
   }
 
@@ -225,7 +225,7 @@ public void setShowBranding(final boolean showBranding) {
    *
    * @param formTitle the title of the feedback form
    */
-  public void setFormTitle(final @NotNull String formTitle) {
+  public void setFormTitle(final @NotNull CharSequence formTitle) {
     this.formTitle = formTitle;
   }
 
@@ -234,7 +234,7 @@ public void setFormTitle(final @NotNull String formTitle) {
    *
    * @return the label of the submit button
    */
-  public @NotNull String getSubmitButtonLabel() {
+  public @NotNull CharSequence getSubmitButtonLabel() {
     return submitButtonLabel;
   }
 
@@ -243,7 +243,7 @@ public void setFormTitle(final @NotNull String formTitle) {
    *
    * @param submitButtonLabel the label of the submit button
    */
-  public void setSubmitButtonLabel(final @NotNull String submitButtonLabel) {
+  public void setSubmitButtonLabel(final @NotNull CharSequence submitButtonLabel) {
     this.submitButtonLabel = submitButtonLabel;
   }
 
@@ -252,7 +252,7 @@ public void setSubmitButtonLabel(final @NotNull String submitButtonLabel) {
    *
    * @return the label of the cancel button
    */
-  public @NotNull String getCancelButtonLabel() {
+  public @NotNull CharSequence getCancelButtonLabel() {
     return cancelButtonLabel;
   }
 
@@ -261,7 +261,7 @@ public void setSubmitButtonLabel(final @NotNull String submitButtonLabel) {
    *
    * @param cancelButtonLabel the label of the cancel button
    */
-  public void setCancelButtonLabel(final @NotNull String cancelButtonLabel) {
+  public void setCancelButtonLabel(final @NotNull CharSequence cancelButtonLabel) {
     this.cancelButtonLabel = cancelButtonLabel;
   }
 
@@ -270,7 +270,7 @@ public void setCancelButtonLabel(final @NotNull String cancelButtonLabel) {
    *
    * @return the label next to the name input field
    */
-  public @NotNull String getNameLabel() {
+  public @NotNull CharSequence getNameLabel() {
     return nameLabel;
   }
 
@@ -279,7 +279,7 @@ public void setCancelButtonLabel(final @NotNull String cancelButtonLabel) {
    *
    * @param nameLabel the label next to the name input field
    */
-  public void setNameLabel(final @NotNull String nameLabel) {
+  public void setNameLabel(final @NotNull CharSequence nameLabel) {
     this.nameLabel = nameLabel;
   }
 
@@ -288,7 +288,7 @@ public void setNameLabel(final @NotNull String nameLabel) {
    *
    * @return the placeholder in the name input field
    */
-  public @NotNull String getNamePlaceholder() {
+  public @NotNull CharSequence getNamePlaceholder() {
     return namePlaceholder;
   }
 
@@ -297,7 +297,7 @@ public void setNameLabel(final @NotNull String nameLabel) {
    *
    * @param namePlaceholder the placeholder in the name input field
    */
-  public void setNamePlaceholder(final @NotNull String namePlaceholder) {
+  public void setNamePlaceholder(final @NotNull CharSequence namePlaceholder) {
     this.namePlaceholder = namePlaceholder;
   }
 
@@ -306,7 +306,7 @@ public void setNamePlaceholder(final @NotNull String namePlaceholder) {
    *
    * @return the label next to the email input field
    */
-  public @NotNull String getEmailLabel() {
+  public @NotNull CharSequence getEmailLabel() {
     return emailLabel;
   }
 
@@ -315,7 +315,7 @@ public void setNamePlaceholder(final @NotNull String namePlaceholder) {
    *
    * @param emailLabel the label next to the email input field
    */
-  public void setEmailLabel(final @NotNull String emailLabel) {
+  public void setEmailLabel(final @NotNull CharSequence emailLabel) {
     this.emailLabel = emailLabel;
   }
 
@@ -324,7 +324,7 @@ public void setEmailLabel(final @NotNull String emailLabel) {
    *
    * @return the placeholder in the email input field
    */
-  public @NotNull String getEmailPlaceholder() {
+  public @NotNull CharSequence getEmailPlaceholder() {
     return emailPlaceholder;
   }
 
@@ -333,7 +333,7 @@ public void setEmailLabel(final @NotNull String emailLabel) {
    *
    * @param emailPlaceholder the placeholder in the email input field
    */
-  public void setEmailPlaceholder(final @NotNull String emailPlaceholder) {
+  public void setEmailPlaceholder(final @NotNull CharSequence emailPlaceholder) {
     this.emailPlaceholder = emailPlaceholder;
   }
 
@@ -342,7 +342,7 @@ public void setEmailPlaceholder(final @NotNull String emailPlaceholder) {
    *
    * @return the text to attach to the title label for a required field
    */
-  public @NotNull String getIsRequiredLabel() {
+  public @NotNull CharSequence getIsRequiredLabel() {
     return isRequiredLabel;
   }
 
@@ -351,7 +351,7 @@ public void setEmailPlaceholder(final @NotNull String emailPlaceholder) {
    *
    * @param isRequiredLabel the text to attach to the title label for a required field
    */
-  public void setIsRequiredLabel(final @NotNull String isRequiredLabel) {
+  public void setIsRequiredLabel(final @NotNull CharSequence isRequiredLabel) {
     this.isRequiredLabel = isRequiredLabel;
   }
 
@@ -360,7 +360,7 @@ public void setIsRequiredLabel(final @NotNull String isRequiredLabel) {
    *
    * @return the label of the feedback description input field
    */
-  public @NotNull String getMessageLabel() {
+  public @NotNull CharSequence getMessageLabel() {
     return messageLabel;
   }
 
@@ -369,7 +369,7 @@ public void setIsRequiredLabel(final @NotNull String isRequiredLabel) {
    *
    * @param messageLabel the label of the feedback description input field
    */
-  public void setMessageLabel(final @NotNull String messageLabel) {
+  public void setMessageLabel(final @NotNull CharSequence messageLabel) {
     this.messageLabel = messageLabel;
   }
 
@@ -379,7 +379,7 @@ public void setMessageLabel(final @NotNull String messageLabel) {
    *
    * @return the placeholder in the feedback description input field
    */
-  public @NotNull String getMessagePlaceholder() {
+  public @NotNull CharSequence getMessagePlaceholder() {
     return messagePlaceholder;
   }
 
@@ -388,7 +388,7 @@ public void setMessageLabel(final @NotNull String messageLabel) {
    *
    * @param messagePlaceholder the placeholder in the feedback description input field
    */
-  public void setMessagePlaceholder(final @NotNull String messagePlaceholder) {
+  public void setMessagePlaceholder(final @NotNull CharSequence messagePlaceholder) {
     this.messagePlaceholder = messagePlaceholder;
   }
 
@@ -398,7 +398,7 @@ public void setMessagePlaceholder(final @NotNull String messagePlaceholder) {
    *
    * @return the message displayed after a successful feedback submission
    */
-  public @NotNull String getSuccessMessageText() {
+  public @NotNull CharSequence getSuccessMessageText() {
     return successMessageText;
   }
 
@@ -407,7 +407,7 @@ public void setMessagePlaceholder(final @NotNull String messagePlaceholder) {
    *
    * @param successMessageText the message displayed after a successful feedback submission
    */
-  public void setSuccessMessageText(final @NotNull String successMessageText) {
+  public void setSuccessMessageText(final @NotNull CharSequence successMessageText) {
     this.successMessageText = successMessageText;
   }
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/getsentry/sentry-java/pull/4494.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/getsentry/sentry-java/pull/4494.diff" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/getsentry/sentry-java/pull/4494.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/getsentry/sentry-java/pull/4494.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>