diff --git a/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java b/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java
index 236aa2ec3..be7c144fc 100644
--- a/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java
+++ b/app/src/main/java/com/keylesspalace/tusky/view/FlowLayout.java
@@ -64,16 +64,17 @@ public class FlowLayout extends ViewGroup {
             if (child.getVisibility() != GONE) {
                 int widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST);
                 child.measure(widthSpec, childHeightMeasureSpec);
-                int childwidth = child.getMeasuredWidth();
+                child.getLayoutParams();
+                int childWidth = child.getMeasuredWidth();
                 int childHeight = child.getMeasuredHeight();
-                if (x + childwidth > width) {
+                if (x + childWidth > width) {
                     x = getPaddingLeft();
                     y += rowHeight;
                     rowHeight = childHeight + paddingVertical;
                 } else {
                     rowHeight = Math.max(rowHeight, childHeight + paddingVertical);
                 }
-                x += childwidth + paddingHorizontal;
+                x += childWidth + paddingHorizontal;
             }
         }
         if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.UNSPECIFIED) {
diff --git a/app/src/main/res/drawable/ic_play_48dp.xml b/app/src/main/res/drawable/ic_play_48dp.xml
index fd6fee0ca..a0275bfa5 100644
--- a/app/src/main/res/drawable/ic_play_48dp.xml
+++ b/app/src/main/res/drawable/ic_play_48dp.xml
@@ -3,6 +3,7 @@
     android:height="48dp"
     android:width="48dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:autoMirrored="true">
     <path android:fillColor="#FFF" android:pathData="M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M10,16.5L16,12L10,7.5V16.5Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_reply_24dp.xml b/app/src/main/res/drawable/ic_reply_24dp.xml
index 5fcea57d0..c9602ca5a 100644
--- a/app/src/main/res/drawable/ic_reply_24dp.xml
+++ b/app/src/main/res/drawable/ic_reply_24dp.xml
@@ -2,7 +2,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:autoMirrored="true">
     <path
         android:fillColor="@color/toolbar_icon_dark"
         android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
diff --git a/app/src/main/res/drawable/ic_send_24dp.xml b/app/src/main/res/drawable/ic_send_24dp.xml
index c98a573e3..b5704ce0a 100644
--- a/app/src/main/res/drawable/ic_send_24dp.xml
+++ b/app/src/main/res/drawable/ic_send_24dp.xml
@@ -2,7 +2,8 @@
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:autoMirrored="true">
     <path
         android:fillColor="@color/toolbar_icon_dark"
         android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
diff --git a/app/src/main/res/layout/item_follow.xml b/app/src/main/res/layout/item_follow.xml
index 7347012f8..cceb601b6 100644
--- a/app/src/main/res/layout/item_follow.xml
+++ b/app/src/main/res/layout/item_follow.xml
@@ -31,7 +31,7 @@
 
         <TextView
             android:id="@+id/notification_text"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="?android:textColorTertiary"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 183d3fec4..94767ef68 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -68,6 +68,8 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
+            android:layout_marginStart="4dp"
+            android:layout_marginLeft="4dp"
             android:text="20m"
             android:textColor="?android:textColorSecondary" />
 
@@ -117,6 +119,7 @@
         android:layout_toEndOf="@+id/status_avatar"
         android:layout_below="@+id/status_name_bar"
         android:layout_marginBottom="4dp"
+        app:paddingHorizontal="4dp"
         android:focusable="true">
 
         <TextView
@@ -124,11 +127,7 @@
             android:layout_height="wrap_content"
             android:id="@+id/status_content_warning_description"
             android:text="Hello world"
-            android:textColor="?android:textColorPrimary"
-            android:paddingStart="0dp"
-            android:paddingLeft="0dp"
-            android:paddingEnd="8dp"
-            android:paddingRight="8dp" />
+            android:textColor="?android:textColorPrimary" />
 
         <ToggleButton
             android:layout_width="wrap_content"