Merge remote-tracking branch 'antennapod/develop' into per_feed_playbackspeed

41 files changed, 342 insertions, 310 deletions

diff --git a/app/src/main/res/anim/card_flip_left_in.xml b/app/src/main/res/anim/card_flip_left_in.xml
new file mode 100644
index 000000000..0ffc85aec
--- /dev/null
+++ b/app/src/main/res/anim/card_flip_left_in.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Before rotating, immediately set the alpha to 0. -->
+    <objectAnimator
+            android:valueFrom="1.0"
+            android:valueTo="0.0"
+            android:propertyName="alpha"
+            android:duration="0" />
+
+    <!-- Rotate. -->
+    <objectAnimator
+            android:valueFrom="-180"
+            android:valueTo="0"
+            android:propertyName="rotationY"
+            android:interpolator="@android:interpolator/accelerate_decelerate"
+            android:duration="@integer/card_flip_time_full" />
+
+    <!-- Half-way through the rotation (see startOffset), set the alpha to 1. -->
+    <objectAnimator
+            android:valueFrom="0.0"
+            android:valueTo="1.0"
+            android:propertyName="alpha"
+            android:startOffset="@integer/card_flip_time_half"
+            android:duration="1" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/card_flip_left_out.xml b/app/src/main/res/anim/card_flip_left_out.xml
new file mode 100644
index 000000000..817f0d3fc
--- /dev/null
+++ b/app/src/main/res/anim/card_flip_left_out.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Rotate. -->
+    <objectAnimator
+            android:valueFrom="0"
+            android:valueTo="180"
+            android:propertyName="rotationY"
+            android:interpolator="@android:interpolator/accelerate_decelerate"
+            android:duration="@integer/card_flip_time_full" />
+
+    <!-- Half-way through the rotation (see startOffset), set the alpha to 0. -->
+    <objectAnimator
+            android:valueFrom="1.0"
+            android:valueTo="0.0"
+            android:propertyName="alpha"
+            android:startOffset="@integer/card_flip_time_half"
+            android:duration="1" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/card_flip_right_in.xml b/app/src/main/res/anim/card_flip_right_in.xml
new file mode 100644
index 000000000..31ff1dde5
--- /dev/null
+++ b/app/src/main/res/anim/card_flip_right_in.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Before rotating, immediately set the alpha to 0. -->
+    <objectAnimator
+            android:valueFrom="1.0"
+            android:valueTo="0.0"
+            android:propertyName="alpha"
+            android:duration="0" />
+
+    <!-- Rotate. -->
+    <objectAnimator
+            android:valueFrom="180"
+            android:valueTo="0"
+            android:propertyName="rotationY"
+            android:interpolator="@android:interpolator/accelerate_decelerate"
+            android:duration="@integer/card_flip_time_full" />
+
+    <!-- Half-way through the rotation (see startOffset), set the alpha to 1. -->
+    <objectAnimator
+            android:valueFrom="0.0"
+            android:valueTo="1.0"
+            android:propertyName="alpha"
+            android:startOffset="@integer/card_flip_time_half"
+            android:duration="1" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/card_flip_right_out.xml b/app/src/main/res/anim/card_flip_right_out.xml
new file mode 100644
index 000000000..b57113fea
--- /dev/null
+++ b/app/src/main/res/anim/card_flip_right_out.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Rotate. -->
+    <objectAnimator
+            android:valueFrom="0"
+            android:valueTo="-180"
+            android:propertyName="rotationY"
+            android:interpolator="@android:interpolator/accelerate_decelerate"
+            android:duration="@integer/card_flip_time_full" />
+
+    <!-- Half-way through the rotation (see startOffset), set the alpha to 0. -->
+    <objectAnimator
+            android:valueFrom="1.0"
+            android:valueTo="0.0"
+            android:propertyName="alpha"
+            android:startOffset="@integer/card_flip_time_half"
+            android:duration="1" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index a7f7d9f12..99fa1c3f9 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -13,7 +13,7 @@
             android:focusableInTouchMode="true"
             android:padding="8dp">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="4dp"
@@ -53,7 +53,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
         <fragment
                 android:id="@+id/quickFeedDiscovery"
