diff --git a/media/android/NewsBlur/res/drawable/activity_background.xml b/media/android/NewsBlur/res/drawable/activity_background.xml
deleted file mode 100644
index 2e9e3ad85..000000000
--- a/media/android/NewsBlur/res/drawable/activity_background.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item>
-        <bitmap
-            android:src="@drawable/second_repeating_pattern"
-        	android:tileMode="repeat" 
-            />        
-    </item>
-    
-    <item>
-        <shape>
-            <gradient
-                android:angle="270"
-                android:endColor="@color/half_darkgray"
-                android:startColor="@color/half_black" />
-        </shape>
-    </item>
-
-    
-</layer-list>
\ No newline at end of file
diff --git a/media/android/NewsBlur/res/drawable/list_background.xml b/media/android/NewsBlur/res/drawable/list_background.xml
index 1f659ce69..e0067eff3 100644
--- a/media/android/NewsBlur/res/drawable/list_background.xml
+++ b/media/android/NewsBlur/res/drawable/list_background.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item>
-        <bitmap
-            android:src="@drawable/second_repeating_pattern"
-        	android:tileMode="repeat" 
-            />        
-    </item>
-    
-    <item>
-        <shape>
-        	<solid android:color="@color/half_lightgray" />
-        </shape>
-    </item>
-    
-</layer-list>
\ No newline at end of file
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <solid android:color="@color/lightgray" />
+</shape>
diff --git a/media/android/NewsBlur/res/drawable/second_repeating_pattern.png b/media/android/NewsBlur/res/drawable/second_repeating_pattern.png
deleted file mode 100644
index 11ccc5eee..000000000
Binary files a/media/android/NewsBlur/res/drawable/second_repeating_pattern.png and /dev/null differ
diff --git a/media/android/NewsBlur/res/layout-land/activity_login.xml b/media/android/NewsBlur/res/layout-land/activity_login.xml
deleted file mode 100644
index f1346a6a6..000000000
--- a/media/android/NewsBlur/res/layout-land/activity_login.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center"
-    android:background="@drawable/activity_background" >
-
-    <ImageView
-        android:id="@+id/login_logo"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginRight="15dp"
-        android:layout_marginTop="10dp"
-        android:contentDescription="@string/description_login_logo"
-        android:src="@drawable/logo" />
-
-    <TextView
-        android:id="@+id/login_logo_title"
-        android:layout_width="wrap_content"
-        android:layout_height="60dp"
-        android:layout_alignBaseline="@+id/login_logo"
-        android:layout_marginTop="15dp"
-        android:layout_toRightOf="@+id/login_logo"
-        android:gravity="center"
-        android:text="@string/newsblur"
-        android:textColor="@color/white"
-        android:textSize="30dp"
-        android:textStyle="bold" />
-
-    <FrameLayout
-        android:id="@+id/login_container"
-        android:layout_width="280dp"
-        android:layout_marginTop="20dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/login_logo" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/media/android/NewsBlur/res/layout/activity_itemslist.xml b/media/android/NewsBlur/res/layout/activity_itemslist.xml
index 70087c3e2..c2f086049 100644
--- a/media/android/NewsBlur/res/layout/activity_itemslist.xml
+++ b/media/android/NewsBlur/res/layout/activity_itemslist.xml
@@ -2,7 +2,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/activity_background"
     android:orientation="vertical" >
 
     <LinearLayout
diff --git a/media/android/NewsBlur/res/layout/row_all_shared_stories.xml b/media/android/NewsBlur/res/layout/row_all_shared_stories.xml
index e5c3a7709..9d9502d89 100644
--- a/media/android/NewsBlur/res/layout/row_all_shared_stories.xml
+++ b/media/android/NewsBlur/res/layout/row_all_shared_stories.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/selector_folder_background" >
 
     <ImageView
@@ -71,17 +71,22 @@
         android:layout_centerVertical="true"
         android:layout_toLeftOf="@id/row_foldersums"
         android:layout_toRightOf="@id/row_everything_icon"
-        android:paddingBottom="15dp"
-        android:paddingTop="15dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
         android:text="@string/all_shared_stories"
         android:textColor="@color/folder_text"
         android:textSize="16dp"
         android:textStyle="bold" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentTop="true"
+        android:background="@color/folder_border_top" />
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/midgray" />
+        android:background="@color/folder_border_bottom" />
 
 </RelativeLayout>
diff --git a/media/android/NewsBlur/res/layout/row_all_stories.xml b/media/android/NewsBlur/res/layout/row_all_stories.xml
index fd3dfb306..a6349ac9d 100644
--- a/media/android/NewsBlur/res/layout/row_all_stories.xml
+++ b/media/android/NewsBlur/res/layout/row_all_stories.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/selector_folder_background" >
 
     <ImageView
@@ -21,8 +21,8 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_marginLeft="50dp"
-        android:paddingBottom="15dp"
-        android:paddingTop="15dp"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
         android:text="@string/all_stories_row_title"
         android:textColor="@color/folder_text"
         android:textSize="16dp"
