diff --git a/app/src/main/res/layout/popup_dm.xml b/app/src/main/res/layout/popup_dm.xml
index afa2e335..1b071814 100644
--- a/app/src/main/res/layout/popup_dm.xml
+++ b/app/src/main/res/layout/popup_dm.xml
@@ -1,9 +1,9 @@
 <?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/PopupCardView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    style="@style/PopupCardView"
     android:layout_gravity="center">
 
     <LinearLayout
diff --git a/app/src/main/res/layout/popup_tweet.xml b/app/src/main/res/layout/popup_tweet.xml
index d69daa12..b6fbe9ff 100644
--- a/app/src/main/res/layout/popup_tweet.xml
+++ b/app/src/main/res/layout/popup_tweet.xml
@@ -4,9 +4,7 @@
     style="@style/PopupCardView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    app:cardPreventCornerOverlap="true"
-    app:cardUseCompatPadding="true">
+    android:layout_gravity="center">
 
     <LinearLayout
         android:id="@+id/tweet_popup"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 56860647..c3a2cf32 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -27,14 +27,15 @@
     </style>
 
     <style name="CardViewStyle" parent="CardView">
-        <item name="cardPreventCornerOverlap">false</item>
         <item name="cardBackgroundColor">@color/half_transparent</item>
-        <item name="cardCornerRadius">5dp</item>
+        <item name="cardPreventCornerOverlap">false</item>
         <item name="cardUseCompatPadding">true</item>
+        <item name="cardCornerRadius">5dp</item>
     </style>
 
     <style name="PopupCardView" parent="CardView">
         <item name="cardPreventCornerOverlap">false</item>
+        <item name="cardUseCompatPadding">true</item>
         <item name="cardCornerRadius">10dp</item>
     </style>
 </resources>
\ No newline at end of file