@@ -62,7 +62,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="8dp"/>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="4dp"
@@ -102,9 +102,9 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:cardCornerRadius="4dp"
@@ -170,7 +170,7 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml
index 53636c2b6..9160998ac 100644
--- a/app/src/main/res/layout/all_episodes_fragment.xml
+++ b/app/src/main/res/layout/all_episodes_fragment.xml
@@ -17,7 +17,7 @@
         android:visibility="gone"
         tools:text="(i) Information" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/bug_report.xml b/app/src/main/res/layout/bug_report.xml
new file mode 100644
index 000000000..e97e85265
--- /dev/null
+++ b/app/src/main/res/layout/bug_report.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:padding="16dp">
+    <Button
+            android:id="@+id/btn_open_bug_tracker"
+            android:text="@string/open_bug_tracker"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    <Button
+            android:id="@+id/btn_copy_log"
+            android:text="@string/copy_to_clipboard"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    <TextView
+            android:layout_marginTop="8dp"
+            android:id="@+id/crash_report_logs"
+            android:textIsSelectable="true"
+            android:textSize="12sp"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/checkbox_do_not_show_again.xml b/app/src/main/res/layout/checkbox_do_not_show_again.xml
new file mode 100644
index 000000000..15f26e8b4
--- /dev/null
+++ b/app/src/main/res/layout/checkbox_do_not_show_again.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:paddingLeft="16dp"
+              android:paddingRight="16dp"
+              android:paddingTop="8dp"
+              android:paddingBottom="8dp">
+
+    <CheckBox
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/checkbox_do_not_show_again"
+            android:text="@string/checkbox_do_not_show_again"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/choose_data_folder_dialog_entry.xml b/app/src/main/res/layout/choose_data_folder_dialog_entry.xml
index 9a216b36b..f4a2ff703 100644
--- a/app/src/main/res/layout/choose_data_folder_dialog_entry.xml
+++ b/app/src/main/res/layout/choose_data_folder_dialog_entry.xml
@@ -5,7 +5,7 @@
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/diag_content_side_padding"
+    android:layout_margin="16dp"
     android:background="?attr/selectableItemBackground">
 
     <RadioButton
diff --git a/app/src/main/res/layout/downloaded_episodeslist_item.xml b/app/src/main/res/layout/downloaded_episodeslist_item.xml
index 65a08251f..3f8065466 100644
--- a/app/src/main/res/layout/downloaded_episodeslist_item.xml
+++ b/app/src/main/res/layout/downloaded_episodeslist_item.xml
@@ -17,7 +17,7 @@
         android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"
         android:contentDescription="@string/cover_label"
         android:scaleType="centerCrop"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
 
diff --git a/app/src/main/res/layout/feedinfo.xml b/app/src/main/res/layout/feedinfo.xml
index 50061c4d8..416fc3aec 100644
--- a/app/src/main/res/layout/feedinfo.xml
+++ b/app/src/main/res/layout/feedinfo.xml
@@ -24,7 +24,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <android.support.v7.widget.GridLayout
+            <androidx.gridlayout.widget.GridLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -107,7 +107,7 @@
                     tools:text="http://www.example.com/feed"
                     tools:background="@android:color/holo_green_dark"/>
 
-            </android.support.v7.widget.GridLayout>
+            </androidx.gridlayout.widget.GridLayout>
 
             <TextView
                 style="@style/AntennaPod.TextView.Heading"
diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml
index 78c0b3b16..b047b3da0 100644
--- a/app/src/main/res/layout/feeditem_fragment.xml
+++ b/app/src/main/res/layout/feeditem_fragment.xml
@@ -36,7 +36,8 @@
                 android:layout_marginBottom="16dp"
                 android:contentDescription="@string/cover_label"
                 android:gravity="center_vertical"
-                tools:src="@drawable/ic_stat_antenna_default"
+                android:foreground="?attr/selectableItemBackground"
+                tools:src="@drawable/ic_antenna"
                 tools:background="@android:color/holo_green_dark" />
 
             <TextView
@@ -47,6 +48,7 @@
                 android:layout_alignTop="@id/imgvCover"
                 android:layout_toRightOf="@id/imgvCover"
                 android:layout_toEndOf="@id/imgvCover"
