--- a/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml
+++ b/mobile/android/base/resources/layout/activity_stream_main_toppanel.xml
@@ -1,80 +1,67 @@
 <?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"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:orientation="vertical"
-                android:padding="4dp">
-
-    <TextView
-        android:id="@+id/title_topsites"
-        android:text="@string/activity_stream_topsites"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:textStyle="bold"
-        android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/more_topsites"
-        android:layout_toStartOf="@+id/more_topsites"/>
-
-    <TextView
-        android:id="@+id/more_topsites"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:textAllCaps="true"
-        android:textColor="@android:color/holo_orange_dark"
-        android:textSize="14sp"
-        android:text="@string/activity_stream_more"
-        tools:text="More"
-        android:layout_alignBottom="@+id/title_topsites"/>
+                android:orientation="vertical">
 
     <android.support.v4.view.ViewPager
         android:layout_width="match_parent"
-        android:layout_height="115dp"
+        android:layout_height="123dp"
         android:id="@+id/topsites_pager"
-        android:layout_below="@+id/title_topsites"
+        android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"/>
 
     <org.mozilla.gecko.home.activitystream.topsites.CirclePageIndicator
         android:id="@+id/topsites_indicator"
         android:padding="10dip"
         app:fillColor="#444444"
         app:pageColor="#FFFFFF"
         app:strokeWidth="1dp"
         app:radius="2dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/topsites_pager"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"/>
 
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:padding="4dp"
+        android:background="@color/disabled_grey"
+        android:layout_below="@+id/topsites_indicator"
+        android:layout_alignRight="@+id/more_highlights"
+        android:layout_alignEnd="@+id/more_highlights"/>
+
     <TextView
         android:id="@+id/title_highlights"
+        android:padding="4dp"
         android:text="@string/activity_stream_highlights"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textStyle="bold"
-        android:layout_below="@+id/topsites_indicator"
+        android:textSize="14sp"
+        android:layout_below="@+id/divider"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_toLeftOf="@+id/more_highlights"
         android:layout_toStartOf="@+id/more_highlights"/>
 
     <TextView
         android:id="@+id/more_highlights"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:padding="4dp"
         android:textAllCaps="true"
         android:textColor="@android:color/holo_orange_dark"
         android:textSize="14sp"
         android:text="@string/activity_stream_more"
-        android:layout_alignTop="@+id/title_highlights"
-        android:layout_alignLeft="@+id/more_topsites"
-        android:layout_alignStart="@+id/more_topsites"/>
+        android:layout_below="@+id/divider"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"/>
 
 </RelativeLayout>
\ No newline at end of file

--- a/mobile/android/base/resources/layout/activity_stream_topsites_page.xml
+++ b/mobile/android/base/resources/layout/activity_stream_topsites_page.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.mozilla.gecko.home.activitystream.topsites.TopSitesPage xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"/>
+              android:layout_height="match_parent"
+              android:padding="4dp"/>