Update action bar icons

astrid/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java

@@ -179,7 +179,11 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
             ThemeService.applyTheme(this);
             ActionBar actionBar = getSupportActionBar();
             if (Preferences.getBoolean(R.string.p_save_and_cancel, false)) {
-                actionBar.setLogo(R.drawable.ic_action_save);
+                if(ThemeService.getTheme() == R.style.Theme) {
+                    actionBar.setLogo(R.drawable.ic_action_save_light);
+                } else {
+                    actionBar.setLogo(R.drawable.ic_action_save);
+                }
             } else {
                 actionBar.setLogo(null);
             }
@@ -492,7 +496,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
         MenuItem item;
         if (Preferences.getBoolean(R.string.p_save_and_cancel, false)) {
             item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
-            item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_close));
+            item.setIcon(ThemeService.getDrawable(R.drawable.ic_action_cancel));
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         }
 

astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java

@@ -27,7 +27,11 @@ public class TaskEditActivity extends AstridActivity {
         ThemeService.applyTheme(this);
         ActionBar actionBar = getSupportActionBar();
         if (Preferences.getBoolean(R.string.p_save_and_cancel, false)) {
-            actionBar.setLogo(R.drawable.ic_action_save);
+            if(ThemeService.getTheme() == R.style.Theme) {
+                actionBar.setLogo(R.drawable.ic_action_save_light);
+            } else {
+                actionBar.setLogo(R.drawable.ic_action_save);
+            }
         } else {
             actionBar.setLogo(null);
         }

astrid/src/main/java/com/todoroo/astrid/service/ThemeService.java

@@ -8,6 +8,7 @@ package com.todoroo.astrid.service;
 import android.app.Activity;
 import android.graphics.PixelFormat;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.WindowManager;
 
 import com.todoroo.andlib.service.ContextManager;
@@ -211,8 +212,8 @@ public class ThemeService {
             return R.drawable.gl_lists_dark;
         }
 
-        throw new RuntimeException("No theme drawable found for " +
-                ContextManager.getResources().getResourceName(lightDrawable));
+        Log.w("ThemeService", "No theme drawable found for " + ContextManager.getResources().getResourceName(lightDrawable));
+        return lightDrawable;
     }
 
     public static int getDarkVsLight(int resForWhite, int resForDark) {