+                android:foreground="?attr/selectableItemBackground"
                 tools:text="Podcast title"
                 tools:background="@android:color/holo_green_dark" />
 
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index ba39307b0..596135d88 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -27,7 +27,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:contentDescription="@string/cover_label"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <ImageButton
@@ -37,11 +37,9 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        android:layout_marginLeft="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/show_info_label"
         android:src="@drawable/ic_info_white_24dp"
@@ -57,8 +55,6 @@
         tools:background="@android:color/holo_green_dark"
         android:layout_below="@+id/butShowInfo"
         android:layout_marginBottom="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginEnd="16dp"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"/>
 
@@ -92,8 +88,8 @@
         android:layout_marginBottom="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginStart="16dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_toLeftOf="@id/butShowSettings"
         android:layout_toStartOf="@id/butShowSettings"
         android:layout_toRightOf="@id/imgvCover"
diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
index 27a8bbdca..6e02fa090 100644
--- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml
@@ -23,7 +23,7 @@
         android:contentDescription="@string/cover_label"
         android:cropToPadding="true"
         android:scaleType="fitXY"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml
index 4848563b1..b2411c5df 100644
--- a/app/src/main/res/layout/itunes_podcast_listitem.xml
+++ b/app/src/main/res/layout/itunes_podcast_listitem.xml
@@ -25,7 +25,7 @@
         android:cropToPadding="true"
         android:scaleType="fitXY"
         tools:background="@android:color/holo_green_dark"
-        tools:src="@drawable/ic_stat_antenna_default" />
+        tools:src="@drawable/ic_antenna" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 6cabcdff2..a226e482f 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/drawer_layout"
@@ -19,7 +19,7 @@
             tools:layout_height="64dp"
             tools:background="@android:color/holo_green_light" />
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -48,4 +48,4 @@
 
     <include layout="@layout/nav_list" />
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/mediaplayerinfo_activity.xml b/app/src/main/res/layout/mediaplayerinfo_activity.xml
index a6427e985..b759b0092 100644
--- a/app/src/main/res/layout/mediaplayerinfo_activity.xml
+++ b/app/src/main/res/layout/mediaplayerinfo_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -12,12 +12,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
                 app:strokeColor="?android:attr/textColorSecondary"
                 app:radius="4dp" />
 
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
         <LinearLayout
             xmlns:android="http://schemas.android.com/apk/res/android"
@@ -155,11 +155,11 @@
                     android:layout_marginTop="-8dp"
                     android:gravity="center"
                     android:text="30"
-                    android:textSize="10sp"
+                    android:textSize="12sp"
                     android:textColor="?android:attr/textColorSecondary"
                     android:clickable="false"/>
 
-                <Button
+                <ImageButton
                     android:id="@+id/butPlaybackSpeed"
                     android:layout_width="@dimen/audioplayer_playercontrols_length"
                     android:layout_height="@dimen/audioplayer_playercontrols_length"
@@ -167,13 +167,28 @@
                     android:layout_toStartOf="@id/butRev"
                     android:background="?attr/selectableItemBackground"
                     android:contentDescription="@string/set_playback_speed_label"
-                    android:src="?attr/av_fast_forward"
-                    android:textSize="@dimen/text_size_medium"
-                    android:textAllCaps="false"
-                    android:maxLines="1"
+                    android:src="?attr/av_speed"
+                    android:scaleType="fitCenter"
+                    tools:src="@drawable/ic_playback_speed_white"
                     tools:visibility="gone"
                     tools:background="@android:color/holo_green_dark" />
 
+                <TextView
+                    android:id="@+id/txtvPlaybackSpeed"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/butPlaybackSpeed"
+                    android:layout_alignLeft="@id/butPlaybackSpeed"
+                    android:layout_alignStart="@id/butPlaybackSpeed"
+                    android:layout_alignRight="@id/butPlaybackSpeed"
+                    android:layout_alignEnd="@id/butPlaybackSpeed"
+                    android:layout_marginTop="-8dp"
+                    android:gravity="center"
+                    android:text="1.00"
+                    android:textSize="12sp"
+                    android:textColor="?android:attr/textColorSecondary"
+                    android:clickable="false"/>
+
                 <ImageButton
                     android:id="@+id/butCastDisconnect"
                     android:layout_width="@dimen/audioplayer_playercontrols_length"
