diff --git a/library/ui-styles/src/main/res/values/styles_jump_to_unread.xml b/library/ui-styles/src/main/res/values/styles_jump_to_unread.xml
index d0561425ff..21f0ebd5d4 100644
--- a/library/ui-styles/src/main/res/values/styles_jump_to_unread.xml
+++ b/library/ui-styles/src/main/res/values/styles_jump_to_unread.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="jumpToUnreadStyle" format="reference" />
+    <attr name="vctr_jump_to_unread_style" format="reference" />
 
     <style name="Widget.Vector.JumpToUnread.Base" parent="Widget.MaterialComponents.Chip.Action">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 69f1b4d5cc..94306ff760 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -86,7 +86,6 @@
         <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
         <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
         <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
-        <item name="jumpToUnreadStyle">@style/Widget.Vector.JumpToUnread.Dark</item>
 
         <!-- Default theme -->
         <item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Dark</item>
@@ -133,6 +132,9 @@
         <item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark</item>
         <item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark</item>
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark</item>
+
+        <item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Dark</item>
+
     </style>
 
     <style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index db379028f3..b11fd97504 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -86,7 +86,6 @@
         <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
         <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
         <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
-        <item name="jumpToUnreadStyle">@style/Widget.Vector.JumpToUnread.Light</item>
 
         <!-- Default theme -->
         <item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Light</item>
@@ -135,6 +134,9 @@
         <item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light</item>
         <item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Light</item>
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light</item>
+
+        <item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Light</item>
+
     </style>
 
     <style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />
diff --git a/vector/src/main/res/drawable-hdpi/arrow_up_circle.png b/vector/src/main/res/drawable-hdpi/arrow_up_circle.png
deleted file mode 100755
index c7fba081c1..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/arrow_up_circle.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/arrow_up_circle.png b/vector/src/main/res/drawable-mdpi/arrow_up_circle.png
deleted file mode 100755
index aad94e9a4e..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/arrow_up_circle.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xhdpi/arrow_up_circle.png b/vector/src/main/res/drawable-xhdpi/arrow_up_circle.png
deleted file mode 100755
index 8973128ccc..0000000000
Binary files a/vector/src/main/res/drawable-xhdpi/arrow_up_circle.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/arrow_up_circle.png b/vector/src/main/res/drawable-xxhdpi/arrow_up_circle.png
deleted file mode 100755
index c13179d220..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/arrow_up_circle.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/arrow_up_circle.png b/vector/src/main/res/drawable-xxxhdpi/arrow_up_circle.png
deleted file mode 100755
index 61fd2b1e48..0000000000
Binary files a/vector/src/main/res/drawable-xxxhdpi/arrow_up_circle.png and /dev/null differ
diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index de0f95f583..59d1fbfb32 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -129,7 +129,7 @@
 
     <com.google.android.material.chip.Chip
         android:id="@+id/jumpToReadMarkerView"
-        style="?attr/jumpToUnreadStyle"
+        style="?vctr_jump_to_unread_style"
         app:chipIcon="@drawable/ic_jump_to_unread"
         app:closeIcon="@drawable/ic_close_24dp"
         android:layout_width="wrap_content"