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 4a8f7ece..16acae05 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
@@ -815,28 +815,31 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
 				}
 				
 			}
-			
-			
-			
+
 			if (holder.markedView != null) {
-				holder.markedView.setImageResource(article.marked ? R.drawable.ic_star_dark : R.drawable.ic_star_outline_dark);
+				TypedValue tv = new TypedValue();
+				m_activity.getTheme().resolveAttribute(article.marked ? R.attr.ic_star : R.attr.ic_star_outline, tv, true);
+
+				holder.markedView.setImageResource(tv.resourceId);
 				
 				holder.markedView.setOnClickListener(new OnClickListener() {
-					
+
 					@Override
 					public void onClick(View v) {
 						article.marked = !article.marked;
 						m_adapter.notifyDataSetChanged();
-						
+
 						m_activity.saveArticleMarked(article);
 					}
 				});
 			}
-			
-			
+
 			
 			if (holder.publishedView != null) {
-				holder.publishedView.setImageResource(article.published ? R.drawable.ic_checkbox_marked_dark : R.drawable.ic_rss_box_dark);
+				TypedValue tv = new TypedValue();
+				m_activity.getTheme().resolveAttribute(article.published ? R.attr.ic_checkbox_marked : R.attr.ic_rss_box, tv, true);
+
+				holder.publishedView.setImageResource(tv.resourceId);
 				
 				holder.publishedView.setOnClickListener(new OnClickListener() {
 					
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 dcc05097..a32a55a5 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,26 +655,32 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 			}
 			
 			if (holder.markedView != null) {
-				holder.markedView.setImageResource(article.getInt(article.getColumnIndex("marked")) == 1 ? R.drawable.ic_star_dark : R.drawable.ic_star_outline_dark);
+				TypedValue tv = new TypedValue();
+				m_activity.getTheme().resolveAttribute(article.getInt(article.getColumnIndex("marked")) == 1 ? R.attr.ic_star : R.attr.ic_star_outline, tv, true);
+
+				holder.markedView.setImageResource(tv.resourceId);
 				
 				holder.markedView.setOnClickListener(new OnClickListener() {
 
-                    @Override
-                    public void onClick(View v) {
-                        SQLiteStatement stmtUpdate = m_activity.getWritableDb().compileStatement("UPDATE articles SET modified = 1, marked = NOT marked " +
-                                "WHERE " + BaseColumns._ID + " = ?");
+					@Override
+					public void onClick(View v) {
+						SQLiteStatement stmtUpdate = m_activity.getWritableDb().compileStatement("UPDATE articles SET modified = 1, marked = NOT marked " +
+								"WHERE " + BaseColumns._ID + " = ?");
 
-                        stmtUpdate.bindLong(1, articleId);
-                        stmtUpdate.execute();
-                        stmtUpdate.close();
+						stmtUpdate.bindLong(1, articleId);
+						stmtUpdate.execute();
+						stmtUpdate.close();
 
-                        refresh();
-                    }
-                });
+						refresh();
+					}
+				});
 			}
 			
 			if (holder.publishedView != null) {
-				holder.publishedView.setImageResource(article.getInt(article.getColumnIndex("published")) == 1 ? R.drawable.ic_checkbox_marked_dark : R.drawable.ic_rss_box_dark);
+				TypedValue tv = new TypedValue();
+				m_activity.getTheme().resolveAttribute(article.getInt(article.getColumnIndex("published")) == 1 ? R.attr.ic_checkbox_marked : R.attr.ic_rss_box, tv, true);
+
+				holder.publishedView.setImageResource(tv.resourceId);
 				
 				holder.publishedView.setOnClickListener(new OnClickListener() {
 
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 d835d41e..9798a892 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -160,7 +160,7 @@
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_star_outline_dark" />
+                    android:src="?ic_star_outline" />
 
                 <ImageView
                     android:id="@+id/published"
@@ -170,7 +170,7 @@
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_rss_box_dark" />
+                    android:src="?ic_rss_box" />
 
                 <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 8e809ca9..fdd60d62 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_outline_dark" />
+            android:src="?ic_star_outline" />
 
 
 
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 175b0ca3..b4bfffcb 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_outline_dark" />
+            android:src="?ic_star_outline" />
 
 
 
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 0764b60b..669ae168 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
@@ -108,12 +108,13 @@
 
         <ImageView
             android:id="@+id/marked"
+            android:tint="?headlineFooterColor"
             android:layout_width="24dp"
             android:layout_gravity="bottom|right"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="@drawable/ic_star_outline_dark" />
+            android:src="?ic_star_outline" />
 
 
 
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 c12bc1f3..04bd55da 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
@@ -162,7 +162,7 @@
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_star_outline_dark" />
+                    android:src="?ic_star_outline" />
 
                 <ImageView
                     android:id="@+id/published"
@@ -172,7 +172,7 @@
                     android:paddingRight="4dp"
                     android:layout_weight="0"
                     android:clickable="true"
-                    android:src="@drawable/ic_checkbox_marked_dark" />
+                    android:src="?ic_checkbox_marked" />
 
                 <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 3d656b50..141aae0e 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_outline_dark" />
+            android:src="?ic_star_outline" />
 
 
 
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index 3b636cfa..723b0db4 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -31,4 +31,7 @@
     <attr name="articleHeaderSeparator" format="reference|color" />
     <attr name="ic_rss_box" format="reference"/>
     <attr name="ic_rss" format="reference"/>
+    <attr name="ic_checkbox_marked" format="reference" />
+    <attr name="ic_star" format="reference" />
+    <attr name="ic_star_outline" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 6579e9ee..71c96aec 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -39,6 +39,9 @@
 
         <item name="ic_rss_box">@drawable/ic_rss_box_dark</item>
         <item name="ic_rss">@drawable/ic_rss_dark</item>
+        <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked_dark</item>
+        <item name="ic_star">@drawable/ic_star_dark</item>
+        <item name="ic_star_outline">@drawable/ic_star_outline_dark</item>
     </style>
 
     <style name="SepiaTheme" parent="LightTheme">
@@ -124,6 +127,10 @@
 
         <item name="ic_rss_box">@drawable/ic_rss_box</item>
         <item name="ic_rss">@drawable/ic_rss</item>
+        <item name="ic_checkbox_marked">@drawable/ic_checkbox_marked</item>
+        <item name="ic_star">@drawable/ic_star</item>
+        <item name="ic_star_outline">@drawable/ic_star_outline</item>
+
     </style>
 
     <style name="DarkDialogTheme" parent="android:Theme"></style>