@@ -216,7 +231,7 @@
                     android:layout_marginTop="-8dp"
                     android:gravity="center"
                     android:text="30"
-                    android:textSize="10sp"
+                    android:textSize="12sp"
                     android:textColor="?android:attr/textColorSecondary"
                     android:clickable="false"/>
 
@@ -236,7 +251,7 @@
 
         </LinearLayout>
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/pager"
             android:layout_width="match_parent"
@@ -257,4 +272,4 @@
 
     <include layout="@layout/nav_list" />
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index 816870d1c..52833b3cd 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
@@ -25,7 +25,7 @@
         android:scaleType="centerCrop"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="4dp"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <TextView
diff --git a/app/src/main/res/layout/pager_fragment.xml b/app/src/main/res/layout/pager_fragment.xml
index 54b711b1c..492743239 100644
--- a/app/src/main/res/layout/pager_fragment.xml
+++ b/app/src/main/res/layout/pager_fragment.xml
@@ -7,14 +7,14 @@
     android:orientation="vertical">
 
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/sliding_tabs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:tabGravity="fill"
         app:tabMode="fixed" />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="0px"
diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml
index 85b0df58c..63da6a315 100644
--- a/app/src/main/res/layout/queue_fragment.xml
+++ b/app/src/main/res/layout/queue_fragment.xml
@@ -20,7 +20,7 @@
         android:layout_below="@id/info_bar"
         android:background="?android:attr/listDivider"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml
index 6b41b68d5..1dcc34bce 100644
--- a/app/src/main/res/layout/queue_listitem.xml
+++ b/app/src/main/res/layout/queue_listitem.xml
@@ -51,7 +51,7 @@
             android:layout_height="@dimen/thumbnail_length_queue_item"
             android:layout_centerVertical="true"
             android:contentDescription="@string/cover_label"
-            tools:src="@drawable/ic_stat_antenna_default"
+            tools:src="@drawable/ic_antenna"
             tools:background="@android:color/holo_green_dark"/>
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml
index ce5cfa65b..e791d19d7 100644
--- a/app/src/main/res/layout/quick_feed_discovery.xml
+++ b/app/src/main/res/layout/quick_feed_discovery.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
@@ -79,5 +79,5 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
 
diff --git a/app/src/main/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml
index 50374c737..4a055fea9 100644
--- a/app/src/main/res/layout/searchlist_item.xml
+++ b/app/src/main/res/layout/searchlist_item.xml
@@ -18,7 +18,7 @@
         android:layout_marginStart="@dimen/listitem_threeline_horizontalpadding"
         android:contentDescription="@string/cover_label"
         android:scaleType="centerCrop"
-        tools:src="@drawable/ic_stat_antenna_default"
+        tools:src="@drawable/ic_antenna"
         tools:background="@android:color/holo_green_dark"/>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/statistics_activity.xml b/app/src/main/res/layout/statistics_activity.xml
index 4a72dc7de..9d9cad438 100644
--- a/app/src/main/res/layout/statistics_activity.xml
+++ b/app/src/main/res/layout/statistics_activity.xml
@@ -1,41 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/total_time_listened_to_podcasts"
-        android:gravity="center_horizontal"/>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/progressBar"
-        android:layout_gravity="center_horizontal"
-        style="?android:attr/progressBarStyleLarge"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/total_time"
-        android:gravity="center_horizontal"
-        android:textSize="45sp"/>
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/progressBar"
+            android:layout_gravity="center"/>
 
-    <ListView
-        android:id="@+id/statistics_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:choiceMode="singleChoice"
-        android:clipToPadding="false"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="0dp"
-        android:paddingBottom="@dimen/list_vertical_padding"
-        android:paddingTop="@dimen/list_vertical_padding"
-        android:scrollbarStyle="outsideOverlay" />
+    <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/statistics_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:paddingBottom="@dimen/list_vertical_padding"
+            android:paddingTop="@dimen/list_vertical_padding"
+            android:scrollbarStyle="outsideOverlay"
+            tools:listitem="@layout/statistics_listitem"/>
 
