diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index b163fde37..9e57e0743 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -73,7 +73,7 @@
             <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="8dp"
+                    android:padding="16dp"
                     android:orientation="vertical">
 
                 <TextView
@@ -83,6 +83,8 @@
                         android:text="@string/txtvfeedurl_label"
                         android:textSize="18sp"
                         android:layout_marginBottom="8dp"
+                        android:layout_marginLeft="4dp"
+                        android:layout_marginStart="4dp"
                         android:textColor="?android:attr/textColorPrimary"/>
 
                 <EditText
@@ -97,8 +99,10 @@
 
                 <Button
                         android:id="@+id/butConfirm"
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        style="?android:attr/buttonBarButtonStyle"
                         android:text="@string/confirm_label"/>
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml
index 561eadf45..75a35a130 100644
--- a/app/src/main/res/layout/quick_feed_discovery.xml
+++ b/app/src/main/res/layout/quick_feed_discovery.xml
@@ -10,35 +10,32 @@
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="8dp"
+            android:padding="16dp"
             android:orientation="vertical">
 
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content"
-                      android:orientation="horizontal">
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
             <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="0dip"
                     android:layout_height="wrap_content"
                     android:text="@string/discover"
                     android:textSize="18sp"
                     android:layout_marginBottom="8dp"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="4dp"
+                    android:layout_marginStart="4dp"
                     android:textColor="?android:attr/textColorPrimary"/>
 
-            <TextView
-                    android:layout_width="0dp"
+            <Button
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:minHeight="0dp"
+                    android:minWidth="0dp"
                     android:text="@string/discover_more"
-                    android:gravity="end"
-                    android:textAlignment="viewEnd"
-                    android:textSize="18sp"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:layout_marginBottom="8dp"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
-                    android:layout_weight="1"
                     android:id="@+id/discover_more"
-                    android:textColor="@color/antennapod_blue"/>
+                    style="?android:attr/buttonBarButtonStyle"/>
         </LinearLayout>
 
         <RelativeLayout