material design icon overhaul

209 files changed, 108 insertions, 235 deletions

diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 54b85a8c..7b1dd39f 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="329"
-    android:versionName="1.103" >
+    android:versionCode="330"
+    android:versionName="1.104" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
index eb89e480..969a11f2 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -509,18 +509,6 @@ public class FeedCategoriesFragment extends Fragment implements OnItemClickListe
 				tu.setVisibility((cat.unread > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 			
-			ImageView icon = (ImageView)v.findViewById(R.id.icon);
-			
-			if (icon != null) {
-                if (m_activity.isDarkTheme()) {
-                    icon.setImageResource(R.drawable.ic_published);
-                } else {
-                    icon.setImageResource(R.drawable.ic_menu_published_dark);
-                }
-
-				//icon.setImageResource(cat.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-			}
-
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index b7f0bee6..42e32f20 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -680,53 +680,6 @@ public class FeedsFragment extends Fragment implements OnItemClickListener, OnSh
 				tu.setVisibility((feed.unread > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 			
-			ImageView icon = (ImageView)v.findViewById(R.id.icon);
-			
-			if (icon != null) {
-
-                if ((feed.is_cat && feed.always_display_as_feed) || (!feed.is_cat && feed.id == -4)) {
-                    icon.setImageResource(R.drawable.ic_published_special);
-                /* } else if (m_enableFeedIcons) {
-					
-					try {
-						File storage = m_activity.getExternalCacheDir();
-						
-						File iconFile = new  File(storage.getAbsolutePath() + ICON_PATH + feed.id + ".ico");
-						if (iconFile.exists()) {
-							Bitmap bmpOrig = BitmapFactory.decodeFile(iconFile.getAbsolutePath());		
-							if (bmpOrig != null) {
-								icon.setImageBitmap(bmpOrig);
-							}
-						} else {
-                            if (m_activity.isDarkTheme()) {
-                                icon.setImageResource(R.drawable.ic_published);
-                            } else {
-                                icon.setImageResource(R.drawable.ic_menu_published_dark);
-                            }
-
-							//icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-						}
-					} catch (NullPointerException e) {
-						//icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-                        if (m_activity.isDarkTheme()) {
-                            icon.setImageResource(R.drawable.ic_published);
-                        } else {
-                            icon.setImageResource(R.drawable.ic_menu_published_dark);
-                        }
-					} */
-					
-				} else {
-					//icon.setImageResource(feed.unread > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-
-                    if (m_activity.isDarkTheme()) {
-                        icon.setImageResource(R.drawable.ic_published);
-                    } else {
-                        icon.setImageResource(R.drawable.ic_menu_published_dark);
-                    }
-				}
-				
-			}
-			
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index 81fd3a09..4a8f7ece 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -819,7 +819,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			
 			
 			if (holder.markedView != null) {
-				holder.markedView.setImageResource(article.marked ? R.drawable.ic_star_full : R.drawable.ic_star_empty);
+				holder.markedView.setImageResource(article.marked ? R.drawable.ic_star_dark : R.drawable.ic_star_outline_dark);
 				
 				holder.markedView.setOnClickListener(new OnClickListener() {
 					
@@ -836,7 +836,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 			
 			
 			if (holder.publishedView != null) {
-				holder.publishedView.setImageResource(article.published ? R.drawable.ic_published : R.drawable.ic_unpublished);
+				holder.publishedView.setImageResource(article.published ? R.drawable.ic_checkbox_marked_dark : R.drawable.ic_rss_box_dark);
 				
 				holder.publishedView.setOnClickListener(new OnClickListener() {
 					
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index b8da6469..765b64fc 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -920,6 +920,14 @@ public class OnlineActivity extends CommonActivity {
 				if (hf != null) hf.notifyUpdated();
 			}
 			return true;
+			case R.id.toggle_unread:
+				if (ap != null & ap.getSelectedArticle() != null) {
+					Article a = ap.getSelectedArticle();
+					a.unread = !a.unread;
+					saveArticleUnread(a);
+					if (hf != null) hf.notifyUpdated();
+				}
+				return true;
 		/* case R.id.selection_select_none:
 			if (hf != null) {
 				ArticleList selected = hf.getSelectedArticles();
@@ -1549,11 +1557,14 @@ public class OnlineActivity extends CommonActivity {
 				Article article = ap.getSelectedArticle();
 				
 				if (article != null) {
-					m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.ic_important_light :
-						R.drawable.ic_unimportant_light);
+					m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.ic_star :
+						R.drawable.ic_star_outline);
+
+					m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.ic_checkbox_marked :
+						R.drawable.ic_rss_box);
 
-					m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.ic_menu_published_light :
-						R.drawable.ic_menu_unpublished_light);
+					m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.ic_email :
+							R.drawable.ic_email_open);
 				}
 			}
 			
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
index 79b70984..a7bcacb2 100644..100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java
@@ -586,11 +586,11 @@ public class OfflineActivity extends CommonActivity {
 					boolean marked = article.getInt(article.getColumnIndex("marked")) == 1;
 					boolean published = article.getInt(article.getColumnIndex("published")) == 1;
 
-					m_menu.findItem(R.id.toggle_marked).setIcon(marked ? R.drawable.ic_important_light :
-						R.drawable.ic_unimportant_light);
+					m_menu.findItem(R.id.toggle_marked).setIcon(marked ? R.drawable.ic_star :
+						R.drawable.ic_star_outline);
 
-					m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.ic_menu_published_light :
-						R.drawable.ic_menu_unpublished_light);
+					m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.ic_checkbox_marked :
+						R.drawable.ic_rss_box);
 
 					article.close();
 				}				
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
index c9e445d7..7a0702bc 100644..100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java
@@ -279,12 +279,6 @@ public class OfflineFeedCategoriesFragment extends Fragment implements OnItemCli
 				tu.setVisibility((cursor.getInt(cursor.getColumnIndex("unread")) > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
 			
-			ImageView icon = (ImageView)v.findViewById(R.id.icon);
-			
-			if (icon != null) {
-				icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-			}
-			
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
 			if (ib != null) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
index 520ff84a..4024219f 100644..100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java
@@ -316,34 +316,6 @@ public class OfflineFeedsFragment extends Fragment implements OnItemClickListene
 				tu.setText(String.valueOf(cursor.getInt(cursor.getColumnIndex("unread"))));
 				tu.setVisibility((cursor.getInt(cursor.getColumnIndex("unread")) > 0) ? View.VISIBLE : View.INVISIBLE);
 			}
-			
-			ImageView icon = (ImageView)v.findViewById(R.id.icon);
-			
-			if (icon != null) {
-				
-				if (m_enableFeedIcons) {
-					
-					try {
-						File storage = Environment.getExternalStorageDirectory();
-						
-						File iconFile = new File(storage.getAbsolutePath() + ICON_PATH + cursor.getInt(cursor.getColumnIndex(BaseColumns._ID)) + ".ico");
-						if (iconFile.exists()) {
-							Bitmap bmpOrig = BitmapFactory.decodeFile(iconFile.getAbsolutePath());		
-							if (bmpOrig != null) {
-								icon.setImageBitmap(bmpOrig);
-							}
-						} else {
-							icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-						}
-					} catch (NullPointerException e) {
-						icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-					}
-					
-				} else {
-					icon.setImageResource(cursor.getInt(cursor.getColumnIndex("unread")) > 0 ? R.drawable.ic_published : R.drawable.ic_unpublished);
-				}
-				
-			}
 
 			ImageButton ib = (ImageButton) v.findViewById(R.id.feed_menu_button);
 			
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index a0af5bc7..dcc05097 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -655,7 +655,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			}
 			
 			if (holder.markedView != null) {
-				holder.markedView.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? R.drawable.ic_star_full : R.drawable.ic_star_empty);
+				holder.markedView.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? R.drawable.ic_star_dark : R.drawable.ic_star_outline_dark);
 				
 				holder.markedView.setOnClickListener(new OnClickListener() {
 
@@ -674,7 +674,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			}
 			
 			if (holder.publishedView != null) {
-				holder.publishedView.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_published : R.drawable.ic_unpublished);
+				holder.publishedView.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_checkbox_marked_dark : R.drawable.ic_rss_box_dark);
 				
 				holder.publishedView.setOnClickListener(new OnClickListener() {
 
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_accept_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_accept_light.png
deleted file mode 100644
index 53cf6877..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_accept_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_sort_by_size.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_sort_by_size.png
deleted file mode 100644
index d4404a37..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_sort_by_size.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png
new file mode 100755
index 00000000..0524c180
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_bookmark_outline_plus.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_bookmark_outline_plus.png
new file mode 100755
index 00000000..0e3ceeb0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_bookmark_outline_plus.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_check.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_check.png
new file mode 100755
index 00000000..748054eb
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_check.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_check_all.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_check_all.png
new file mode 100755
index 00000000..05bb51a0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_check_all.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png
new file mode 100755
index 00000000..c8a1fa5c
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png
new file mode 100755
index 00000000..76b0a356
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png
new file mode 100755
index 00000000..63966308
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_light.png
deleted file mode 100644
index a1d27cec..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png
new file mode 100755
index 00000000..97a4ea32
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_comment_plus_outline.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_comment_plus_outline.png
new file mode 100755
index 00000000..172b7466
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_comment_plus_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png
new file mode 100755
index 00000000..6aa9ae53
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png
new file mode 100755
index 00000000..88790279
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png
new file mode 100755
index 00000000..2f108767
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter.png
new file mode 100755
index 00000000..0b90a936
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_outline.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_outline.png
new file mode 100755
index 00000000..d3543a10
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_remove.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_remove.png
new file mode 100755
index 00000000..0df23152
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_remove.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_important_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_important_light.png
deleted file mode 100644
index 11f86414..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_important_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_labels_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_labels_light.png
deleted file mode 100644
index 432e7c00..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_labels_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_list_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_list_light.png
deleted file mode 100644
index e45ea1fd..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_list_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png
new file mode 100755
index 00000000..fbf64ee3
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png
new file mode 100755
index 00000000..b47eae3a
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_magnify.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_magnify.png
new file mode 100755
index 00000000..095a18ff
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_magnify.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_attaches_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_attaches_light.png
deleted file mode 100644
index 8bf8cb78..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_attaches_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_published_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_published_dark.png
deleted file mode 100755
index f01830aa..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_published_dark.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_published_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_published_light.png
deleted file mode 100644
index 599ca764..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_published_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_unpublished_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_unpublished_light.png
deleted file mode 100644
index 6d10cb92..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_menu_unpublished_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_new_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_new_light.png
deleted file mode 100644
index ad8ada6b..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_new_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_open_in_new.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_open_in_new.png
new file mode 100755
index 00000000..293e5717
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_open_in_new.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_playlist_plus.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_playlist_plus.png
new file mode 100755
index 00000000..d6a3e550
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_playlist_plus.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_plus_circle.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_plus_circle.png
new file mode 100755
index 00000000..21e12d5d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_plus_circle.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_published.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_published.png
deleted file mode 100644
index 222e8dfc..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_published.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_published_special.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_published_special.png
deleted file mode 100644
index 21d48a33..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_published_special.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png
new file mode 100755
index 00000000..6b983700
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh_light.png
deleted file mode 100644
index bb9d855f..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss.png
new file mode 100755
index 00000000..c5e9026b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png
new file mode 100755
index 00000000..885d3824
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png
new file mode 100755
index 00000000..8f5146da
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_dark.png
new file mode 100755
index 00000000..019ec70d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_search_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_search_light.png
deleted file mode 100644
index f12e005e..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_search_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png
new file mode 100755
index 00000000..39063b0c
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select_all.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select_all.png
new file mode 100755
index 00000000..5906a6bc
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select_all.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select_all_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select_all_light.png
deleted file mode 100644
index 26a270b3..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select_all_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select_off.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select_off.png
new file mode 100755
index 00000000..10f3b63e
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select_off.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png
new file mode 100755
index 00000000..bb91c4ab
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png
new file mode 100755
index 00000000..20b6e4ea
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_light.png
deleted file mode 100644
index c329f58d..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png
new file mode 100755
index 00000000..8b2c2685
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png
new file mode 100755
index 00000000..4b848e38
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png
new file mode 100755
index 00000000..8341544f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_empty.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_empty.png
deleted file mode 100644
index ada03a19..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_empty.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_full.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_full.png
deleted file mode 100644
index 79a8263c..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_full.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png
new file mode 100755
index 00000000..6e5fb60c
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png
new file mode 100755
index 00000000..49a53391
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_unimportant_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_unimportant_light.png
deleted file mode 100644
index 7259b06b..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_unimportant_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_unpublished.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_unpublished.png
deleted file mode 100644
index b4511d65..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_unpublished.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_unread_light.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_unread_light.png
deleted file mode 100644
index d516f770..00000000
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_unread_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_accept_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_accept_light.png
deleted file mode 100644
index b52dc370..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_accept_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_sort_by_size.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_sort_by_size.png
deleted file mode 100644
index 700b9763..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_sort_by_size.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png
new file mode 100755
index 00000000..49978244
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_bookmark_outline_plus.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_bookmark_outline_plus.png
new file mode 100755
index 00000000..93d3cd71
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_bookmark_outline_plus.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_check.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_check.png
new file mode 100755
index 00000000..ab440fd0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_check.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_check_all.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_check_all.png
new file mode 100755
index 00000000..a2dae6a4
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_check_all.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png
new file mode 100755
index 00000000..fc7081b8
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png
new file mode 100755
index 00000000..ebaa9db3
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png
new file mode 100755
index 00000000..dab24e00
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_light.png
deleted file mode 100644
index 37d98e5d..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png
new file mode 100755
index 00000000..9324ed05
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_comment_plus_outline.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_comment_plus_outline.png
new file mode 100755
index 00000000..27606611
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_comment_plus_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png
new file mode 100755
index 00000000..00bc0a56
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png
new file mode 100755
index 00000000..4ceb70f4
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png
new file mode 100755
index 00000000..792c0d18
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter.png
new file mode 100755
index 00000000..41f71f58
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_outline.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_outline.png
new file mode 100755
index 00000000..9131645f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_remove.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_remove.png
new file mode 100755
index 00000000..f61ac2f0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_remove.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_important_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_important_light.png
deleted file mode 100644
index 7576cc1e..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_important_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_labels_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_labels_light.png
deleted file mode 100644
index 8fdcd1a2..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_labels_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_list_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_list_light.png
deleted file mode 100644
index 95708234..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_list_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png
new file mode 100755
index 00000000..d31d6566
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png
new file mode 100755
index 00000000..4da77808
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_magnify.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_magnify.png
new file mode 100755
index 00000000..0c07bde0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_magnify.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_attaches_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_attaches_light.png
deleted file mode 100644
index a3e253fa..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_attaches_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_published_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_published_dark.png
deleted file mode 100755
index c8851188..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_published_dark.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_published_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_published_light.png
deleted file mode 100644
index 938ec3e3..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_published_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_unpublished_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_unpublished_light.png
deleted file mode 100644
index 7b32106b..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_menu_unpublished_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_new_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_new_light.png
deleted file mode 100644
index 23b9a1c1..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_new_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_open_in_new.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_open_in_new.png
new file mode 100755
index 00000000..0d5607da
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_open_in_new.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_playlist_plus.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_playlist_plus.png
new file mode 100755
index 00000000..3b61f7e3
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_playlist_plus.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_plus_circle.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_plus_circle.png
new file mode 100755
index 00000000..248af3f0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_plus_circle.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png
new file mode 100755
index 00000000..b3a72349
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh_light.png
deleted file mode 100644
index a7fdc0df..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss.png
new file mode 100755
index 00000000..988491b4
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png
new file mode 100755
index 00000000..e0db117f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png
new file mode 100755
index 00000000..93e0ff00
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_dark.png
new file mode 100755
index 00000000..7723b1c2
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search_light.png
deleted file mode 100644
index 3549f84d..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png
new file mode 100755
index 00000000..b96a44e9
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select_all.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select_all.png
new file mode 100755
index 00000000..84c402d2
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select_all.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select_all_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select_all_light.png
deleted file mode 100644
index 52d1155d..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select_all_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select_off.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select_off.png
new file mode 100755
index 00000000..f3a644f1
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select_off.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png
new file mode 100755
index 00000000..68d146c7
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png
new file mode 100755
index 00000000..395638df
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_light.png
deleted file mode 100644
index 15549b04..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png
new file mode 100755
index 00000000..9da50f7f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png
new file mode 100755
index 00000000..bc6f5ca1
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png
new file mode 100755
index 00000000..25ed594c
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png
new file mode 100755
index 00000000..88b16a05
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png
new file mode 100755
index 00000000..a41331e8
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_unimportant_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_unimportant_light.png
deleted file mode 100644
index 3c618a12..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_unimportant_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_unread_light.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_unread_light.png
deleted file mode 100644
index 606c902c..00000000
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_unread_light.png
+++ /dev/null
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png
new file mode 100755
index 00000000..2985253f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_bookmark_outline_plus.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_bookmark_outline_plus.png
new file mode 100755
index 00000000..8aa7533b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_bookmark_outline_plus.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_check.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_check.png
new file mode 100755
index 00000000..6b86e054
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_check.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_check_all.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_check_all.png
new file mode 100755
index 00000000..a09625f0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_check_all.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png
new file mode 100755
index 00000000..b73a44e9
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png
new file mode 100755
index 00000000..b7511178
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png
new file mode 100755
index 00000000..035fef0d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png
new file mode 100755
index 00000000..58bdc1da
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_comment_plus_outline.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_comment_plus_outline.png
new file mode 100755
index 00000000..78d36ff3
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_comment_plus_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png
new file mode 100755
index 00000000..bacb5799
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png
new file mode 100755
index 00000000..c8390860
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png
new file mode 100755
index 00000000..e05e339f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter.png
new file mode 100755
index 00000000..e7b330ce
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_outline.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_outline.png
new file mode 100755
index 00000000..5d4eeab5
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_remove.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_remove.png
new file mode 100755
index 00000000..1242e467
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_remove.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png
new file mode 100755
index 00000000..4b5848b0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png
new file mode 100755
index 00000000..0f31750f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_magnify.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_magnify.png
new file mode 100755
index 00000000..e2303782
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_magnify.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_open_in_new.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_open_in_new.png
new file mode 100755
index 00000000..27ba780a
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_open_in_new.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_playlist_plus.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_playlist_plus.png
new file mode 100755
index 00000000..7f6d5f4c
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_playlist_plus.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_plus_circle.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_plus_circle.png
new file mode 100755
index 00000000..65e3ccc0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_plus_circle.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png
new file mode 100755
index 00000000..9ab6da59
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss.png
new file mode 100755
index 00000000..44c47a56
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png
new file mode 100755
index 00000000..9fa15935
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png
new file mode 100755
index 00000000..bcc52756
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_dark.png
new file mode 100755
index 00000000..a7da4217
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png
new file mode 100755
index 00000000..eb3b46b2
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select_all.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select_all.png
new file mode 100755
index 00000000..10201bdf
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select_all.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select_off.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select_off.png
new file mode 100755
index 00000000..77f1d934
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select_off.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png
new file mode 100755
index 00000000..e8b1c6ae
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png
new file mode 100755
index 00000000..b575ca0a
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png
new file mode 100755
index 00000000..e80d2c75
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png
new file mode 100755
index 00000000..413071bb
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png
new file mode 100755
index 00000000..1eefb352
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png
new file mode 100755
index 00000000..7ef47922
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png
new file mode 100755
index 00000000..4d74c058
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png
new file mode 100755
index 00000000..20cf967d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_bookmark_outline_plus.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_bookmark_outline_plus.png
new file mode 100755
index 00000000..61264221
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_bookmark_outline_plus.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_check.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_check.png
new file mode 100755
index 00000000..27907500
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_check.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_check_all.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_check_all.png
new file mode 100755
index 00000000..0102f15b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_check_all.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png
new file mode 100755
index 00000000..748346c1
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png
new file mode 100755
index 00000000..af02b1ae
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png
new file mode 100755
index 00000000..c5ad32ac
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png
new file mode 100755
index 00000000..65fa3ca0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_comment_plus_outline.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_comment_plus_outline.png
new file mode 100755
index 00000000..e55db52f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_comment_plus_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png
new file mode 100755
index 00000000..ab83372b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png
new file mode 100755
index 00000000..261b19a6
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png
new file mode 100755
index 00000000..0fef31b1
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter.png
new file mode 100755
index 00000000..01c32325
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_outline.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_outline.png
new file mode 100755
index 00000000..d2075a73
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_remove.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_remove.png
new file mode 100755
index 00000000..34179328
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_remove.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png
new file mode 100755
index 00000000..6dc306b8
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png
new file mode 100755
index 00000000..bf3bc182
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_magnify.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_magnify.png
new file mode 100755
index 00000000..54fd959e
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_magnify.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_open_in_new.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_open_in_new.png
new file mode 100755
index 00000000..bc64e804
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_open_in_new.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_playlist_plus.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_playlist_plus.png
new file mode 100755
index 00000000..ff2c3253
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_playlist_plus.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_plus_circle.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_plus_circle.png
new file mode 100755
index 00000000..9adf0bb0
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_plus_circle.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png
new file mode 100755
index 00000000..0bbbcc4f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss.png
new file mode 100755
index 00000000..b794588e
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png
new file mode 100755
index 00000000..e718cd0f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png
new file mode 100755
index 00000000..44f77bdc
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_dark.png
new file mode 100755
index 00000000..810edc36
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png
new file mode 100755
index 00000000..b7e451a8
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select_all.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select_all.png
new file mode 100755
index 00000000..29d9e392
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select_all.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select_off.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select_off.png
new file mode 100755
index 00000000..6034f66d
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select_off.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png
new file mode 100755
index 00000000..140862d1
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png
new file mode 100755
index 00000000..3fc5a65c
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png
new file mode 100755
index 00000000..7f6d5d70
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png
new file mode 100755
index 00000000..3a274515
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png
new file mode 100755
index 00000000..59896fc4
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png
new file mode 100755
index 00000000..52ed7ecf
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png
new file mode 100755
index 00000000..c336bfee
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
index 91b65b4d..86e87263 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
@@ -15,12 +15,12 @@
     <ImageView
         android:id="@+id/icon"
         android:layout_gravity="center_vertical"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
         android:layout_weight="0"
         android:scaleType="fitXY"
         android:visibility="invisible"
-        android:src="@drawable/ic_unpublished" />
+        android:src="?ic_rss_box" />
 
     <TextView
         android:fontFamily="sans-serif-medium"
@@ -29,7 +29,7 @@
         android:gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
-        android:paddingLeft="40dp"
+        android:paddingLeft="30dp"
         android:singleLine="true"
         android:text=".."
         android:paddingBottom="2dp"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
index 3cb5433f..dd138b20 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
@@ -15,11 +15,11 @@
     <ImageView
         android:id="@+id/icon"
         android:layout_gravity="center_vertical"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
         android:layout_weight="0"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_menu_published_dark" />
+        android:src="?ic_rss_box" />
 
     <TextView
         android:id="@+id/title"
@@ -29,7 +29,7 @@
         android:gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
-        android:paddingLeft="40dp"
+        android:paddingLeft="30dp"
         android:singleLine="true"
         android:text="Feed"
         android:paddingBottom="2dp"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
index eacf3e96..bddf12c3 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
@@ -16,11 +16,11 @@
     <ImageView
         android:id="@+id/icon"
         android:layout_gravity="center_vertical"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
         android:layout_weight="0"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_menu_published_dark" />
+        android:src="?ic_rss_box" />
 
     <TextView
         android:id="@+id/title"
@@ -30,7 +30,7 @@
         android:gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
-        android:paddingLeft="40dp"
+        android:paddingLeft="30dp"
         android:singleLine="true"
         android:text="Feed"
         android:paddingBottom="2dp"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index 56b3f65d..d835d41e 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/headlines_row"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
     tools:ignore="HardcodedText" >
 
     <TableLayout
@@ -155,22 +155,22 @@
                 <ImageView
                     android:id="@+id/marked"
                     android:layout_width="wrap_content"
-                    android:layout_height="16dp"
+                    android:layout_height="24dp"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_star_empty" />
+                    android:src="@drawable/ic_star_outline_dark" />
 
                 <ImageView
                     android:id="@+id/published"
                     android:layout_width="wrap_content"
-                    android:layout_height="16dp"
+                    android:layout_height="24dp"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_unpublished" />
+                    android:src="@drawable/ic_rss_box_dark" />
 
                 <ImageView
                     android:id="@+id/article_menu_button"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
index e36ced56..8e809ca9 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
@@ -111,7 +111,7 @@
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="@drawable/ic_star_empty" />
+            android:src="@drawable/ic_star_outline_dark" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
index ecf4930a..175b0ca3 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
@@ -113,7 +113,7 @@
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="@drawable/ic_star_empty" />
+            android:src="@drawable/ic_star_outline_dark" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
index a2c37ba6..0764b60b 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
@@ -113,7 +113,7 @@
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="@drawable/ic_star_empty" />
+            android:src="@drawable/ic_star_outline_dark" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index 98195aab..c12bc1f3 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -157,22 +157,22 @@
                 <ImageView
                     android:id="@+id/marked"
                     android:layout_width="wrap_content"
-                    android:layout_height="16dp"
+                    android:layout_height="24dp"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_star_empty" />
+                    android:src="@drawable/ic_star_outline_dark" />
 
                 <ImageView
                     android:id="@+id/published"
                     android:layout_width="wrap_content"
-                    android:layout_height="16dp"
+                    android:layout_height="24dp"
                     android:paddingLeft="4dp"
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_unpublished" />
+                    android:src="@drawable/ic_checkbox_marked_dark" />
 
                 <ImageView
                     android:id="@+id/article_menu_button"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
index a9c546e6..3d656b50 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
@@ -113,7 +113,7 @@
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="@drawable/ic_star_empty" />
+            android:src="@drawable/ic_star_outline_dark" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml b/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml
index 5e6a41ed..52855d14 100644..100755
--- a/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml
@@ -7,10 +7,11 @@
     <item
         android:id="@+id/article_img_copy"
         app:showAsAction=""
+        android:icon="@drawable/ic_content_copy"
         android:title="@string/article_link_copy"/>
     <item
         android:id="@+id/article_img_share"
-        android:icon="@drawable/ic_share_light"
+        android:icon="@drawable/ic_share"
         app:showAsAction="ifRoom"
         android:title="@string/article_img_share"/>
     <item
diff --git a/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml b/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml
index fdf18233..b3afdafc 100644..100755
--- a/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml
@@ -3,18 +3,18 @@
     <item
         android:id="@+id/selection_toggle_unread"
         app:showAsAction="always"
-        android:icon="@drawable/ic_unread_light"
+        android:icon="@drawable/ic_email_open"
         android:title="@string/selection_toggle_unread"/>
 
     <item
         android:id="@+id/selection_toggle_marked"
-        android:icon="@drawable/ic_unimportant_light"
+        android:icon="@drawable/ic_star_outline"
         app:showAsAction="always"
         android:title="@string/selection_toggle_marked"/>
 
     <item
         android:id="@+id/selection_toggle_published"
-        android:icon="@drawable/ic_menu_unpublished_light"
+        android:icon="@drawable/ic_rss_box"
         app:showAsAction="always"
         android:title="@string/selection_toggle_published"/>
 
diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml
index 1abfff28..6e163a60 100644..100755
--- a/org.fox.ttrss/src/main/res/menu/main_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml
@@ -3,136 +3,101 @@
     <group android:id="@+id/menu_group_logged_in" >
         <group android:id="@+id/menu_group_feeds" >
 
-            <!--
-                 <item
-                android:id="@+id/back_to_categories"
-                android:icon="@android:drawable/ic_menu_close_clear_cancel"
-                app:showAsAction=""
-                android:title="@string/back_to_categories"/>
-            -->
-
             <item
                 android:id="@+id/subscribe_to_feed"
-                android:icon="@drawable/ic_new_light"
-                app:showAsAction=""
+                android:icon="@drawable/ic_plus_circle"
+                app:showAsAction="ifRoom"
                 android:title="@string/subscribe_to_feed"/>
 
             <item
                 android:id="@+id/show_feeds"
-                android:icon="@drawable/ic_list_light"
+                android:icon="@drawable/ic_filter_remove"
                 app:showAsAction=""
                 android:title="@string/menu_all_feeds"/>
             <item
                 android:id="@+id/go_offline"
-                android:icon="@drawable/ic_cloud_light"
+                android:icon="@drawable/ic_cloud_download"
                 app:showAsAction="ifRoom"
                 android:title="@string/go_offline"/>            
             <item
                 android:id="@+id/update_feeds"
-                android:icon="@drawable/ic_refresh_light"
+                android:icon="@drawable/ic_refresh"
                 app:showAsAction=""
                 android:title="@string/update_feeds"/>
             <item
                 android:id="@+id/logout"
+                android:icon="@drawable/ic_logout"
                 app:showAsAction=""
                 android:title="@string/logout"/>
         </group>
         <group android:id="@+id/menu_group_headlines" >
             <item
                 android:id="@+id/update_headlines"
-                android:icon="@drawable/ic_refresh_light" 
+                android:icon="@drawable/ic_refresh"
                 app:showAsAction=""
                 android:title="@string/update_headlines"/>
             <item
                 android:id="@+id/search"
-                android:icon="@drawable/ic_search_light"
+                android:icon="@drawable/ic_magnify"
                 app:showAsAction="ifRoom"
                 android:title="@string/search"/>
             <item
                 android:id="@+id/headlines_mark_as_read"
-                android:icon="@drawable/ic_accept_light"
+                android:icon="@drawable/ic_check_all"
                 app:showAsAction=""
                 android:title="@string/headlines_mark_as_read"/>
             <item
                 android:id="@+id/headlines_select"
-                app:showAsAction=""
-                android:icon="@drawable/ic_select_all_light"
+                app:showAsAction="ifRoom"
+                android:icon="@drawable/ic_select"
                 android:title="@string/headlines_select"/>
 
             <item
                 android:id="@+id/headlines_toggle_sort_order"
-                android:icon="@drawable/ic_action_sort_by_size"
+                android:icon="@drawable/ic_sort"
                 app:showAsAction="ifRoom"
                 android:title="@string/toggle_sort_order"/>
 
             <item
                 android:id="@+id/headlines_view_mode"
+                android:icon="@drawable/ic_filter_outline"
                 app:showAsAction=""
                 android:title="@string/headlines_view_mode"/>
-            
-            <!-- <item
-                android:id="@+id/headlines_toggle_sidebar"
-                app:showAsAction=""
-                android:title="@string/toggle_sidebar"/> -->
-            
-            <!--
-                  <item
-                android:id="@+id/close_feed"
-                android:icon="@android:drawable/ic_menu_close_clear_cancel"
-                app:showAsAction=""
-                android:title="@string/close_feed"/>
-            -->
-
         </group>
-        <!--  <group android:id="@+id/menu_group_headlines_selection" >
-            <item
-                android:id="@+id/selection_toggle_unread"
-                app:showAsAction="ifRoom"
-                android:title="@string/selection_toggle_unread"/>
-            <item
-                android:id="@+id/selection_toggle_marked"
-                android:icon="@drawable/ic_unimportant_light"
-                app:showAsAction="ifRoom"
-                android:title="@string/selection_toggle_marked"/>
-            <item
-                android:id="@+id/selection_toggle_published"
-                android:icon="@drawable/ic_menu_unpublished_light"
-                app:showAsAction="ifRoom"
-                android:title="@string/selection_toggle_published"/>
-            <item
-                android:id="@+id/selection_select_none"
-                app: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_unimportant_light"
+                android:icon="@drawable/ic_star_outline"
                 app:showAsAction="ifRoom"
                 android:title="@string/article_toggle_marked"/>
             <item
                 android:id="@+id/toggle_published"
-                android:icon="@drawable/ic_menu_unpublished_light"
+                android:icon="@drawable/ic_rss_box"
                 app:showAsAction="ifRoom"
                 android:title="@string/article_toggle_published"/>
             <item
                 android:id="@+id/toggle_attachments"
-                android:icon="@drawable/ic_menu_attaches_light"
+                android:icon="@drawable/ic_attachment"
                 app:showAsAction=""
                 android:title="@string/attachments_prompt"/>
             <item
+                android:id="@+id/toggle_unread"
+                android:icon="@drawable/ic_email"
+                app:showAsAction=""
+                android:title="@string/article_toggle_unread"/>
+            <item
                 android:id="@+id/share_article"
-                android:icon="@drawable/ic_share_light"
+                android:icon="@drawable/ic_share"
                 app:showAsAction="ifRoom"
                 android:title="@string/share_article"/>
-            <!--  android:actionProviderClass="android.widget.ShareActionProvider" -->
             <item
                 android:id="@+id/set_labels"
                 app:showAsAction=""
-                android:icon="@drawable/ic_labels_light"
+                android:icon="@drawable/ic_bookmark_outline_plus"
                 android:title="@string/article_set_labels"/>
             <item
                 android:id="@+id/article_set_note"
+                android:icon="@drawable/ic_comment_plus_outline"
                 app:showAsAction=""
                 android:title="@string/article_set_note"/>
 
@@ -150,13 +115,14 @@
 
     <item
         android:id="@+id/preferences"
-        android:icon="@android:drawable/ic_menu_preferences"
+        android:icon="@drawable/ic_settings"
         app:showAsAction=""
         android:title="@string/preferences"/>
 
     <group android:id="@+id/menu_group_logged_out" >
         <item
             android:id="@+id/login"
+            android:icon="@drawable/ic_login"
             app:showAsAction="ifRoom"
             android:title="@string/login_login"/>
     </group>
diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
index 34633e5b..5cd45177 100644..100755
--- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
@@ -3,13 +3,13 @@
     <group android:id="@+id/menu_group_feeds" >
         <item
             android:id="@+id/go_online"
-            android:icon="@drawable/ic_cloud_light"
+            android:icon="@drawable/ic_cloud_upload"
             app:showAsAction="ifRoom|withText"
             android:title="@string/go_online"
             android:visible="false"/>
         <item
             android:id="@+id/show_feeds"
-            android:icon="@drawable/ic_list_light"
+            android:icon="@drawable/ic_filter_remove"
             app:showAsAction=""
             android:title="@string/menu_all_feeds"/>
     </group>
@@ -17,71 +17,50 @@
         <item
             android:id="@+id/search"
             app:showAsAction="ifRoom"
-            android:icon="@drawable/ic_search_light"
+            android:icon="@drawable/ic_magnify"
             android:title="@string/search"/>
         <item
             android:id="@+id/headlines_mark_as_read"
-            android:icon="@drawable/ic_accept_light"
+            android:icon="@drawable/ic_check_all"
             app:showAsAction=""
             android:title="@string/headlines_mark_as_read"/>
         <item
             android:id="@+id/headlines_select"
-            android:icon="@drawable/ic_select_all_light"
-            app:showAsAction=""
+            android:icon="@drawable/ic_select"
+            app:showAsAction="ifRoom"
             android:title="@string/headlines_select"/>
 
         <item
             android:id="@+id/headlines_toggle_sort_order"
-            android:icon="@drawable/ic_action_sort_by_size"
+            android:icon="@drawable/ic_sort"
             app:showAsAction="ifRoom"
             android:title="@string/toggle_sort_order"/>
 
         <item
             android:id="@+id/headlines_view_mode"
+            android:icon="@drawable/ic_filter_outline"
             app:showAsAction=""
             android:title="@string/headlines_view_mode"/>
-        
-        <!-- <item
-                android:id="@+id/headlines_toggle_sidebar"
-                app:showAsAction=""
-                android:title="@string/toggle_sidebar"/> -->
-    </group>
-    <!--
-    <group android:id="@+id/menu_group_headlines_selection" >
-        <item
-            android:id="@+id/selection_toggle_unread"
-            app:showAsAction="ifRoom"
-            android:title="@string/selection_toggle_unread"/>
-        <item
-            android:id="@+id/selection_toggle_marked"
-            android:icon="@drawable/ic_unimportant_light"
-            app:showAsAction="ifRoom"
-            android:title="@string/selection_toggle_marked"/>
-        <item
-            android:id="@+id/selection_toggle_published"
-            android:icon="@drawable/ic_menu_unpublished_light"
-            app:showAsAction="ifRoom"
-            android:title="@string/selection_toggle_published"/>
-        <item
-            android:id="@+id/selection_select_none"
-            app: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_unimportant_light"
+            android:icon="@drawable/ic_star_outline"
             app:showAsAction="ifRoom"
             android:title="@string/article_toggle_marked"/>
         <item
             android:id="@+id/toggle_published"
-            android:icon="@drawable/ic_menu_unpublished_light"
+            android:icon="@drawable/ic_rss_box"
             app:showAsAction="ifRoom"
             android:title="@string/article_toggle_published"/>
+        <!-- <item
+            android:id="@+id/toggle_unread"
+            android:icon="@drawable/ic_email"
+            app:showAsAction="ifRoom"
+            android:title="@string/article_toggle_unread"/> -->
         <item
             android:id="@+id/share_article"
-            android:icon="@drawable/ic_share_light"
+            android:icon="@drawable/ic_share"
             app:showAsAction="ifRoom"
             android:title="@string/share_article"/>
         <item
diff --git a/org.fox.ttrss/src/main/res/menu/share_menu.xml b/org.fox.ttrss/src/main/res/menu/share_menu.xml
index abf87ccd..40bb9237 100644..100755
--- a/org.fox.ttrss/src/main/res/menu/share_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/share_menu.xml
@@ -2,7 +2,7 @@
 
     <item
         android:id="@+id/preferences"
-        android:icon="@android:drawable/ic_menu_preferences"
+        android:icon="@drawable/ic_settings"
         app:showAsAction=""
         android:title="@string/preferences"/>
 
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index bb6a01ac..3b636cfa 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -29,4 +29,6 @@
     <attr name="articleTextColor" format="reference|color" />
     <attr name="headlineFooterColor" format="reference|color" />
     <attr name="articleHeaderSeparator" format="reference|color" />
+    <attr name="ic_rss_box" format="reference"/>
+    <attr name="ic_rss" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 865bd687..b6ba6e6d 100755
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -32,6 +32,7 @@
     <string name="blank"></string>
     <string name="transport_debugging">Log sent and received data</string>
     <string name="article_toggle_marked">(Un)Star</string>
+    <string name="article_toggle_unread">(Un)Read</string>
     <string name="article_toggle_published">(Un)Publish</string>
     <string name="headlines_select">Select articles</string>
     <string name="headlines_select_dialog">Select articles</string>
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index d82b40a8..6579e9ee 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -36,6 +36,9 @@
         <item name="colorPrimary">#6482af</item>
         <item name="colorPrimaryDark">#526A8E</item>
         <item name="colorAccent">?colorPrimary</item>
+
+        <item name="ic_rss_box">@drawable/ic_rss_box_dark</item>
+        <item name="ic_rss">@drawable/ic_rss_dark</item>
     </style>
 
     <style name="SepiaTheme" parent="LightTheme">
@@ -118,6 +121,9 @@
         <item name="colorPrimary">#51698E</item>
         <item name="colorPrimaryDark">#445877</item>
         <item name="colorAccent">#88b0f0</item>
+
+        <item name="ic_rss_box">@drawable/ic_rss_box</item>
+        <item name="ic_rss">@drawable/ic_rss</item>
     </style>
 
     <style name="DarkDialogTheme" parent="android:Theme"></style>