-</LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml
index b186add9e..6bd2a907e 100644
--- a/app/src/main/res/layout/statistics_listitem.xml
+++ b/app/src/main/res/layout/statistics_listitem.xml
@@ -3,63 +3,55 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/listitem_iconwithtext_height"
-                android:paddingLeft="@dimen/listitem_threeline_verticalpadding"
-                android:paddingStart="@dimen/listitem_threeline_verticalpadding"
-                android:paddingRight="@dimen/listitem_threeline_verticalpadding"
-                android:paddingEnd="@dimen/listitem_threeline_verticalpadding"
-                tools:background="@android:color/darker_gray">
+                android:layout_height="wrap_content"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
+                android:background="?android:attr/selectableItemBackground">
 
     <ImageView
-        android:id="@+id/imgvCover"
-        android:contentDescription="@string/cover_label"
-        android:layout_width="@dimen/thumbnail_length_navlist"
-        android:layout_height="@dimen/thumbnail_length_navlist"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:adjustViewBounds="true"
-        android:cropToPadding="true"
-        android:scaleType="centerCrop"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
-        tools:src="@drawable/ic_stat_antenna_default"
-        tools:background="@android:color/holo_green_dark"/>
+            android:id="@+id/imgvCover"
+            android:contentDescription="@string/cover_label"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:adjustViewBounds="true"
+            android:cropToPadding="true"
+            android:scaleType="centerCrop"
+            tools:src="@drawable/ic_antenna"
+            tools:background="@android:color/holo_green_dark"/>
 
     <TextView
-        android:id="@+id/txtvTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/list_vertical_padding"
-        android:layout_marginStart="@dimen/list_vertical_padding"
-        android:lines="1"
-        android:textColor="?android:attr/textColorTertiary"
-        android:textSize="@dimen/text_size_navdrawer"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        tools:text="23"
-        tools:background="@android:color/holo_green_dark"/>
+            android:id="@+id/txtvTitle"
+            android:lines="1"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textSize="16sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_toRightOf="@id/imgvCover"
+            android:layout_alignTop="@id/imgvCover"
+            android:layout_alignWithParentIfMissing="true"
+            tools:text="Feed title"/>
 
     <TextView
