3 files changed, 37 insertions, 7 deletions
diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml
index 89f900a1f..099216007 100644
--- a/app/src/main/res/layout/all_episodes_fragment.xml
+++ b/app/src/main/res/layout/all_episodes_fragment.xml
@@ -17,6 +17,10 @@
         tools:itemCount="13"
         tools:listitem="@layout/new_episodes_listitem" />
 
+    <include
+        android:id="@+id/emptyView"
+        layout="@layout/empty_view_layout"/>
+
     <ProgressBar
         android:id="@+id/progLoading"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/empty_view_layout.xml b/app/src/main/res/layout/empty_view_layout.xml
new file mode 100644
index 000000000..051773e51
--- /dev/null
+++ b/app/src/main/res/layout/empty_view_layout.xml
@@ -0,0 +1,30 @@
+<?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:gravity="center"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <TextView
+        android:id="@+id/emptyViewTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        tools:text="empty"
+        android:textSize="20sp"
+        android:textStyle="bold"
+        android:paddingBottom="10dp"/>
+
+    <TextView
+        android:id="@+id/emptyViewMessage"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="15sp"
+        tools:text="empty"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp"
+        android:textAlignment="center"/>
+
+</LinearLayout>
+\ No newline at end of file
diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml
index 71bf16d30..cf00f2b1b 100644
--- a/app/src/main/res/layout/queue_fragment.xml
+++ b/app/src/main/res/layout/queue_fragment.xml
@@ -27,13 +27,9 @@
         android:layout_below="@id/divider"
         android:scrollbars="vertical"/>
 
-    <TextView
-        android:id="@id/android:empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_centerInParent="true"
-        android:gravity="center"
-        android:text="@string/no_items_label" />
+    <include
+        android:id="@+id/emptyView"
+        layout="@layout/empty_view_layout"/>
 
     <ProgressBar
         android:id="@+id/progLoading"