diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
index 6948dd14c..3b99e29d8 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
@@ -43,7 +43,6 @@ import me.grishka.appkit.views.FragmentRootLinearLayout;
 public class HomeFragment extends AppKitFragment implements OnBackPressedListener{
 	private FragmentRootLinearLayout content;
 	private HomeTimelineFragment homeTimelineFragment;
-	private ListTimelinesFragment listTimelinesFragment;
 	private NotificationsFragment notificationsFragment;
 	private DiscoverFragment searchFragment;
 	private ProfileFragment profileFragment;
@@ -73,8 +72,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			args.putBoolean("noAutoLoad", true);
 			searchFragment=new DiscoverFragment();
 			searchFragment.setArguments(args);
-			listTimelinesFragment =new ListTimelinesFragment();
-			listTimelinesFragment.setArguments(args);
 			notificationsFragment=new NotificationsFragment();
 			notificationsFragment.setArguments(args);
 			args=new Bundle(args);
@@ -116,7 +113,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			getChildFragmentManager().beginTransaction()
 					.add(R.id.fragment_wrap, homeTimelineFragment)
 					.add(R.id.fragment_wrap, searchFragment).hide(searchFragment)
-					.add(R.id.fragment_wrap, listTimelinesFragment).hide(listTimelinesFragment)
 					.add(R.id.fragment_wrap, notificationsFragment).hide(notificationsFragment)
 					.add(R.id.fragment_wrap, profileFragment).hide(profileFragment)
 					.commit();
@@ -196,8 +192,6 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene
 			return homeTimelineFragment;
 		}else if(tab==R.id.tab_search){
 			return searchFragment;
-		}else if(tab==R.id.tab_lists) {
-			return listTimelinesFragment;
 		}else if(tab==R.id.tab_notifications){
 			return notificationsFragment;
 		}else if(tab==R.id.tab_profile){
diff --git a/mastodon/src/main/res/drawable/ic_fluent_lists_28_selector.xml b/mastodon/src/main/res/drawable/ic_fluent_lists_28_selector.xml
new file mode 100644
index 000000000..dc4d0296a
--- /dev/null
+++ b/mastodon/src/main/res/drawable/ic_fluent_lists_28_selector.xml
@@ -0,0 +1,5 @@
+<vector android:height="28dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="28dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M3,5v14h17L20,5L3,5zM7,7v2L5,9L5,7h2zM5,13v-2h2v2L5,13zM5,15h2v2L5,17v-2zM18,17L9,17v-2h9v2zM18,13L9,13v-2h9v2zM18,9L9,9L9,7h9v2z"/>
+</vector>
diff --git a/mastodon/src/main/res/layout/fragment_lists.xml b/mastodon/src/main/res/layout/fragment_lists.xml
new file mode 100644
index 000000000..27970b4e0
--- /dev/null
+++ b/mastodon/src/main/res/layout/fragment_lists.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <org.joinmastodon.android.ui.tabs.TabLayout
+        android:id="@+id/tabbar"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        app:tabGravity="fill"
+        app:tabIndicator="@drawable/mtrl_tabs_default_indicator"
+        app:tabIndicatorAnimationMode="elastic"
+        app:tabIndicatorColor="?android:textColorPrimary"
+        app:tabMode="fixed"
+        android:background="@drawable/bg_discover_tabs"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/layout/tab_bar.xml b/mastodon/src/main/res/layout/tab_bar.xml
index 966ffe2e6..2ad234cb5 100644
--- a/mastodon/src/main/res/layout/tab_bar.xml
+++ b/mastodon/src/main/res/layout/tab_bar.xml
@@ -44,21 +44,6 @@
 			android:layout_height="1px"
 			android:layout_weight="1"/>
 
-		<ImageView
-			android:id="@+id/tab_lists"
-			android:layout_width="60dp"
-			android:layout_height="52dp"
-			android:scaleType="center"
-			android:contentDescription="@string/sk_lists_timeline"
-			android:background="?android:selectableItemBackgroundBorderless"
-			android:tint="?android:colorPrimary"
-			android:src="@drawable/ic_fluent_home_28_selector"/>
-
-		<Space
-			android:layout_width="0px"
-			android:layout_height="1px"
-			android:layout_weight="1"/>
-
 		<ImageView
 			android:id="@+id/tab_notifications"
 			android:layout_width="60dp"