further icon tweaks, update publish icon

4 files changed, 18 insertions, 39 deletions

diff --git a/res/menu/headlines_action_menu.xml b/res/menu/headlines_action_menu.xml
index 58cd900b..5764e179 100644
--- a/res/menu/headlines_action_menu.xml
+++ b/res/menu/headlines_action_menu.xml
@@ -3,17 +3,18 @@
     <item
         android:id="@+id/selection_toggle_unread"
         android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_undo_light"
         android:title="@string/selection_toggle_unread"/>
 
     <item
         android:id="@+id/selection_toggle_marked"
-        android:icon="@drawable/ic_menu_marked"
+        android:icon="@drawable/ic_unimportant_light"
         android:showAsAction="ifRoom"
         android:title="@string/selection_toggle_marked"/>
 
     <item
         android:id="@+id/selection_toggle_published"
-        android:icon="@drawable/ic_menu_publish"
+        android:icon="@drawable/ic_menu_publish_light"
         android:showAsAction="ifRoom"
         android:title="@string/selection_toggle_published"/>
 
diff --git a/res/menu/headlines_context_menu.xml b/res/menu/headlines_context_menu.xml
index 09cea090..2a445216 100644
--- a/res/menu/headlines_context_menu.xml
+++ b/res/menu/headlines_context_menu.xml
@@ -27,9 +27,8 @@
             android:showAsAction=""
             android:title="@string/article_mark_read_above"/>
         <item
-                android:id="@+id/set_labels"
-                android:icon="@drawable/ic_menu_marked"
-                android:title="@string/article_set_labels"/>        
+            android:id="@+id/set_labels"
+            android:title="@string/article_set_labels"/>
         <item
             android:id="@+id/article_set_note"
             android:showAsAction=""
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 84adbc8e..d9a33b48 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -82,29 +82,28 @@
                 android:title="@string/selection_toggle_unread"/>
             <item
                 android:id="@+id/selection_toggle_marked"
-                android:icon="@drawable/ic_menu_marked"
+                android:icon="@drawable/ic_unimportant_light"
                 android:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_marked"/>
             <item
                 android:id="@+id/selection_toggle_published"
-                android:icon="@drawable/ic_menu_publish"
+                android:icon="@drawable/ic_menu_publish_light"
                 android:showAsAction="ifRoom"
                 android:title="@string/selection_toggle_published"/>
             <item
                 android:id="@+id/selection_select_none"
-                android:icon="@android:drawable/ic_menu_close_clear_cancel"
                 android:showAsAction=""
                 android:title="@string/selection_select_none"/>
         </group>
         <group android:id="@+id/menu_group_article" >
             <item
                 android:id="@+id/toggle_marked"
-                android:icon="@drawable/ic_menu_marked"
+                android:icon="@drawable/ic_unimportant_light"
                 android:showAsAction="ifRoom"
                 android:title="@string/article_toggle_marked"/>
             <item
                 android:id="@+id/toggle_published"
-                android:icon="@drawable/ic_menu_publish"
+                android:icon="@drawable/ic_menu_publish_light"
                 android:showAsAction="ifRoom"
                 android:title="@string/article_toggle_published"/>
             <item
@@ -120,7 +119,7 @@
                 android:title="@string/article_set_unread"/>
             <item
                 android:id="@+id/toggle_attachments"
-                android:icon="@drawable/ic_menu_attaches"
+                android:icon="@drawable/ic_menu_attaches_light"
                 android:showAsAction="ifRoom"
                 android:title="@string/attachments_prompt"/>            
             <item
diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml
index 181cae90..bc7d3397 100644
--- a/res/menu/offline_menu.xml
+++ b/res/menu/offline_menu.xml
@@ -8,25 +8,17 @@
             android:title="@string/go_online"
             android:visible="false"/>
 
-        <!--
-              <item
-            android:id="@+id/back_to_categories"
-            android:icon="@android:drawable/ic_menu_close_clear_cancel"
-            android:showAsAction="ifRoom|withText"
-            android:title="@string/back_to_categories"/>
-        -->
-
         <item
             android:id="@+id/show_feeds"
-            android:icon="@android:drawable/ic_menu_agenda"
-            android:showAsAction=""
+            android:icon="@drawable/ic_list_light"
+            android:showAsAction="ifRoom"
             android:title="@string/menu_all_feeds"/>
     </group>
     <group android:id="@+id/menu_group_headlines" >
         <item
             android:id="@+id/search"
             android:actionViewClass="android.widget.SearchView"
-            android:icon="@android:drawable/ic_menu_search"
+            android:icon="@drawable/ic_search_light"
             android:showAsAction="ifRoom|collapseActionView"
             android:title="@string/search"/>
         <item
@@ -36,11 +28,6 @@
             android:id="@+id/headlines_select"
             android:showAsAction=""
             android:title="@string/headlines_select"/>
-        <!-- <item
-                android:id="@+id/close_feed"
-                android:icon="@android:drawable/ic_menu_close_clear_cancel"
-                android:showAsAction=""
-                android:title="@string/close_feed"/> -->
     </group>
     <group android:id="@+id/menu_group_headlines_selection" >
         <item
@@ -49,29 +36,28 @@
             android:title="@string/selection_toggle_unread"/>
         <item
             android:id="@+id/selection_toggle_marked"
-            android:icon="@drawable/ic_menu_marked"
+            android:icon="@drawable/ic_unimportant_light"
             android:showAsAction="ifRoom"
             android:title="@string/selection_toggle_marked"/>
         <item
             android:id="@+id/selection_toggle_published"
-            android:icon="@drawable/ic_menu_publish"
+            android:icon="@drawable/ic_menu_publish_light"
             android:showAsAction="ifRoom"
             android:title="@string/selection_toggle_published"/>
         <item
             android:id="@+id/selection_select_none"
-            android:icon="@android:drawable/ic_menu_close_clear_cancel"
             android:showAsAction=""
             android:title="@string/selection_select_none"/>
     </group>
     <group android:id="@+id/menu_group_article" >
         <item
             android:id="@+id/toggle_marked"
-            android:icon="@drawable/ic_menu_marked"
+            android:icon="@drawable/ic_unimportant_light"
             android:showAsAction="ifRoom"
             android:title="@string/article_toggle_marked"/>
         <item
             android:id="@+id/toggle_published"
-            android:icon="@drawable/ic_menu_publish"
+            android:icon="@drawable/ic_menu_publish_light"
             android:showAsAction="ifRoom"
             android:title="@string/article_toggle_published"/>
         <item
@@ -82,22 +68,16 @@
             android:title="@string/share_article"/>
         <item
             android:id="@+id/set_unread"
-            android:icon="@android:drawable/ic_menu_recent_history"
+            android:icon="@drawable/ic_undo_light"
             android:showAsAction=""
             android:title="@string/article_set_unread"/>
         <item
             android:id="@+id/catchup_above"
             android:title="@string/article_mark_read_above"/>
-        <!-- <item
-                android:id="@+id/close_article"
-                android:icon="@android:drawable/ic_menu_close_clear_cancel"
-                android:showAsAction=""
-                android:title="@string/close_article"/>      -->
     </group>
 
     <item
         android:id="@+id/preferences"
-        android:icon="@android:drawable/ic_menu_preferences"
         android:showAsAction=""
         android:title="@string/preferences"/>