-        android:id="@+id/txtvTitle"
-        android:lines="1"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:layout_centerVertical="true"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="@dimen/text_size_navdrawer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_marginStart="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_toRightOf="@id/imgvCover"
-        android:layout_toEndOf="@id/imgvCover"
-        android:layout_toLeftOf="@id/txtvTime"
-        android:layout_toStartOf="@id/txtvTime"
-        android:layout_alignWithParentIfMissing="true"
-        tools:text="Navigation feed item title"
-        tools:background="@android:color/holo_green_dark"/>
-
+            android:id="@+id/txtvTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:textColor="?android:attr/textColorTertiary"
+            android:textSize="14sp"
+            android:layout_toEndOf="@+id/imgvCover"
+            android:layout_toRightOf="@+id/imgvCover"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_below="@+id/txtvTitle"
+            tools:text="23 hours"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/statistics_listitem_total_time.xml b/app/src/main/res/layout/statistics_listitem_total_time.xml
new file mode 100644
index 000000000..2e0ae54d6
--- /dev/null
+++ b/app/src/main/res/layout/statistics_listitem_total_time.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="16dp">
+
+    <de.danoeh.antennapod.view.PieChartView
+            android:id="@+id/pie_chart"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/total_time_description"
+            android:textSize="14sp"
+            android:text="@string/total_time_listened_to_podcasts"
+            android:gravity="center_horizontal"
+            android:layout_above="@+id/total_time"/>
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/total_time"
+            android:textColor="?android:attr/textColorPrimary"
+            android:gravity="center_horizontal"
+            android:textSize="28sp"
+            android:layout_marginBottom="16dp"
+            android:layout_alignBottom="@id/pie_chart"
+            tools:text="10.0 hours"/>
+
+    <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="16dp"
+            android:background="?android:attr/dividerVertical"
+            android:layout_below="@+id/pie_chart"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/allepisodes_context.xml b/app/src/main/res/menu/allepisodes_context.xml
deleted file mode 100644
index 907bc9334..000000000
--- a/app/src/main/res/menu/allepisodes_context.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@id/skip_episode_item"
-        android:menuCategory="container"
-        android:title="@string/skip_episode_label" />
-
-
-    <item
-        android:id="@+id/remove_new_flag_item"
-        android:menuCategory="container"
-        android:title="@string/remove_new_flag_label" />
-
-    <item
-        android:id="@+id/mark_read_item"
-        android:menuCategory="container"
-        android:title="@string/mark_read_label" />
-    <item
-        android:id="@+id/mark_unread_item"
-        android:menuCategory="container"
-        android:title="@string/mark_unread_label" />
-
-    <item
-        android:id="@+id/add_to_queue_item"
-        android:menuCategory="container"
-        android:title="@string/add_to_queue_label" />
-    <item
-        android:id="@+id/remove_from_queue_item"
-        android:menuCategory="container"
-        android:title="@string/remove_from_queue_label" />
-    <item
-        android:id="@+id/add_to_favorites_item"
-        android:menuCategory="container"
-        android:title="@string/add_to_favorite_label" />
-    <item
-        android:id="@+id/remove_from_favorites_item"
-        android:menuCategory="container"
-        android:title="@string/remove_from_favorite_label" />
-    <item
-        android:id="@+id/reset_position"
-        android:menuCategory="container"
-        android:title="@string/reset_position" />
-
-    <item
-        android:id="@+id/activate_auto_download"
-        android:menuCategory="container"
-        android:title="@string/activate_auto_download" />
-    <item
-        android:id="@+id/deactivate_auto_download"
-        android:menuCategory="container"
-        android:title="@string/deactivate_auto_download" />
-
-    <item
-        android:id="@+id/visit_website_item"
-        android:menuCategory="container"
-        android:title="@string/visit_website_label" />
-    <item
-        android:id="@+id/share_item"
-        android:menuCategory="container"
-        android:title="@string/share_label">
-        <menu>
-            <item
-                android:id="@+id/share_link_item"
-                android:menuCategory="container"
-                android:title="@string/share_link_label" />
-            <item
-                android:id="@+id/share_link_with_position_item"
-                android:menuCategory="container"
-                android:title="@string/share_link_with_position_label" />
-            <item
-                android:id="@+id/share_download_url_item"
-                android:menuCategory="container"
-                android:title="@string/share_item_url_label" />
-            <item
-                android:id="@+id/share_download_url_with_position_item"
-                android:menuCategory="container"
-                android:title="@string/share_item_url_with_position_label" />
-            <item
-                android:id="@+id/share_file"
-                android:menuCategory="container"
-                android:title="@string/share_file_label" />
-        </menu>
-    </item>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/episodes.xml b/app/src/main/res/menu/episodes.xml
index 1e1aa8f56..7398754e5 100644
--- a/app/src/main/res/menu/episodes.xml
+++ b/app/src/main/res/menu/episodes.xml
@@ -7,7 +7,7 @@
         android:id="@+id/action_search"
         android:icon="?attr/action_search"
         custom:showAsAction="collapseActionView|ifRoom"
-        custom:actionViewClass="android.support.v7.widget.SearchView"
+        custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
 
     <item
diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml
index 300068007..f20d679a5 100644
--- a/app/src/main/res/menu/feedinfo.xml
+++ b/app/src/main/res/menu/feedinfo.xml
@@ -11,7 +11,7 @@
     <item
         android:id="@+id/share_link_item"
         custom:showAsAction="collapseActionView"
-        android:title="@string/share_link_label">
+        android:title="@string/share_website_url_label">
     </item>
     <item
         android:id="@+id/share_download_url_item"
diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml
index 0801b79a1..e415ff85a 100644
--- a/app/src/main/res/menu/feeditem_options.xml
+++ b/app/src/main/res/menu/feeditem_options.xml
@@ -9,6 +9,11 @@
     </item>
 
     <item
+        android:id="@+id/remove_new_flag_item"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/remove_new_flag_label" />
+
+    <item
         android:id="@+id/mark_read_item"
         custom:showAsAction="collapseActionView"
         android:title="@string/mark_read_label">
diff --git a/app/src/main/res/menu/feeditemlist_context.xml b/app/src/main/res/menu/feeditemlist_context.xml
index df13cb027..6e4966206 100644
--- a/app/src/main/res/menu/feeditemlist_context.xml
+++ b/app/src/main/res/menu/feeditemlist_context.xml
@@ -8,6 +8,11 @@
         android:title="@string/skip_episode_label" />
 
     <item