@@ -34,16 +34,17 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
-        android:layout_marginRight="38dp" >
+        android:layout_marginRight="5dp" >
 
         <TextView
             android:id="@+id/row_foldersumneu"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="5dp"
+            android:layout_alignParentRight="true"
             android:background="@drawable/neutral_count_rect"
             android:gravity="center"
-            android:padding="5dp"
+            android:padding="3dp"
             android:shadowColor="@color/neutral_drop_shadow"
             android:shadowDy="1"
             android:shadowRadius="1"
@@ -56,9 +57,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="5dp"
+            android:layout_alignParentRight="true"
             android:background="@drawable/positive_count_rect"
             android:gravity="center"
-            android:padding="5dp"
+            android:padding="3dp"
             android:shadowColor="@color/positive_drop_shadow"
             android:shadowDy="1"
             android:shadowRadius="1"
@@ -67,10 +69,15 @@
             android:textStyle="bold" />
     </LinearLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_alignParentTop="true"
+        android:background="@color/folder_border_top" />
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/midgray" />
+        android:background="@color/folder_border_bottom" />
 
 </RelativeLayout>
diff --git a/media/android/NewsBlur/res/layout/row_feed.xml b/media/android/NewsBlur/res/layout/row_feed.xml
index 6266fa8a4..8fa4449ba 100644
--- a/media/android/NewsBlur/res/layout/row_feed.xml
+++ b/media/android/NewsBlur/res/layout/row_feed.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/selector_feed_background"
-    android:orientation="vertical"
-    android:paddingBottom="6dp"
-    android:paddingTop="6dp" >
+    android:orientation="vertical" >
 
     <LinearLayout
         android:id="@+id/row_feedcounters"
@@ -15,8 +13,7 @@
         android:layout_centerVertical="true"
         android:layout_marginRight="5dp"
         android:gravity="right"
-        android:orientation="horizontal"
-        android:padding="2dp" >
+        android:orientation="horizontal" >
 
         <TextView
             android:id="@+id/row_feedneutral"
@@ -25,6 +22,8 @@
             android:layout_marginRight="5dp"
             android:background="@drawable/neutral_count_rect"
             android:gravity="center"
+            android:paddingTop="2dp"
+            android:paddingBottom="2dp"
             android:paddingLeft="3dp"
             android:paddingRight="3dp"
             android:shadowColor="@color/neutral_drop_shadow"
@@ -41,8 +40,10 @@
             android:layout_marginRight="5dp"
             android:background="@drawable/positive_count_rect"
             android:gravity="center"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
+            android:paddingTop="2dp"
+            android:paddingBottom="2dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
             android:shadowColor="@color/positive_drop_shadow"
             android:shadowDy="1"
             android:shadowRadius="1"
@@ -53,8 +54,8 @@
 
     <ImageView
         android:id="@+id/row_feedfavicon"
-        android:layout_width="17dp"
-        android:layout_height="17dp"
+        android:layout_width="23dp"
+        android:layout_height="23dp"
         android:layout_centerVertical="true"
         android:layout_marginLeft="19dp"
         android:contentDescription="@string/description_favicon" />
@@ -64,7 +65,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginBottom="6dp"
+        android:paddingBottom="7dp"
+    	android:paddingTop="7dp" 
         android:layout_marginLeft="15dp"
         android:layout_marginRight="5dp"
         android:layout_toLeftOf="@id/row_feedcounters"
@@ -75,4 +77,4 @@
         android:textSize="16dp"
         android:textStyle="bold" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/media/android/NewsBlur/res/layout/row_folder_collapsed.xml b/media/android/NewsBlur/res/layout/row_folder_collapsed.xml
index 6d874052a..3016333eb 100644
--- a/media/android/NewsBlur/res/layout/row_folder_collapsed.xml
+++ b/media/android/NewsBlur/res/layout/row_folder_collapsed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/selector_folder_background">
 
     <ImageView
@@ -40,7 +40,7 @@
             android:layout_marginRight="5dp"
             android:background="@drawable/neutral_count_rect"
             android:gravity="center"
-            android:padding="5dp"
+            android:padding="3dp"
             android:shadowColor="@color/neutral_drop_shadow"
             android:shadowDy="1"
             android:shadowRadius="1"
@@ -55,7 +55,7 @@
             android:layout_marginRight="5dp"
             android:background="@drawable/positive_count_rect"
             android:gravity="center"
-            android:padding="5dp"
+            android:padding="3dp"
             android:shadowColor="@color/positive_drop_shadow"
             android:shadowDy="1"
             android:shadowRadius="1"
@@ -72,15 +72,20 @@
         android:paddingLeft="49dp"
         android:layout_alignRight="@id/row_foldersums"
         android:textColor="@color/folder_text"
