diff --git a/android/res/layout/country_download_failed.xml b/android/res/layout/country_download_failed.xml
new file mode 100644
index 0000000000..eec3ac4486
--- /dev/null
+++ b/android/res/layout/country_download_failed.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:textColor="#FF0000" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@+android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/android/res/layout/country_downloading.xml b/android/res/layout/country_downloading.xml
new file mode 100644
index 0000000000..e3ac5d74d3
--- /dev/null
+++ b/android/res/layout/country_downloading.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:textColor="#342BB6" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@+android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/android/res/layout/country_in_the_queue.xml b/android/res/layout/country_in_the_queue.xml
new file mode 100644
index 0000000000..bad596db30
--- /dev/null
+++ b/android/res/layout/country_in_the_queue.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:textColor="#5B94DE" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@+android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/android/res/layout/country_not_downloaded.xml b/android/res/layout/country_not_downloaded.xml
new file mode 100644
index 0000000000..172ffc87ab
--- /dev/null
+++ b/android/res/layout/country_not_downloaded.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@+android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/android/res/layout/country_on_disk.xml b/android/res/layout/country_on_disk.xml
new file mode 100644
index 0000000000..f7e15183c5
--- /dev/null
+++ b/android/res/layout/country_on_disk.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:textColor="#00A144" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@+android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout>
diff --git a/android/src/com/mapswithme/maps/DownloadUI.java b/android/src/com/mapswithme/maps/DownloadUI.java
index 4cef0a21ed..4747988ae8 100644
--- a/android/src/com/mapswithme/maps/DownloadUI.java
+++ b/android/src/com/mapswithme/maps/DownloadUI.java
@@ -53,11 +53,11 @@ public class DownloadUI extends PreferenceActivity
   private String formatSizeString(long sizeInBytes)
   {
     if (sizeInBytes > 1024 * 1024)
-      return sizeInBytes / (1024 * 1024) + "Mb";
+      return sizeInBytes / (1024 * 1024) + " Mb";
     else if ((sizeInBytes + 1023) / 1024 > 999)
-      return "1Mb";
+      return "1 Mb";
     else
-      return (sizeInBytes + 1023) / 1024 + "Kb";
+      return (sizeInBytes + 1023) / 1024 + " Kb";
   }
 
   private void updateCountryCell(final Preference cell, int group, int country, int region)
@@ -69,22 +69,33 @@ public class DownloadUI extends PreferenceActivity
     case 0: // EOnDisk
       cell.setSummary("Downloaded (" + formatSizeString(countryLocalSizeInBytes(group, country, region))
           + "), touch to delete");
+//      ((CheckBoxPreference)cell).setChecked(true);
+      cell.setLayoutResource(R.layout.country_on_disk);
       break;
     case 1: // ENotDownloaded
       cell.setSummary("Touch to download");// + formatSizeString(countryRemoteSizeInBytes(group, country, region)));
+//      ((CheckBoxPreference)cell).setChecked(false);
+      cell.setLayoutResource(R.layout.country_not_downloaded);
       break;
     case 2: // EDownloadFailed
       cell.setSummary("Download has failed, touch again for one more try");
+      cell.setLayoutResource(R.layout.country_download_failed);
+//      ((CheckBoxPreference)cell).setChecked(false);
       break;
     case 3: // EDownloading
       cell.setSummary("Downloading...");
-      break;        
+      cell.setLayoutResource(R.layout.country_downloading);
+//      ((CheckBoxPreference)cell).setChecked(true);
+      break;
     case 4: // EInQueue
       cell.setSummary("Marked for downloading, touch to cancel");
-      break;        
+      cell.setLayoutResource(R.layout.country_in_the_queue);
+//      ((CheckBoxPreference)cell).setChecked(true);
+      break;
     case 5: // EUnknown
       cell.setSummary("Unknown state :(");
-      break;        
+//      ((CheckBoxPreference)cell).setChecked(false);
+      break;
     }
   }
 
@@ -114,7 +125,7 @@ public class DownloadUI extends PreferenceActivity
     final String name = countryName(group, country, region);
     if (countriesCount(group, country, region) == 0)
     { // it's downloadable country element
-      final CheckBoxPreference cell = new CheckBoxPreference(this);
+      final Preference cell = new Preference(this);
       cell.setKey(group + " " + country + " " + region);
       cell.setTitle(name);
       
@@ -209,8 +220,9 @@ public class DownloadUI extends PreferenceActivity
         
       case 5: // EUnknown
         Log.d(TAG, "Unknown country state");
-        break;        
+        break;
       }
+      return true;
     }
     return super.onPreferenceTreeClick(preferenceScreen, preference);
   }