diff --git a/clients/android/res/drawable/icon_file.png b/clients/android/res/drawable/icon_file.png
new file mode 100644
index 000000000..fecbbc1a6
Binary files /dev/null and b/clients/android/res/drawable/icon_file.png differ
diff --git a/clients/android/res/drawable/icon_folder.png b/clients/android/res/drawable/icon_folder.png
new file mode 100644
index 000000000..3634827e0
Binary files /dev/null and b/clients/android/res/drawable/icon_folder.png differ
diff --git a/clients/android/res/layout/browse_row.xml b/clients/android/res/layout/browse_row.xml
index ee9276881..c5c336877 100644
--- a/clients/android/res/layout/browse_row.xml
+++ b/clients/android/res/layout/browse_row.xml
@@ -1,11 +1,23 @@
 <!-- cribbed from simple_list_item_1 -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/title"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceLarge"
     android:gravity="center_vertical"
-    android:paddingLeft="6dip"
     android:minHeight="?android:attr/listPreferredItemHeight"
-    android:singleLine="true"
-    />
+    >
+  <ImageView
+      android:id="@+id/icon"
+      android:layout_width="48dp"
+      android:layout_height="fill_parent"
+      android:scaleType="center"
+      />
+  <TextView
+      android:id="@+id/title"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:textAppearance="?android:attr/textAppearanceLarge"
+      android:paddingLeft="6dip"
+      android:singleLine="true"
+      />
+</LinearLayout>
diff --git a/clients/android/src/org/camlistore/BrowseActivity.java b/clients/android/src/org/camlistore/BrowseActivity.java
index bcb256b97..8c67438e2 100644
--- a/clients/android/src/org/camlistore/BrowseActivity.java
+++ b/clients/android/src/org/camlistore/BrowseActivity.java
@@ -29,6 +29,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -148,6 +149,18 @@ public class BrowseActivity extends ListActivity {
 
             Entry entry = mEntries.get(position);
             ((TextView) view.findViewById(R.id.title)).setText(entry.toString());
+
+            ImageView icon = ((ImageView) view.findViewById(R.id.icon));
+            switch (entry.getType()) {
+                case DIRECTORY:
+                    icon.setImageResource(R.drawable.icon_folder);
+                    break;
+                case FILE:
+                    icon.setImageResource(R.drawable.icon_file);
+                    break;
+                default:
+            }
+
             return view;
         }
     }