-        android:paddingBottom="15dp"
-    	android:paddingTop="15dp" 
+        android:paddingBottom="10dp"
+    	android:paddingTop="10dp" 
         android:textSize="16dp"
         android:textStyle="bold" />
     
     <View 
         android:layout_height="1dp"
         android:layout_width="match_parent" 
-        android:background="@color/midgray"
+        android:background="@color/folder_border_top"
+        android:layout_alignParentTop="true" />
+    <View 
+        android:layout_height="1dp"
+        android:layout_width="match_parent" 
+        android:background="@color/folder_border_bottom"
         android:layout_alignParentBottom="true" />
    
 </RelativeLayout>
diff --git a/media/android/NewsBlur/res/layout/row_socialfeed.xml b/media/android/NewsBlur/res/layout/row_socialfeed.xml
index 2a3027290..badc6802d 100644
--- a/media/android/NewsBlur/res/layout/row_socialfeed.xml
+++ b/media/android/NewsBlur/res/layout/row_socialfeed.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="@drawable/selector_feed_background"
-    android:paddingBottom="2dp"
-    android:paddingTop="2dp">
+    android:layout_height="wrap_content"
+    android:background="@drawable/selector_feed_background" >
 
     <LinearLayout
         android:id="@+id/row_foldersums"
@@ -21,8 +19,10 @@
             android:layout_marginRight="5dp"
             android:background="@drawable/neutral_count_rect"
             android:gravity="center"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
+            android:paddingTop="2dp"
+            android:paddingBottom="2dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
             android:shadowColor="@color/neutral_drop_shadow"
             android:shadowDy="1"
             android:shadowRadius="1"
@@ -42,18 +42,20 @@
             android:shadowRadius="1"
             android:textColor="@color/white"
             android:textSize="14sp"
-            android:paddingLeft="4dp"
-            android:paddingRight="4dp"
+            android:paddingTop="2dp"
+            android:paddingBottom="2dp"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp"
             android:textStyle="bold" />
     </LinearLayout>
 
     <ImageView
         android:id="@+id/row_socialfeed_icon"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
+        android:layout_width="23dp"
+        android:layout_height="23dp"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="10dp"
+        android:layout_marginLeft="19dp"
         android:layout_marginRight="10dp"
         android:contentDescription="@string/description_row_folder_icon" />
 
@@ -66,6 +68,8 @@
         android:layout_toLeftOf="@id/row_foldersums"
         android:layout_toRightOf="@id/row_socialfeed_icon"
         android:textColor="@color/folder_text"
+        android:paddingBottom="7dp"
+    	android:paddingTop="7dp" 
         android:textSize="16dp" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/media/android/NewsBlur/res/values/colors.xml b/media/android/NewsBlur/res/values/colors.xml
index be0a377d2..e02fd81c9 100644
--- a/media/android/NewsBlur/res/values/colors.xml
+++ b/media/android/NewsBlur/res/values/colors.xml
@@ -11,6 +11,8 @@
 	<color name="folder_background_selected_end">#fdfcca</color>
 	<color name="folder_background_selected_start">#fbec8c</color>
     <color name="folder_text">#4C4C4C</color>
+    <color name="folder_border_top">#FDFDFD</color>
+    <color name="folder_border_bottom">#B7BBAA</color>
     <color name="feed_background">#F7F8F5</color>
     
     <color name="story_title_unread">#606060</color>
diff --git a/media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java b/media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java
index 3cfd3f568..fb9af9dfb 100644
--- a/media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java
+++ b/media/android/NewsBlur/src/com/newsblur/database/MixedExpandableListAdapter.java
@@ -309,10 +309,17 @@ public class MixedExpandableListAdapter extends BaseExpandableListAdapter{
 			allStoriesCountCursor.moveToFirst();
 			switch (currentState) {
 				case AppConstants.STATE_BEST:
-					v.findViewById(R.id.row_foldersumneu).setVisibility(View.INVISIBLE);
+					v.findViewById(R.id.row_foldersumneu).setVisibility(View.GONE);
+					v.findViewById(R.id.row_foldersumpos).setVisibility(View.VISIBLE);
 					((TextView) v.findViewById(R.id.row_foldersumpos)).setText(allStoriesCountCursor.getString(allStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_POS)));
 					break;
-				default:	
+				default:
+					v.findViewById(R.id.row_foldersumneu).setVisibility(View.VISIBLE);
+                    if (TextUtils.equals("0", allStoriesCountCursor.getString(allStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_POS)))) {
+                        v.findViewById(R.id.row_foldersumpos).setVisibility(View.GONE);
+                    } else {
+                        v.findViewById(R.id.row_foldersumpos).setVisibility(View.VISIBLE);
+                    }
 					((TextView) v.findViewById(R.id.row_foldersumneu)).setText(allStoriesCountCursor.getString(allStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_NEUT)));
 					((TextView) v.findViewById(R.id.row_foldersumpos)).setText(allStoriesCountCursor.getString(allStoriesCountCursor.getColumnIndex(DatabaseConstants.SUM_POS)));
 					break;