diff --git a/astrid/res/drawable/gl_list.png b/astrid/res/drawable/gl_list.png
index 8bcb630f5..793c0ab83 100644
Binary files a/astrid/res/drawable/gl_list.png and b/astrid/res/drawable/gl_list.png differ
diff --git a/astrid/res/drawable/gl_lists.png b/astrid/res/drawable/gl_lists.png
index b2dfdc3e6..bc2445553 100644
Binary files a/astrid/res/drawable/gl_lists.png and b/astrid/res/drawable/gl_lists.png differ
diff --git a/astrid/res/drawable/header_tags_normal.png b/astrid/res/drawable/header_tags_normal.png
index 3d5209aff..6723f4095 100644
Binary files a/astrid/res/drawable/header_tags_normal.png and b/astrid/res/drawable/header_tags_normal.png differ
diff --git a/astrid/res/drawable/header_tags_pressed.png b/astrid/res/drawable/header_tags_pressed.png
index 53221a773..02153920f 100644
Binary files a/astrid/res/drawable/header_tags_pressed.png and b/astrid/res/drawable/header_tags_pressed.png differ
diff --git a/astrid/res/drawable/header_tasks_normal.png b/astrid/res/drawable/header_tasks_normal.png
new file mode 100644
index 000000000..616f70771
Binary files /dev/null and b/astrid/res/drawable/header_tasks_normal.png differ
diff --git a/astrid/res/drawable/header_tasks_pressed.png b/astrid/res/drawable/header_tasks_pressed.png
new file mode 100644
index 000000000..8bf9b36a1
Binary files /dev/null and b/astrid/res/drawable/header_tasks_pressed.png differ
diff --git a/astrid/res/layout/filter_adapter_row.xml b/astrid/res/layout/filter_adapter_row.xml
index b6e63fc56..19c4ebf94 100644
--- a/astrid/res/layout/filter_adapter_row.xml
+++ b/astrid/res/layout/filter_adapter_row.xml
@@ -76,7 +76,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="55dp"
-        android:layout_marginTop="29dp"
+        android:layout_marginTop="26dp"
         style="@style/TextAppearance.TAd_ItemDetails"
         android:paddingRight="30dp"
         android:gravity="center_vertical"
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index a15c28e9b..27c88039f 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -6,6 +6,7 @@
     android:layout_height="wrap_content"
     android:paddingLeft="4dip"
     android:paddingRight="4dip"
+    android:paddingBottom="4dip"
     android:minHeight="40dip"
     android:orientation="horizontal">
     
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index c885c1944..37a4235d6 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -431,8 +431,8 @@
     
   <string-array name="EPr_themes">
     <!-- theme_settings: labels for Theme preference menu -->
-    <item>White</item>
-    <item>Black</item>
+    <item>Day</item>
+    <item>Night</item>
     <item>Transparent (White Text)</item>
     <item>Transparent (Black Text)</item>
   </string-array>
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index ba74a338c..a59df4e2e 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -113,7 +113,7 @@ public class FilterListActivity extends ExpandableListActivity {
                 finish();
                 AndroidUtilities.callApiMethod(5, FilterListActivity.this, "overridePendingTransition", //$NON-NLS-1$
                         new Class<?>[] { Integer.TYPE, Integer.TYPE },
-                        R.anim.slide_bottom_out, 0);
+                        0, R.anim.slide_bottom_out);
             }
         });
 
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index bf964b716..c512247ec 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -206,10 +206,10 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
     protected void onCreate(Bundle savedInstanceState) {
         DependencyInjectionService.getInstance().inject(this);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        ThemeService.applyTheme(this);
         super.onCreate(savedInstanceState);
 
         new StartupService().onStartupApplication(this);
+        ThemeService.applyTheme(this);
         ViewGroup parent = (ViewGroup) getLayoutInflater().inflate(R.layout.task_list_activity, null);
         parent.addView(getListBody(parent), 1);
         setContentView(parent);
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index 369e11598..85f80177a 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -83,6 +83,13 @@ public final class UpgradeService {
         if(from == 135)
             AddOnService.recordOem();
 
+        if(from > 0 && from < V3_8_2) {
+            if(Preferences.getBoolean(R.string.p_transparent_deprecated, false))
+                Preferences.setString(R.string.p_theme, "transparent"); //$NON-NLS-1$
+            else
+                Preferences.setString(R.string.p_theme, "black"); //$NON-NLS-1$
+        }
+
         // long running tasks: pop up a progress dialog
         final ProgressDialog dialog;
         if(from < V3_0_0 && context instanceof Activity)