diff --git a/app/src/main/res/layout/episode_filter_dialog.xml b/app/src/main/res/layout/episode_filter_dialog.xml
index 43d074bfb..9661a8e72 100644
--- a/app/src/main/res/layout/episode_filter_dialog.xml
+++ b/app/src/main/res/layout/episode_filter_dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -7,7 +8,7 @@
 
     <RadioGroup
         android:id="@+id/radio_filter_group"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
@@ -22,19 +23,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/episode_filters_exclude" />
+
     </RadioGroup>
 
     <EditText
         android:id="@+id/etxtEpisodeFilterText"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:lines="8"
-        android:minLines="1"
-        android:maxLines="20"
-        android:scrollbars="vertical"
-        android:hint="@string/episode_filters_hint"
+        android:cursorVisible="true"
         android:focusable="true"
         android:focusableInTouchMode="true"
-        android:cursorVisible="true" />
+        android:hint="@string/episode_filters_hint"
+        android:lines="8"
+        android:maxLines="20"
+        android:minLines="1"
+        android:scrollbars="vertical" />
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml
index 7fa738f12..ec918fdac 100644
--- a/app/src/main/res/layout/subscription_item.xml
+++ b/app/src/main/res/layout/subscription_item.xml
@@ -2,32 +2,32 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:squareImageView="http://schemas.android.com/apk/de.danoeh.antennapod"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:foreground="?attr/selectableItemBackground">
 
     <de.danoeh.antennapod.ui.common.SquareImageView
         android:id="@+id/imgvCover"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:scaleType="fitCenter"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:background="@color/non_square_icon_background"
-        tools:src="@mipmap/ic_launcher_round"
-        squareImageView:direction="width"/>
+        android:scaleType="fitCenter"
+        squareImageView:direction="width"
+        tools:src="@mipmap/ic_launcher_round" />
 
     <com.joanzapata.iconify.widget.IconTextView
         android:id="@+id/txtvTitle"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/non_square_icon_background"
-        android:layout_alignLeft="@+id/imgvCover"
-        android:layout_alignRight="@+id/imgvCover"
         android:layout_alignStart="@+id/imgvCover"
-        android:layout_alignEnd="@+id/imgvCover"
+        android:layout_alignLeft="@+id/imgvCover"
         android:layout_alignTop="@+id/imgvCover"
+        android:layout_alignEnd="@+id/imgvCover"
+        android:layout_alignRight="@+id/imgvCover"
         android:layout_alignBottom="@+id/imgvCover"
+        android:background="@color/non_square_icon_background"
         android:ellipsize="end"
         android:gravity="center"
         android:textColor="?android:attr/textColorPrimary"
@@ -37,12 +37,13 @@
         android:id="@+id/triangleCountView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         app:backgroundColor="?attr/colorSecondary"
         app:corner="rightTop"
         app:primaryText="Test"
         app:primaryTextColor="?attr/colorOnSecondary"
         app:primaryTextSize="12sp" />
+
 </RelativeLayout>