+        android:id="@+id/remove_new_flag_item"
+        android:menuCategory="container"
+        android:title="@string/remove_new_flag_label" />
+
+    <item
         android:id="@+id/mark_read_item"
         android:menuCategory="container"
         android:title="@string/mark_read_label" />
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index 0cc8addfe..fdd0e01bc 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -34,7 +34,7 @@
         android:id="@+id/action_search"
         android:icon="?attr/action_search"
         custom:showAsAction="always|collapseActionView"
-        custom:actionViewClass="android.support.v7.widget.SearchView"
+        custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
 
     <item
@@ -49,7 +49,7 @@
         android:id="@+id/share_link_item"
         android:menuCategory="container"
         custom:showAsAction="collapseActionView"
-        android:title="@string/share_link_label">
+        android:title="@string/share_website_url_label">
     </item>
     <item
         android:id="@+id/share_download_url_item"
diff --git a/app/src/main/res/menu/gpodder_podcasts.xml b/app/src/main/res/menu/gpodder_podcasts.xml
index 88fa36a4a..93d93157a 100644
--- a/app/src/main/res/menu/gpodder_podcasts.xml
+++ b/app/src/main/res/menu/gpodder_podcasts.xml
@@ -7,7 +7,7 @@
         android:id="@+id/action_search"
         android:icon="?attr/action_search"
         custom:showAsAction="collapseActionView|ifRoom"
-        custom:actionViewClass="android.support.v7.widget.SearchView"
+        custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
 
 </menu>
diff --git a/app/src/main/res/menu/itunes_search.xml b/app/src/main/res/menu/itunes_search.xml
index 88fa36a4a..93d93157a 100644
--- a/app/src/main/res/menu/itunes_search.xml
+++ b/app/src/main/res/menu/itunes_search.xml
@@ -7,7 +7,7 @@
         android:id="@+id/action_search"
         android:icon="?attr/action_search"
         custom:showAsAction="collapseActionView|ifRoom"
-        custom:actionViewClass="android.support.v7.widget.SearchView"
+        custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
 
 </menu>
diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml
index 44d511ee4..055951760 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -35,6 +35,14 @@
     </item>
 
     <item
+        android:id="@+id/open_feed_item"
+        android:icon="?attr/feed"
+        custom:showAsAction="collapseActionView"
+        android:title="@string/open_podcast"
+        android:visible="false">
+    </item>
+
+    <item
         android:id="@+id/visit_website_item"
         android:icon="?attr/location_web_site"
         custom:showAsAction="collapseActionView"
diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
index a4e511eb8..b86ad5d63 100644
--- a/app/src/main/res/menu/queue.xml
+++ b/app/src/main/res/menu/queue.xml
@@ -20,7 +20,7 @@
         android:id="@+id/action_search"
         android:icon="?attr/action_search"
         custom:showAsAction="collapseActionView|ifRoom"
-        custom:actionViewClass="android.support.v7.widget.SearchView"
+        custom:actionViewClass="androidx.appcompat.widget.SearchView"
         android:title="@string/search_label"/>
 
     <item
diff --git a/app/src/main/res/menu/queue_context.xml b/app/src/main/res/menu/queue_context.xml
index e1c3e6216..522e712e2 100644
--- a/app/src/main/res/menu/queue_context.xml
+++ b/app/src/main/res/menu/queue_context.xml
@@ -11,77 +11,6 @@
         android:id="@+id/move_to_bottom_item"
         android:menuCategory="container"
         android:title="@string/move_to_bottom_label" />
+    <!-- rest of the menu items can be found in the generic feeditemlist_context.xml -->
 
