diff --git a/media/android/NewsBlur/res/drawable/world.png b/media/android/NewsBlur/res/drawable/world.png
index 0cba35820..ad8823a91 100644
Binary files a/media/android/NewsBlur/res/drawable/world.png and b/media/android/NewsBlur/res/drawable/world.png differ
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 9d9502d89..c6a65a2b0 100644
--- a/media/android/NewsBlur/res/layout/row_all_shared_stories.xml
+++ b/media/android/NewsBlur/res/layout/row_all_shared_stories.xml
@@ -6,12 +6,12 @@
 
     <ImageView
         android:id="@+id/row_everything_icon"
-        android:layout_width="25dp"
-        android:layout_height="25dp"
+        android:layout_width="23dp"
+        android:layout_height="23dp"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:contentDescription="@string/description_row_folder_icon"
         android:src="@drawable/ak_icon_blurblogs" />
 
diff --git a/media/android/NewsBlur/res/layout/row_all_stories.xml b/media/android/NewsBlur/res/layout/row_all_stories.xml
index a6349ac9d..24b3bb1c8 100644
--- a/media/android/NewsBlur/res/layout/row_all_stories.xml
+++ b/media/android/NewsBlur/res/layout/row_all_stories.xml
@@ -6,12 +6,12 @@
 
     <ImageView
         android:id="@+id/row_everything_icon"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="23dp"
+        android:layout_height="23dp"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="18dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:contentDescription="@string/description_row_folder_icon"
         android:src="@drawable/ak_icon_allstories" />
 
@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="50dp"
+        android:layout_toRightOf="@id/row_everything_icon"
         android:paddingBottom="10dp"
         android:paddingTop="10dp"
         android:text="@string/all_stories_row_title"
diff --git a/media/android/NewsBlur/res/layout/row_feed.xml b/media/android/NewsBlur/res/layout/row_feed.xml
index 8fa4449ba..8fe65f2aa 100644
--- a/media/android/NewsBlur/res/layout/row_feed.xml
+++ b/media/android/NewsBlur/res/layout/row_feed.xml
@@ -57,7 +57,8 @@
         android:layout_width="23dp"
         android:layout_height="23dp"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="19dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:contentDescription="@string/description_favicon" />
 
     <TextView
@@ -67,7 +68,6 @@
         android:layout_centerVertical="true"
         android:paddingBottom="7dp"
     	android:paddingTop="7dp" 
-        android:layout_marginLeft="15dp"
         android:layout_marginRight="5dp"
         android:layout_toLeftOf="@id/row_feedcounters"
         android:layout_toRightOf="@id/row_feedfavicon"
diff --git a/media/android/NewsBlur/res/layout/row_folder_collapsed.xml b/media/android/NewsBlur/res/layout/row_folder_collapsed.xml
index 3016333eb..769c48aa2 100644
--- a/media/android/NewsBlur/res/layout/row_folder_collapsed.xml
+++ b/media/android/NewsBlur/res/layout/row_folder_collapsed.xml
@@ -10,7 +10,7 @@
         android:layout_height="23dp"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="16dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:contentDescription="@string/description_row_folder_icon"
         android:src="@drawable/g_icn_folder_rss" />
@@ -69,7 +69,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_centerVertical="true"
-        android:paddingLeft="49dp"
+        android:layout_toRightOf="@id/row_folder_icon"
         android:layout_alignRight="@id/row_foldersums"
         android:textColor="@color/folder_text"
         android:paddingBottom="10dp"
diff --git a/media/android/NewsBlur/res/layout/row_folderitem.xml b/media/android/NewsBlur/res/layout/row_folderitem.xml
index 758f4289b..a4f2a43ac 100644
--- a/media/android/NewsBlur/res/layout/row_folderitem.xml
+++ b/media/android/NewsBlur/res/layout/row_folderitem.xml
@@ -24,7 +24,8 @@
             android:id="@+id/row_item_sidebar"
             android:layout_width="10dp"
             android:layout_height="10dp"
-            android:layout_marginLeft="2dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
             android:layout_centerVertical="true"
             android:layout_toRightOf="@id/row_item_favicon_borderbar_2" />
 
@@ -32,7 +33,6 @@
             android:id="@+id/row_item_feedicon"
             android:layout_width="20dp"
             android:layout_height="20dp"
-            android:layout_marginLeft="6dp"
             android:layout_marginTop="10dp"
             android:paddingBottom="4dp"
             android:paddingTop="2dp"
@@ -80,7 +80,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/row_item_title"
-            android:layout_marginLeft="8dp"
             android:paddingBottom="12dp"
             android:layout_toLeftOf="@id/row_item_date"
             android:layout_toRightOf="@id/row_item_sidebar"
diff --git a/media/android/NewsBlur/res/layout/row_item.xml b/media/android/NewsBlur/res/layout/row_item.xml
index 5fdef589f..acbc9746c 100644
--- a/media/android/NewsBlur/res/layout/row_item.xml
+++ b/media/android/NewsBlur/res/layout/row_item.xml
@@ -25,14 +25,14 @@
             android:layout_width="10dp"
             android:layout_height="10dp"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="2dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
             android:layout_toRightOf="@id/row_item_favicon_borderbar_2" />
 
         <TextView
             android:id="@+id/row_item_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_toRightOf="@id/row_item_sidebar"
             android:paddingBottom="12dp"
@@ -56,7 +56,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/row_item_title"
-            android:layout_marginLeft="8dp"
             android:paddingBottom="12dp"
             android:layout_toLeftOf="@id/row_item_date"
             android:layout_toRightOf="@id/row_item_sidebar"
diff --git a/media/android/NewsBlur/res/layout/row_socialfeed.xml b/media/android/NewsBlur/res/layout/row_socialfeed.xml
index badc6802d..54048e7fd 100644
--- a/media/android/NewsBlur/res/layout/row_socialfeed.xml
+++ b/media/android/NewsBlur/res/layout/row_socialfeed.xml
@@ -55,7 +55,7 @@
         android:layout_height="23dp"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:layout_marginLeft="19dp"
+        android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:contentDescription="@string/description_row_folder_icon" />
 
diff --git a/media/android/NewsBlur/res/layout/row_socialitem.xml b/media/android/NewsBlur/res/layout/row_socialitem.xml
index c769cb14d..66a49dcf7 100644
--- a/media/android/NewsBlur/res/layout/row_socialitem.xml
+++ b/media/android/NewsBlur/res/layout/row_socialitem.xml
@@ -25,14 +25,14 @@
             android:layout_width="10dp"
             android:layout_height="10dp"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="2dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
             android:layout_toRightOf="@id/row_item_favicon_borderbar_2" />
 
         <ImageView
             android:id="@+id/row_item_feedicon"
             android:layout_width="17dp"
             android:layout_height="17dp"
-            android:layout_marginLeft="6dp"
             android:layout_marginTop="10dp"
             android:layout_toRightOf="@id/row_item_sidebar" />
 
@@ -40,7 +40,6 @@
             android:id="@+id/row_item_feedtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="4dp"
             android:layout_toRightOf="@id/row_item_feedicon"
             android:layout_alignBottom="@id/row_item_feedicon"
             android:ellipsize="end"
@@ -60,7 +59,7 @@
             android:textColor="@color/darkgray"
             android:textSize="14sp" />
         
-           <TextView
+        <TextView
             android:id="@+id/row_item_date"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -76,7 +75,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@+id/row_item_title"
-            android:layout_marginLeft="8dp"
             android:paddingBottom="12dp"
             android:layout_toLeftOf="@id/row_item_date"
             android:layout_toRightOf="@id/row_item_sidebar"