diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b78d843b2..74c6aed7e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Log parameter objects are now turned into `String` via `toString` ([#4515](https://github.com/getsentry/sentry-java/pull/4515))
   - One of the two `SentryLogEventAttributeValue` constructors did not convert the value previously.
 - Logs are now flushed on shutdown ([#4503](https://github.com/getsentry/sentry-java/pull/4503))
+- User Feedback: Do not redefine system attributes for `SentryUserFeedbackButton`, but reference them instead ([#4519](https://github.com/getsentry/sentry-java/pull/4519))
 
 ### Features
 
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 dc5ead7d6c..39fff9c716 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
@@ -12,6 +12,7 @@
 import io.sentry.IScopes;
 import io.sentry.Sentry;
 import io.sentry.SentryFeedbackOptions;
+import io.sentry.SentryIntegrationPackageStorage;
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
 import io.sentry.protocol.Feedback;
@@ -34,6 +35,7 @@ public final class SentryUserFeedbackDialog extends AlertDialog {
       final @Nullable OptionsConfiguration configuration) {
     super(context, themeResId);
     this.configuration = configuration;
+    SentryIntegrationPackageStorage.getInstance().addIntegration("UserFeedbackWidget");
   }
 
   @Override
diff --git a/sentry-android-core/src/main/res/values/attrs.xml b/sentry-android-core/src/main/res/values/attrs.xml
index c464cf29f0..efb5651d5d 100644
--- a/sentry-android-core/src/main/res/values/attrs.xml
+++ b/sentry-android-core/src/main/res/values/attrs.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+  <!-- We have to omit 'format' here as we're referencing the system attributes from the '@android:' namespace -->
   <declare-styleable name="SentryUserFeedbackButton" >
-    <attr name="android:drawableStart" format="reference" />
-    <attr name="android:drawablePadding" format="dimension" />
-    <attr name="android:padding" format="dimension" />
-    <attr name="android:textAllCaps" format="boolean" />
-    <attr name="android:background" format="reference|color" />
-    <attr name="android:textColor" format="reference|color" />
-    <attr name="android:text" format="string" />
+    <attr name="android:drawableStart" />
+    <attr name="android:drawablePadding" />
+    <attr name="android:padding" />
+    <attr name="android:textAllCaps" />
+    <attr name="android:background" />
+    <attr name="android:textColor" />
+    <attr name="android:text" />
   </declare-styleable>
 </resources>
diff --git a/sentry-android-integration-tests/sentry-uitest-android/src/main/res/values/values.xml b/sentry-android-integration-tests/sentry-uitest-android/src/main/res/values/values.xml
index 7763c15cd1..e19e9de745 100644
--- a/sentry-android-integration-tests/sentry-uitest-android/src/main/res/values/values.xml
+++ b/sentry-android-integration-tests/sentry-uitest-android/src/main/res/values/values.xml
@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
+  <!-- Just a dummy styleable to verify resource merging -->
+  <declare-styleable name="DummyStyle" >
+    <attr name="android:drawableStart" format="reference" />
+    <attr name="android:drawablePadding" format="dimension" />
+    <attr name="android:padding" format="dimension" />
+    <attr name="android:textAllCaps" format="boolean" />
+    <attr name="android:background" format="reference|color" />
+    <attr name="android:textColor" format="reference|color" />
+    <attr name="android:text" format="string" />
+  </declare-styleable>
+
   <bool tools:ignore="UnusedResources" name="leak_canary_allow_in_non_debuggable_build">true</bool>
 </resources>

<!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/4519.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/4519.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/4519.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/4519.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>