-    <item
-        android:id="@+id/mark_read_item"
-        android:menuCategory="container"
-        android:title="@string/mark_read_label" />
-
-    <item
-        android:id="@+id/mark_unread_item"
-        android:menuCategory="container"
-        android:title="@string/mark_unread_label" />
-
-    <item
-        android:id="@+id/remove_from_queue_item"
-        android:menuCategory="container"
-        android:title="@string/remove_from_queue_label" />
-    <item
-        android:id="@+id/remove_item"
-        android:menuCategory="container"
-        android:title="@string/delete_label" />
-
-    <item
-        android:id="@+id/add_to_favorites_item"
-        android:menuCategory="container"
-        android:title="@string/add_to_favorite_label" />
-    <item
-        android:id="@+id/remove_from_favorites_item"
-        android:menuCategory="container"
-        android:title="@string/remove_from_favorite_label" />
-    <item
-        android:id="@+id/reset_position"
-        android:menuCategory="container"
-        android:title="@string/reset_position" />
-
-    <item
-        android:id="@+id/activate_auto_download"
-        android:menuCategory="container"
-        android:title="@string/activate_auto_download" />
-    <item
-        android:id="@+id/deactivate_auto_download"
-        android:menuCategory="container"
-        android:title="@string/deactivate_auto_download" />
-
-    <item
-        android:id="@+id/visit_website_item"
-        android:menuCategory="container"
-        android:title="@string/visit_website_label" />
-    <item
-        android:id="@+id/share_item"
-        android:menuCategory="container"
-        android:title="@string/share_label">
-        <menu>
-            <item
-                android:id="@+id/share_link_item"
-                android:menuCategory="container"
-                android:title="@string/share_link_label" />
-            <item
-                android:id="@+id/share_link_with_position_item"
-                android:menuCategory="container"
-                android:title="@string/share_link_with_position_label" />
-            <item
-                android:id="@+id/share_download_url_item"
-                android:menuCategory="container"
-                android:title="@string/share_item_url_label" />
-            <item
-                android:id="@+id/share_download_url_with_position_item"
-                android:menuCategory="container"
-                android:title="@string/share_item_url_with_position_label" />
-            <item
-                android:id="@+id/share_file"
-                android:menuCategory="container"
-                android:title="@string/share_file_label" />
-        </menu>
-    </item>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml
index f39e0ac97..1780592d5 100644
--- a/app/src/main/res/menu/subscriptions.xml
+++ b/app/src/main/res/menu/subscriptions.xml
@@ -3,6 +3,13 @@
       xmlns:custom="http://schemas.android.com/apk/res-auto">
 
     <item
+            android:id="@+id/refresh_item"
+            android:title="@string/refresh_label"
+            android:menuCategory="container"
+            custom:showAsAction="always"
+            android:icon="?attr/navigation_refresh"/>
+
+    <item
             android:id="@+id/subscription_num_columns"
             android:title="@string/subscription_num_columns"
             custom:showAsAction="never">
diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml
new file mode 100644
index 000000000..8c444ee8b
--- /dev/null
+++ b/app/src/main/res/values/integers.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer name="card_flip_time_full">400</integer>
+    <integer name="card_flip_time_half">200</integer>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6c1e470c0..37707ead6 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -43,16 +43,14 @@
         <Preference
             android:key="prefFaq"
             android:title="@string/pref_faq"
-            android:icon="?attr/ic_question_answer" />
-
+            android:icon="?attr/ic_questionmark" />
         <Preference
-            android:key="prefKnownIssues"
-            android:title="@string/pref_known_issues"
-            android:icon="?attr/ic_known_issues" />
+            android:key="prefViewMailingList"
+            android:title="@string/view_mailing_list"
+            android:icon="?attr/ic_chat" />
         <Preference
-            android:key="prefSendCrashReport"
-            android:title="@string/crash_report_title"
-            android:summary="@string/crash_report_sum"
+            android:key="prefSendBugReport"
+            android:title="@string/bug_report_title"
             android:icon="?attr/ic_bug" />
         <Preference
             android:key="prefAbout"
diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml
index 1d970a5f7..c48e9adc8 100644
--- a/app/src/main/res/xml/preferences_user_interface.xml
+++ b/app/src/main/res/xml/preferences_user_interface.xml
@@ -10,7 +10,7 @@
                 android:title="@string/pref_set_theme_title"
                 android:key="prefTheme"
                 android:summary="@string/pref_set_theme_sum"
-                android:defaultValue="0"
+                android:defaultValue="system"
                 app:useStockLayout="true"/>
         <Preference
                 android:key="prefHiddenDrawerItems"