diff --git a/app/build.gradle b/app/build.gradle
index 9632a599..d321539b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId 'org.nuclearfog.twidda'
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 32
-        versionName '1.8.8'
+        versionCode 33
+        versionName '1.8.9'
         // limiting language support for smaller APK size
         resConfigs 'en', 'de-rDE'
         vectorDrawables.useSupportLibrary true
@@ -29,7 +29,7 @@ android {
             versionNameSuffix '.DEBUG'
         }
     }
-    
+
     paranoid {
         enabled true
     }
diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
index 2b8b71c0..1985c3f6 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/TweetAdapter.java
@@ -222,6 +222,7 @@ public class TweetAdapter extends Adapter<ViewHolder> {
         if (viewType == VIEW_TWEET) {
             View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_tweet, parent, false);
             final TweetHolder vh = new TweetHolder(v);
+            vh.retweeterName.setCompoundDrawablesWithIntrinsicBounds(R.drawable.retweet, 0, 0, 0);
             AppStyles.setTheme(settings, v);
             v.setOnClickListener(new OnClickListener() {
                 @Override
diff --git a/app/src/main/res/layout/item_tweet.xml b/app/src/main/res/layout/item_tweet.xml
index 1b5d26ea..85aed7ac 100644
--- a/app/src/main/res/layout/item_tweet.xml
+++ b/app/src/main/res/layout/item_tweet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     style="@style/CardViewStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -98,8 +97,7 @@
                 android:layout_weight="1"
                 android:drawablePadding="@dimen/tweetitem_padding_drawable"
                 android:singleLine="true"
-                android:textSize="@dimen/tweetitem_textsize_button"
-                app:drawableStartCompat="@drawable/retweet" />
+                android:textSize="@dimen/tweetitem_textsize_button" />
 
             <TextView
                 android:id="@+id/retweet_number"
diff --git a/app/src/main/res/layout/page_tweet.xml b/app/src/main/res/layout/page_tweet.xml
index 51b0dbd1..49cc53a1 100644
--- a/app/src/main/res/layout/page_tweet.xml
+++ b/app/src/main/res/layout/page_tweet.xml
@@ -93,7 +93,7 @@
                         android:layout_height="@dimen/tweet_button_answer_height"
                         android:paddingLeft="@dimen/tweet_button_padding"
                         android:paddingRight="@dimen/tweet_button_padding"
-                        android:textSize="@dimen/tweet_textsize_api"
+                        android:textSize="@dimen/tweet_textsize_small"
                         android:visibility="gone"
                         style="@style/FeedbackButton" />
 
@@ -131,6 +131,7 @@
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:drawablePadding="@dimen/tweet_padding_drawable"
+                            android:textSize="@dimen/tweet_textsize_small"
                             android:visibility="gone" />
 
                         <TextView
@@ -143,7 +144,7 @@
                             android:paddingRight="@dimen/tweet_button_padding"
                             android:singleLine="true"
                             android:text="@string/tweet_sensitive_media"
-                            android:textSize="@dimen/tweet_textsize_api"
+                            android:textSize="@dimen/tweet_textsize_small"
                             android:visibility="gone" />
                     </LinearLayout>
 
@@ -181,7 +182,7 @@
                         android:layout_height="wrap_content"
                         android:linksClickable="false"
                         android:singleLine="true"
-                        android:textSize="@dimen/tweet_textsize_api" />
+                        android:textSize="@dimen/tweet_textsize_small" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 13679080..334b3168 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,7 +24,7 @@
     <!--dimens of page_tweet.xml-->
     <dimen name="tweet_toolbar_height">@dimen/toolbar_height</dimen>
     <dimen name="tweet_profile">56sp</dimen>
-    <dimen name="tweet_textsize_api">12sp</dimen>
+    <dimen name="tweet_textsize_small">12sp</dimen>
     <dimen name="tweet_media_button_margin">5dp</dimen>
     <dimen name="tweet_button_location">16dp</dimen>
     <dimen name="tweet_layout_margin">5dp</dimen>