diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md
index 3841f401..485c3708 100644
--- a/CONTRIBUTE.md
+++ b/CONTRIBUTE.md
@@ -2,7 +2,7 @@
 
 ### Registering GitHub Account
 
-Before you close the project, Please read the guide below to be able to login from FastHub.
+Before you clone the project, Please read the guide below to be able to login from FastHub.
 
 [GitHub Guide](https://auth0.com/docs/connections/social/github)
 
diff --git a/app/src/main/java/com/fastaccess/helper/ActivityHelper.java b/app/src/main/java/com/fastaccess/helper/ActivityHelper.java
index 1b1b9be7..4a1bb278 100644
--- a/app/src/main/java/com/fastaccess/helper/ActivityHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/ActivityHelper.java
@@ -14,7 +14,6 @@ import android.support.v4.app.ActivityOptionsCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.ShareCompat;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.util.Pair;
 import android.view.View;
 
@@ -36,7 +35,7 @@ public class ActivityHelper {
 
     public static void startCustomTab(@NonNull Activity context, @NonNull Uri url) {
         CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
-        builder.setToolbarColor(ContextCompat.getColor(context, R.color.primary));
+        builder.setToolbarColor(ViewHelper.getPrimaryColor(context));
         builder.setShowTitle(false);
         CustomTabsIntent tabsIntent = builder.build();
         tabsIntent.launchUrl(context, url);
diff --git a/app/src/main/java/com/fastaccess/helper/ViewHelper.java b/app/src/main/java/com/fastaccess/helper/ViewHelper.java
index c9c56755..e6785d3a 100644
--- a/app/src/main/java/com/fastaccess/helper/ViewHelper.java
+++ b/app/src/main/java/com/fastaccess/helper/ViewHelper.java
@@ -42,11 +42,27 @@ public class ViewHelper {
         return getAttr(context, R.attr.colorPrimaryDark);
     }
 
+    public static int getPrimaryColor(Context context) {
+        return getAttr(context, R.attr.colorPrimary);
+    }
+
     public static int getPrimaryTextColor(@NonNull Context context) {
         return getAttr(context, android.R.attr.textColorPrimary);
     }
 
-    public static int getAttr(Context context, int attr) {
+    public static int getAccentColor(@NonNull Context context) {
+        return getAttr(context, R.attr.colorAccent);
+    }
+
+    public static int getIconColor(@NonNull Context context) {
+        return getAttr(context, R.attr.iconColor);
+    }
+
+    public static int getWindowBackground(@NonNull Context context) {
+        return getAttr(context, android.R.attr.windowBackground);
+    }
+
+    private static int getAttr(Context context, int attr) {
         TypedValue typedValue = new TypedValue();
         TypedArray a = context.obtainStyledAttributes(typedValue.data, new int[]{attr});
         int color = a.getColor(0, 0);
@@ -58,9 +74,8 @@ public class ViewHelper {
         return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, dp, context.getResources().getDisplayMetrics());
     }
 
-    public static Drawable tintDrawable(@NonNull Drawable drawable, @ColorInt int color) {
+    public static void tintDrawable(@NonNull Drawable drawable, @ColorInt int color) {
         drawable.mutate().setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
-        return drawable;
     }
 
     public static Drawable getDrawableSelector(int normalColor, int pressedColor) {
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/AssigneesViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/AssigneesViewHolder.java
index 385621a4..547b9c81 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/AssigneesViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/AssigneesViewHolder.java
@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 
 import com.fastaccess.R;
 import com.fastaccess.data.dao.model.User;
+import com.fastaccess.helper.ViewHelper;
 import com.fastaccess.ui.AssigneesAdapter;
 import com.fastaccess.ui.widgets.AvatarLayout;
 import com.fastaccess.ui.widgets.FontTextView;
@@ -23,7 +24,6 @@ public class AssigneesViewHolder extends BaseViewHolder<User> {
     @BindView(R.id.avatarLayout) AvatarLayout avatar;
     @BindView(R.id.title) FontTextView title;
     @BindView(R.id.date) FontTextView date;
-    @BindColor(R.color.windowBackground) int windowBackground;
     @BindColor(R.color.light_gray) int lightGray;
     private AssigneesAdapter.OnSelectAssignee onSelectAssignee;
 
@@ -45,6 +45,7 @@ public class AssigneesViewHolder extends BaseViewHolder<User> {
         avatar.setUrl(user.getAvatarUrl(), user.getLogin());
         title.setText(user.getLogin());
         date.setVisibility(View.GONE);
-        itemView.setBackgroundColor(onSelectAssignee.isAssigneeSelected(getAdapterPosition()) ? lightGray : windowBackground);
+        itemView.setBackgroundColor(onSelectAssignee.isAssigneeSelected(getAdapterPosition()) ? lightGray : ViewHelper.getWindowBackground(itemView
+                .getContext()));
     }
 }
diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelsViewHolder.java
index 4bd9dbfc..d6015022 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelsViewHolder.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/LabelsViewHolder.java
@@ -13,7 +13,6 @@ import com.fastaccess.ui.adapter.LabelsAdapter;
 import com.fastaccess.ui.widgets.FontTextView;
 import com.fastaccess.ui.widgets.recyclerview.BaseViewHolder;
 
-import butterknife.BindColor;
 import butterknife.BindView;
 
 /**
@@ -25,7 +24,6 @@ public class LabelsViewHolder extends BaseViewHolder<LabelModel> {
 
     @BindView(R.id.colorImage) AppCompatImageView colorImage;
     @BindView(R.id.name) FontTextView name;
-    @BindColor(R.color.primary_text) int primaryTextColor;
     private LabelsAdapter.OnSelectLabel onSelectLabel;
 
     @Override public void onClick(View v) {
@@ -49,7 +47,7 @@ public class LabelsViewHolder extends BaseViewHolder<LabelModel> {
         if (onSelectLabel.isLabelSelected(getAdapterPosition())) {
             name.setTextColor(ViewHelper.generateTextColor(color));
         } else {
-            name.setTextColor(primaryTextColor);
+            name.setTextColor(ViewHelper.getPrimaryTextColor(itemView.getContext()));
         }
         itemView.setBackgroundColor(onSelectLabel.isLabelSelected(getAdapterPosition()) ? color : 0);
     }
diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseDialogFragment.java b/app/src/main/java/com/fastaccess/ui/base/BaseDialogFragment.java
index c1d0767f..f77fbb8d 100644
--- a/app/src/main/java/com/fastaccess/ui/base/BaseDialogFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/base/BaseDialogFragment.java
@@ -1,11 +1,13 @@
 package com.fastaccess.ui.base;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
+import android.support.v7.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -57,9 +59,12 @@ public abstract class BaseDialogFragment<V extends BaseMvp.FAView, P extends Bas
         }
     }
 
-    @Nullable @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    @SuppressLint("RestrictedApi") @Nullable @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         if (fragmentLayout() != 0) {
-            View view = inflater.inflate(fragmentLayout(), container, false);
+            final Context contextThemeWrapper = new ContextThemeWrapper(getContext(), getContext().getTheme());
+            LayoutInflater themeAwareInflater = inflater.cloneInContext(contextThemeWrapper);
+            View view = themeAwareInflater.inflate(fragmentLayout(), container, false);
             unbinder = ButterKnife.bind(this, view);
             return view;
         }
diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseFragment.java b/app/src/main/java/com/fastaccess/ui/base/BaseFragment.java
index 8d4644c6..6199a84b 100644
--- a/app/src/main/java/com/fastaccess/ui/base/BaseFragment.java
+++ b/app/src/main/java/com/fastaccess/ui/base/BaseFragment.java
@@ -1,11 +1,13 @@
 package com.fastaccess.ui.base;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
+import android.support.v7.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -58,9 +60,12 @@ public abstract class BaseFragment<V extends BaseMvp.FAView, P extends BasePrese
         }
     }
 
-    @Nullable @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    @SuppressLint("RestrictedApi") @Nullable @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         if (fragmentLayout() != 0) {
-            View view = inflater.inflate(fragmentLayout(), container, false);
+            final Context contextThemeWrapper = new ContextThemeWrapper(getContext(), getContext().getTheme());
+            LayoutInflater themeAwareInflater = inflater.cloneInContext(contextThemeWrapper);
+            View view = themeAwareInflater.inflate(fragmentLayout(), container, false);
             unbinder = ButterKnife.bind(this, view);
             return view;
         }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistView.java b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistView.java
index 0cdf5b9c..9fe0a4b3 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/gists/gist/GistView.java
@@ -52,6 +52,8 @@ public class GistView extends BaseActivity<GistMvp.View, GistPresenter>
     @BindView(R.id.startGist) ForegroundImageView startGist;
     @BindView(R.id.forkGist) ForegroundImageView forkGist;
     @BindView(R.id.detailsIcon) View detailsIcon;
+    private int accentColor;
+    private int iconColor;
 
     public static Intent createIntent(@NonNull Context context, @NonNull String gistId) {
         Intent intent = new Intent(context, GistView.class);
@@ -116,6 +118,8 @@ public class GistView extends BaseActivity<GistMvp.View, GistPresenter>
 
     @Override protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        accentColor = ViewHelper.getAccentColor(this);
+        iconColor = ViewHelper.getIconColor(this);
         if (savedInstanceState == null) {
             getPresenter().onActivityCreated(getIntent());
         } else {
@@ -173,12 +177,12 @@ public class GistView extends BaseActivity<GistMvp.View, GistPresenter>
 
     @Override public void onGistStarred(boolean isStarred) {
         startGist.setImageResource(isStarred ? R.drawable.ic_star_filled : R.drawable.ic_star);
-        startGist.tintDrawable(isStarred ? R.color.accent : R.color.primary_text);
+        startGist.tintDrawableColor(isStarred ? accentColor : iconColor);
         startGist.setEnabled(true);
     }
 
     @Override public void onGistForked(boolean isForked) {
-        forkGist.tintDrawable(isForked ? R.color.accent : R.color.primary_text);
+        forkGist.tintDrawableColor(isForked ? accentColor : iconColor);
         forkGist.setEnabled(true);
     }
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
index 9942d1dc..2e50f468 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
@@ -7,7 +7,6 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.NavigationView;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.view.Menu;
@@ -111,7 +110,7 @@ public class MainView extends BaseActivity<MainMvp.View, MainPresenter> implemen
     @Override public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.search_menu, menu);
         if (isLoggedIn() && Notification.hasUnreadNotifications()) {
-            ViewHelper.tintDrawable(menu.findItem(R.id.notifications).getIcon(), ContextCompat.getColor(this, R.color.accent));
+            ViewHelper.tintDrawable(menu.findItem(R.id.notifications).getIcon(), ViewHelper.getAccentColor(this));
         }
         return super.onCreateOptionsMenu(menu);
     }
@@ -124,7 +123,7 @@ public class MainView extends BaseActivity<MainMvp.View, MainPresenter> implemen
             startActivity(new Intent(this, SearchView.class));
             return true;
         } else if (item.getItemId() == R.id.notifications) {
-            ViewHelper.tintDrawable(item.getIcon(), ContextCompat.getColor(this, R.color.primary_text));
+            ViewHelper.tintDrawable(item.getIcon(), ViewHelper.getPrimaryTextColor(this));
             startActivity(new Intent(this, NotificationActivityView.class));
             return true;
         }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivityView.java b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivityView.java
index 637c1f85..522c4e42 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivityView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/notification/NotificationActivityView.java
@@ -25,7 +25,6 @@ public class NotificationActivityView extends BaseActivity {
     private NotificationsView notificationsView;
     private boolean userSelectedSpinner = false;
 
-
     @Override protected int layout() {
         return R.layout.notification_activity_layout;
     }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java
index 6803af20..2f9ad082 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/RepoPagerView.java
@@ -9,7 +9,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.TextViewCompat;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -28,6 +27,7 @@ import com.fastaccess.helper.InputHelper;
 import com.fastaccess.helper.ParseDateFormat;
 import com.fastaccess.helper.PrefGetter;
 import com.fastaccess.helper.TypeFaceHelper;
+import com.fastaccess.helper.ViewHelper;
 import com.fastaccess.provider.tasks.git.GithubActionService;
 import com.fastaccess.ui.base.BaseActivity;
 import com.fastaccess.ui.modules.repos.code.RepoCodePagerView;
@@ -40,7 +40,6 @@ import com.fastaccess.ui.widgets.dialog.MessageDialogView;
 
 import java.text.NumberFormat;
 
-import butterknife.BindColor;
 import butterknife.BindView;
 import butterknife.OnClick;
 import butterknife.OnLongClick;
@@ -62,8 +61,6 @@ public class RepoPagerView extends BaseActivity<RepoPagerMvp.View, RepoPagerPres
     @BindView(R.id.starRepo) FontTextView starRepo;
     @BindView(R.id.watchRepo) FontTextView watchRepo;
     @BindView(R.id.license) FontTextView license;
-    @BindColor(R.color.accent) int accentColor;
-    @BindColor(R.color.primary_text) int blackColor;
     @BindView(R.id.bottomNavigation) BottomNavigation bottomNavigation;
     @BindView(R.id.fab) FloatingActionButton fab;
     @BindView(R.id.language) FontTextView language;
@@ -78,8 +75,11 @@ public class RepoPagerView extends BaseActivity<RepoPagerMvp.View, RepoPagerPres
     @State @RepoPagerMvp.RepoNavigationType int navType;
     @State String login;
     @State String repoId;
+
     private NumberFormat numberFormat = NumberFormat.getNumberInstance();
     private boolean userInteracted;
+    private int accentColor;
+    private int iconColor;
 
     public static void startRepoPager(@NonNull Context context, @NonNull NameParser nameParser) {
         if (!InputHelper.isEmpty(nameParser.getName()) && !InputHelper.isEmpty(nameParser.getUsername())) {
@@ -186,6 +186,8 @@ public class RepoPagerView extends BaseActivity<RepoPagerMvp.View, RepoPagerPres
     @Override protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle("");
+        accentColor = ViewHelper.getAccentColor(this);
+        iconColor = ViewHelper.getIconColor(this);
         if (savedInstanceState == null) {
             getSupportFragmentManager()
                     .beginTransaction()
@@ -235,7 +237,7 @@ public class RepoPagerView extends BaseActivity<RepoPagerMvp.View, RepoPagerPres
         size.setVisibility(View.GONE);
         title.setText(repoModel.getFullName());
         TextViewCompat.setTextAppearance(title, R.style.TextAppearance_AppCompat_Medium);
-        title.setTextColor(ContextCompat.getColor(this, R.color.primary_text));
+        title.setTextColor(ViewHelper.getPrimaryTextColor(this));
         if (!InputHelper.isEmpty(repoModel.getLicense())) {
             licenseLayout.setVisibility(View.VISIBLE);
             license.setText(repoModel.getLicense().getSpdxId());
@@ -243,7 +245,7 @@ public class RepoPagerView extends BaseActivity<RepoPagerMvp.View, RepoPagerPres
         supportInvalidateOptionsMenu();
         if (!PrefGetter.isRepoGuideShowed()) {// the mother of nesting. #dontjudgeme.
             new MaterialTapTargetPrompt.Builder(this)
-                    .setTarget(watchRepo)
+                    .setTarget(watchRepoLayout)
                     .setPrimaryText(R.string.watch)
                     .setSecondaryText(R.string.watch_hint)
                     .setCaptureTouchEventOutsidePrompt(true)
@@ -252,7 +254,7 @@ public class RepoPagerView extends BaseActivity<RepoPagerMvp.View, RepoPagerPres
 
                         @Override public void onHidePromptComplete() {
                             new MaterialTapTargetPrompt.Builder(RepoPagerView.this)
-                                    .setTarget(starRepo)
+                                    .setTarget(starRepoLayout)
                                     .setPrimaryText(R.string.star)
                                     .setSecondaryText(R.string.star_hint)
                                     .setCaptureTouchEventOutsidePrompt(true)
@@ -261,7 +263,7 @@ public class RepoPagerView extends BaseActivity<RepoPagerMvp.View, RepoPagerPres
 
                                         @Override public void onHidePromptComplete() {
                                             new MaterialTapTargetPrompt.Builder(RepoPagerView.this)
-                                                    .setTarget(forkRepo)
+                                                    .setTarget(forkRepoLayout)
                                                     .setPrimaryText(R.string.fork)
                                                     .setSecondaryText(R.string.fork_repo_hint)
                                                     .setCaptureTouchEventOutsidePrompt(true)
@@ -274,18 +276,18 @@ public class RepoPagerView extends BaseActivity<RepoPagerMvp.View, RepoPagerPres
     }
 
     @Override public void onRepoWatched(boolean isWatched) {
-        watchRepoImage.tintDrawableColor(isWatched ? accentColor : blackColor);
+        watchRepoImage.tintDrawableColor(isWatched ? accentColor : iconColor);
         onEnableDisableWatch(true);
     }
 
     @Override public void onRepoStarred(boolean isStarred) {
         starRepoImage.setImageResource(isStarred ? R.drawable.ic_star_filled : R.drawable.ic_star);
-        starRepoImage.tintDrawableColor(isStarred ? accentColor : blackColor);
+        starRepoImage.tintDrawableColor(isStarred ? accentColor : iconColor);
         onEnableDisableStar(true);
     }
 
     @Override public void onRepoForked(boolean isForked) {
-        forkRepoImage.tintDrawableColor(isForked ? accentColor : blackColor);
+        forkRepoImage.tintDrawableColor(isForked ? accentColor : iconColor);
         onEnableDisableFork(true);
     }
 
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesView.java
index 08df4aa1..d1896ee3 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/assignees/AssigneesView.java
@@ -67,6 +67,7 @@ public class AssigneesView extends BaseDialogFragment<AssigneesMvp.View, Assigne
     }
 
     @Override protected void onFragmentCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        recycler.addKeyLineDivider();
         title.setText(R.string.assignees);
         List<User> list = getArguments().getParcelableArrayList(BundleConstant.ITEM);
         if (list != null) {
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
index 09231e03..6fc48509 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/MilestoneView.java
@@ -89,6 +89,7 @@ public class MilestoneView extends BaseFragment<MilestoneMvp.View, MilestonePres
         toolbar.inflateMenu(R.menu.add_menu);
         toolbar.setNavigationIcon(R.drawable.ic_clear);
         toolbar.setNavigationOnClickListener(v -> getActivity().finish());
+        recycler.addDivider();
         adapter = new MilestonesAdapter(getPresenter().getMilestones());
         adapter.setListener(getPresenter());
         recycler.setEmptyView(stateLayout, refresh);
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/FontAutoCompleteEditText.java b/app/src/main/java/com/fastaccess/ui/widgets/FontAutoCompleteEditText.java
index 6aa00c89..a5445716 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/FontAutoCompleteEditText.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/FontAutoCompleteEditText.java
@@ -1,14 +1,11 @@
 package com.fastaccess.ui.widgets;
 
 import android.content.Context;
-import android.support.annotation.ColorRes;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatAutoCompleteTextView;
 import android.util.AttributeSet;
 import android.view.inputmethod.EditorInfo;
 
 import com.fastaccess.helper.TypeFaceHelper;
-import com.fastaccess.helper.ViewHelper;
 
 /**
  * Created by Kosh on 8/18/2015. copyrights are reserved
@@ -38,10 +35,4 @@ public class FontAutoCompleteEditText extends AppCompatAutoCompleteTextView {
         setImeOptions(getImeOptions() | EditorInfo.IME_FLAG_NO_FULLSCREEN);
         TypeFaceHelper.applyTypeface(this);
     }
-
-    public void setTextColor(@ColorRes int normalColor, @ColorRes int pressedColor) {
-        int nColor = ContextCompat.getColor(getContext(), normalColor);
-        int pColor = ContextCompat.getColor(getContext(), pressedColor);
-        setTextColor(ViewHelper.textSelector(nColor, pColor));
-    }
 }
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/FontButton.java b/app/src/main/java/com/fastaccess/ui/widgets/FontButton.java
index da926d6d..49a48a35 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/FontButton.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/FontButton.java
@@ -1,13 +1,10 @@
 package com.fastaccess.ui.widgets;
 
 import android.content.Context;
-import android.support.annotation.ColorRes;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatButton;
 import android.util.AttributeSet;
 
 import com.fastaccess.helper.TypeFaceHelper;
-import com.fastaccess.helper.ViewHelper;
 
 
 /**
@@ -34,17 +31,4 @@ public class FontButton extends AppCompatButton {
         if (isInEditMode()) return;
         TypeFaceHelper.applyTypeface(this);
     }
-
-    public void setBackground(@ColorRes int normalColor, @ColorRes int pressedColor) {
-        int nColor = ContextCompat.getColor(getContext(), normalColor);
-        int pColor = ContextCompat.getColor(getContext(), pressedColor);
-        setBackgroundDrawable(ViewHelper.getDrawableSelector(nColor, pColor));
-    }
-
-    public void setTextColor(@ColorRes int normalColor, @ColorRes int pressedColor) {
-        int nColor = ContextCompat.getColor(getContext(), normalColor);
-        int pColor = ContextCompat.getColor(getContext(), pressedColor);
-        setTextColor(ViewHelper.textSelector(nColor, pColor));
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/FontCheckbox.java b/app/src/main/java/com/fastaccess/ui/widgets/FontCheckbox.java
index abe05601..df1c8dd3 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/FontCheckbox.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/FontCheckbox.java
@@ -1,13 +1,10 @@
 package com.fastaccess.ui.widgets;
 
 import android.content.Context;
-import android.support.annotation.ColorRes;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatCheckBox;
 import android.util.AttributeSet;
 
 import com.fastaccess.helper.TypeFaceHelper;
-import com.fastaccess.helper.ViewHelper;
 
 
 /**
@@ -34,10 +31,4 @@ public class FontCheckbox extends AppCompatCheckBox {
         if (isInEditMode()) return;
         TypeFaceHelper.applyTypeface(this);
     }
-
-    public void setTextColor(@ColorRes int normalColor, @ColorRes int pressedColor) {
-        int nColor = ContextCompat.getColor(getContext(), normalColor);
-        int pColor = ContextCompat.getColor(getContext(), pressedColor);
-        setTextColor(ViewHelper.textSelector(nColor, pColor));
-    }
 }
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/FontEditText.java b/app/src/main/java/com/fastaccess/ui/widgets/FontEditText.java
index c53a0ad6..8d5b16f9 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/FontEditText.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/FontEditText.java
@@ -1,14 +1,11 @@
 package com.fastaccess.ui.widgets;
 
 import android.content.Context;
-import android.support.annotation.ColorRes;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatEditText;
 import android.util.AttributeSet;
 import android.view.inputmethod.EditorInfo;
 
 import com.fastaccess.helper.TypeFaceHelper;
-import com.fastaccess.helper.ViewHelper;
 
 /**
  * Created by Kosh on 8/18/2015. copyrights are reserved
@@ -37,10 +34,4 @@ public class FontEditText extends AppCompatEditText {
         setImeOptions(getImeOptions() | EditorInfo.IME_FLAG_NO_FULLSCREEN);
         TypeFaceHelper.applyTypeface(this);
     }
-
-    public void setTextColor(@ColorRes int normalColor, @ColorRes int pressedColor) {
-        int nColor = ContextCompat.getColor(getContext(), normalColor);
-        int pColor = ContextCompat.getColor(getContext(), pressedColor);
-        setTextColor(ViewHelper.textSelector(nColor, pColor));
-    }
 }
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/FontRadioButton.java b/app/src/main/java/com/fastaccess/ui/widgets/FontRadioButton.java
index 22952277..15a676f9 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/FontRadioButton.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/FontRadioButton.java
@@ -1,13 +1,10 @@
 package com.fastaccess.ui.widgets;
 
 import android.content.Context;
-import android.support.annotation.ColorRes;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatRadioButton;
 import android.util.AttributeSet;
 
 import com.fastaccess.helper.TypeFaceHelper;
-import com.fastaccess.helper.ViewHelper;
 
 
 /**
@@ -34,10 +31,4 @@ public class FontRadioButton extends AppCompatRadioButton {
         if (isInEditMode()) return;
         TypeFaceHelper.applyTypeface(this);
     }
-
-    public void setTextColor(@ColorRes int normalColor, @ColorRes int pressedColor) {
-        int nColor = ContextCompat.getColor(getContext(), normalColor);
-        int pColor = ContextCompat.getColor(getContext(), pressedColor);
-        setTextColor(ViewHelper.textSelector(nColor, pColor));
-    }
 }
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/FontTextView.java b/app/src/main/java/com/fastaccess/ui/widgets/FontTextView.java
index 68a121ff..2c30f85d 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/FontTextView.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/FontTextView.java
@@ -5,9 +5,6 @@ import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.Parcelable;
 import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
@@ -73,16 +70,4 @@ public class FontTextView extends AppCompatTextView {
             }
         }
     }
-
-    public void setTextColor(@ColorRes int normalColor, @ColorRes int pressedColor) {
-        int nColor = ContextCompat.getColor(getContext(), normalColor);
-        int pColor = ContextCompat.getColor(getContext(), pressedColor);
-        setTextColor(ViewHelper.textSelector(nColor, pColor));
-    }
-
-    public void setTopDrawable(@DrawableRes int topDrawable, @ColorInt int color) {
-        Drawable drawable = ContextCompat.getDrawable(getContext(), topDrawable);
-        ViewHelper.tintDrawable(drawable, color);
-        setCompoundDrawablesRelativeWithIntrinsicBounds(null, drawable, null, null);
-    }
 }
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/ForegroundImageView.java b/app/src/main/java/com/fastaccess/ui/widgets/ForegroundImageView.java
index b43187de..887a8ee0 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/ForegroundImageView.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/ForegroundImageView.java
@@ -5,7 +5,6 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
@@ -120,10 +119,6 @@ public class ForegroundImageView extends AppCompatImageView {
         tintDrawableFromColor(colorRes);
     }
 
-    public void tintDrawable(@ColorRes int colorRes) {
-        tintDrawableFromColor(ContextCompat.getColor(getContext(), colorRes));
-    }
-
     public void tintDrawableFromColor(@ColorInt int color) {
         ViewHelper.tintDrawable(getDrawable(), color);
     }
diff --git a/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java b/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java
index 4eee19e5..f719d163 100755
--- a/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java
+++ b/app/src/main/java/com/prettifier/pretty/PrettifyWebView.java
@@ -6,7 +6,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -16,10 +15,10 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.fastaccess.R;
 import com.fastaccess.helper.AppHelper;
 import com.fastaccess.helper.InputHelper;
 import com.fastaccess.helper.Logger;
+import com.fastaccess.helper.ViewHelper;
 import com.fastaccess.provider.markdown.MarkDownProvider;
 import com.fastaccess.provider.scheme.SchemeParser;
 import com.fastaccess.ui.modules.code.CodeViewerView;
@@ -66,7 +65,7 @@ public class PrettifyWebView extends NestedWebView {
     @SuppressLint("SetJavaScriptEnabled") private void initView() {
         if (isInEditMode()) return;
         if (AppHelper.isNightMode(getResources())) {
-            setBackgroundColor(ContextCompat.getColor(getContext(), R.color.windowBackground));
+            setBackgroundColor(ViewHelper.getWindowBackground(getContext()));
         }
         setWebChromeClient(new ChromeClient());
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index ad4981cf..2cd299dd 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_announcement.xml b/app/src/main/res/drawable/ic_announcement.xml
index 7975e01b..75223c9e 100644
--- a/app/src/main/res/drawable/ic_announcement.xml
+++ b/app/src/main/res/drawable/ic_announcement.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,11h-2L11,5h2v6zM13,15h-2v-2h2v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_drop_down.xml b/app/src/main/res/drawable/ic_arrow_drop_down.xml
index c2fc5cdf..c10fb372 100644
--- a/app/src/main/res/drawable/ic_arrow_drop_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_drop_down.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M7,10l5,5 5,-5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
index 7b917715..82bfb018 100644
--- a/app/src/main/res/drawable/ic_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_at.xml b/app/src/main/res/drawable/ic_at.xml
index 38d97d2c..bac4c219 100644
--- a/app/src/main/res/drawable/ic_at.xml
+++ b/app/src/main/res/drawable/ic_at.xml
@@ -5,6 +5,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M17.42,15C17.79,14.09 18,13.07 18,12C18,8.13 15.31,5 12,5C8.69,5 6,8.13 6,12C6,15.87 8.69,19 12,19C13.54,19 15,19 16,18.22V20.55C15,21 13.46,21 12,21C7.58,21 4,16.97 4,12C4,7.03 7.58,3 12,3C16.42,3 20,7.03 20,12C20,13.85 19.5,15.57 18.65,17H14V15.5C13.36,16.43 12.5,17 11.5,17C9.57,17 8,14.76 8,12C8,9.24 9.57,7 11.5,7C12.5,7 13.36,7.57 14,8.5V8H16V15H17.42M12,9C10.9,9 10,10.34 10,12C10,13.66 10.9,15 12,15C13.1,15 14,13.66 14,12C14,10.34 13.1,9 12,9Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
index ea6953ed..6e445143 100644
--- a/app/src/main/res/drawable/ic_back.xml
+++ b/app/src/main/res/drawable/ic_back.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmark.xml b/app/src/main/res/drawable/ic_bookmark.xml
index f4d71d60..264d87c7 100644
--- a/app/src/main/res/drawable/ic_bookmark.xml
+++ b/app/src/main/res/drawable/ic_bookmark.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_branch.xml b/app/src/main/res/drawable/ic_branch.xml
index 60d199dd..98ca54bb 100644
--- a/app/src/main/res/drawable/ic_branch.xml
+++ b/app/src/main/res/drawable/ic_branch.xml
@@ -5,6 +5,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M13,14C9.64,14 8.54,15.35 8.18,16.24C9.25,16.7 10,17.76 10,19A3,3 0 0,1 7,22A3,3 0 0,1 4,19C4,17.69 4.83,16.58 6,16.17V7.83C4.83,7.42 4,6.31 4,5A3,3 0 0,1 7,2A3,3 0 0,1 10,5C10,6.31 9.17,7.42 8,7.83V13.12C8.88,12.47 10.16,12 12,12C14.67,12 15.56,10.66 15.85,9.77C14.77,9.32 14,8.25 14,7A3,3 0 0,1 17,4A3,3 0 0,1 20,7C20,8.34 19.12,9.5 17.91,9.86C17.65,11.29 16.68,14 13,14M7,18A1,1 0 0,0 6,19A1,1 0 0,0 7,20A1,1 0 0,0 8,19A1,1 0 0,0 7,18M7,4A1,1 0 0,0 6,5A1,1 0 0,0 7,6A1,1 0 0,0 8,5A1,1 0 0,0 7,4M17,6A1,1 0 0,0 16,7A1,1 0 0,0 17,8A1,1 0 0,0 18,7A1,1 0 0,0 17,6Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_brower.xml b/app/src/main/res/drawable/ic_brower.xml
index c97ceef1..784d4042 100644
--- a/app/src/main/res/drawable/ic_brower.xml
+++ b/app/src/main/res/drawable/ic_brower.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bug.xml b/app/src/main/res/drawable/ic_bug.xml
index 3963448d..a74d3d38 100644
--- a/app/src/main/res/drawable/ic_bug.xml
+++ b/app/src/main/res/drawable/ic_bug.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_clear.xml b/app/src/main/res/drawable/ic_clear.xml
index 7ecab7cc..3baf67ed 100644
--- a/app/src/main/res/drawable/ic_clear.xml
+++ b/app/src/main/res/drawable/ic_clear.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_clear_all.xml b/app/src/main/res/drawable/ic_clear_all.xml
index e15dfba9..2bccd813 100644
--- a/app/src/main/res/drawable/ic_clear_all.xml
+++ b/app/src/main/res/drawable/ic_clear_all.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M5,13h14v-2L5,11v2zM3,17h14v-2L3,15v2zM7,7v2h14L21,7L7,7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_clear_black.xml b/app/src/main/res/drawable/ic_clear_black.xml
index 82656b2f..d6e0c7c2 100644
--- a/app/src/main/res/drawable/ic_clear_black.xml
+++ b/app/src/main/res/drawable/ic_clear_black.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_code.xml b/app/src/main/res/drawable/ic_code.xml
index 0a2885e4..5f2cb40e 100644
--- a/app/src/main/res/drawable/ic_code.xml
+++ b/app/src/main/res/drawable/ic_code.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml
index a8e74d26..8a0d5f7b 100644
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
index 7a464c5b..6466ed0a 100644
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_done.xml
index 1b3f9529..1e4341e8 100644
--- a/app/src/main/res/drawable/ic_done.xml
+++ b/app/src/main/res/drawable/ic_done.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index fb8c6f14..7dd4ec38 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index db2b74f8..dfdcceb4 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
index ad666f91..1863ba1d 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_eye.xml b/app/src/main/res/drawable/ic_eye.xml
index ed95e36c..b548a8c8 100644
--- a/app/src/main/res/drawable/ic_eye.xml
+++ b/app/src/main/res/drawable/ic_eye.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_eye_off.xml b/app/src/main/res/drawable/ic_eye_off.xml
index 9897a901..77d9b4e3 100644
--- a/app/src/main/res/drawable/ic_eye_off.xml
+++ b/app/src/main/res/drawable/ic_eye_off.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zm4.31,-0.78l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_file_multi.xml b/app/src/main/res/drawable/ic_file_multi.xml
index 547b3d15..97cc8595 100644
--- a/app/src/main/res/drawable/ic_file_multi.xml
+++ b/app/src/main/res/drawable/ic_file_multi.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M15,7H20.5L15,1.5V7M8,0H16L22,6V18A2,2 0 0,1 20,20H8C6.89,20 6,19.1 6,18V2A2,2 0 0,1 8,0M4,4V22H20V24H4A2,2 0 0,1 2,22V4H4Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_fork.xml b/app/src/main/res/drawable/ic_fork.xml
index 005368d1..d12d1c5d 100644
--- a/app/src/main/res/drawable/ic_fork.xml
+++ b/app/src/main/res/drawable/ic_fork.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M6,2A3,3 0 0,1 9,5C9,6.28 8.19,7.38 7.06,7.81C7.15,8.27 7.39,8.83 8,9.63C9,10.92 11,12.83 12,14.17C13,12.83 15,10.92 16,9.63C16.61,8.83 16.85,8.27 16.94,7.81C15.81,7.38 15,6.28 15,5A3,3 0 0,1 18,2A3,3 0 0,1 21,5C21,6.32 20.14,7.45 18.95,7.85C18.87,8.37 18.64,9 18,9.83C17,11.17 15,13.08 14,14.38C13.39,15.17 13.15,15.73 13.06,16.19C14.19,16.62 15,17.72 15,19A3,3 0 0,1 12,22A3,3 0 0,1 9,19C9,17.72 9.81,16.62 10.94,16.19C10.85,15.73 10.61,15.17 10,14.38C9,13.08 7,11.17 6,9.83C5.36,9 5.13,8.37 5.05,7.85C3.86,7.45 3,6.32 3,5A3,3 0 0,1 6,2M6,4A1,1 0 0,0 5,5A1,1 0 0,0 6,6A1,1 0 0,0 7,5A1,1 0 0,0 6,4M18,4A1,1 0 0,0 17,5A1,1 0 0,0 18,6A1,1 0 0,0 19,5A1,1 0 0,0 18,4M12,18A1,1 0 0,0 11,19A1,1 0 0,0 12,20A1,1 0 0,0 13,19A1,1 0 0,0 12,18Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_fork_small.xml b/app/src/main/res/drawable/ic_fork_small.xml
index fe4980ae..451d9539 100644
--- a/app/src/main/res/drawable/ic_fork_small.xml
+++ b/app/src/main/res/drawable/ic_fork_small.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M6,2A3,3 0 0,1 9,5C9,6.28 8.19,7.38 7.06,7.81C7.15,8.27 7.39,8.83 8,9.63C9,10.92 11,12.83 12,14.17C13,12.83 15,10.92 16,9.63C16.61,8.83 16.85,8.27 16.94,7.81C15.81,7.38 15,6.28 15,5A3,3 0 0,1 18,2A3,3 0 0,1 21,5C21,6.32 20.14,7.45 18.95,7.85C18.87,8.37 18.64,9 18,9.83C17,11.17 15,13.08 14,14.38C13.39,15.17 13.15,15.73 13.06,16.19C14.19,16.62 15,17.72 15,19A3,3 0 0,1 12,22A3,3 0 0,1 9,19C9,17.72 9.81,16.62 10.94,16.19C10.85,15.73 10.61,15.17 10,14.38C9,13.08 7,11.17 6,9.83C5.36,9 5.13,8.37 5.05,7.85C3.86,7.45 3,6.32 3,5A3,3 0 0,1 6,2M6,4A1,1 0 0,0 5,5A1,1 0 0,0 6,6A1,1 0 0,0 7,5A1,1 0 0,0 6,4M18,4A1,1 0 0,0 17,5A1,1 0 0,0 18,6A1,1 0 0,0 19,5A1,1 0 0,0 18,4M12,18A1,1 0 0,0 11,19A1,1 0 0,0 12,20A1,1 0 0,0 13,19A1,1 0 0,0 12,18Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_format_bold.xml b/app/src/main/res/drawable/ic_format_bold.xml
index 655f3602..d4df9c2b 100644
--- a/app/src/main/res/drawable/ic_format_bold.xml
+++ b/app/src/main/res/drawable/ic_format_bold.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M15.6,10.79c0.97,-0.67 1.65,-1.77 1.65,-2.79 0,-2.26 -1.75,-4 -4,-4L7,4v14h7.04c2.09,0 3.71,-1.7 3.71,-3.79 0,-1.52 -0.86,-2.82 -2.15,-3.42zM10,6.5h3c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5h-3v-3zM13.5,15.5L10,15.5v-3h3.5c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_italic.xml b/app/src/main/res/drawable/ic_format_italic.xml
index 7c627aaa..c5e33943 100644
--- a/app/src/main/res/drawable/ic_format_italic.xml
+++ b/app/src/main/res/drawable/ic_format_italic.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_list_bulleted.xml b/app/src/main/res/drawable/ic_format_list_bulleted.xml
index 6b661ec5..fe661e28 100644
--- a/app/src/main/res/drawable/ic_format_list_bulleted.xml
+++ b/app/src/main/res/drawable/ic_format_list_bulleted.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_quote.xml b/app/src/main/res/drawable/ic_format_quote.xml
index 89228004..4eda6e3b 100644
--- a/app/src/main/res/drawable/ic_format_quote.xml
+++ b/app/src/main/res/drawable/ic_format_quote.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M6,17h3l2,-4L11,7L5,7v6h3zM14,17h3l2,-4L19,7h-6v6h3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_strikethrough.xml b/app/src/main/res/drawable/ic_format_strikethrough.xml
index 0d5c6efd..bb5014ad 100644
--- a/app/src/main/res/drawable/ic_format_strikethrough.xml
+++ b/app/src/main/res/drawable/ic_format_strikethrough.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M10,19h4v-3h-4v3zM5,4v3h5v3h4V7h5V4H5zM3,14h18v-2H3v2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_format_underlined.xml b/app/src/main/res/drawable/ic_format_underlined.xml
index cc01a93d..6874517c 100644
--- a/app/src/main/res/drawable/ic_format_underlined.xml
+++ b/app/src/main/res/drawable/ic_format_underlined.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,17c3.31,0 6,-2.69 6,-6L18,3h-2.5v8c0,1.93 -1.57,3.5 -3.5,3.5S8.5,12.93 8.5,11L8.5,3L6,3v8c0,3.31 2.69,6 6,6zM5,19v2h14v-2L5,19z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_gists.xml b/app/src/main/res/drawable/ic_gists.xml
index 70ffb88a..0403b515 100644
--- a/app/src/main/res/drawable/ic_gists.xml
+++ b/app/src/main/res/drawable/ic_gists.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
index 5fb60eec..e66d807e 100644
--- a/app/src/main/res/drawable/ic_github.xml
+++ b/app/src/main/res/drawable/ic_github.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_github_black.xml b/app/src/main/res/drawable/ic_github_black.xml
index 5fb60eec..e66d807e 100644
--- a/app/src/main/res/drawable/ic_github_black.xml
+++ b/app/src/main/res/drawable/ic_github_black.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_group.xml b/app/src/main/res/drawable/ic_group.xml
index 393e266b..83c610e2 100644
--- a/app/src/main/res/drawable/ic_group.xml
+++ b/app/src/main/res/drawable/ic_group.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_header_one.xml b/app/src/main/res/drawable/ic_header_one.xml
index 4dc72555..9929b5c8 100644
--- a/app/src/main/res/drawable/ic_header_one.xml
+++ b/app/src/main/res/drawable/ic_header_one.xml
@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="@color/primary_text" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M14,18V16H16V6.31L13.5,7.75V5.44L16,4H18V16H20V18H14Z" />
+    <path android:fillColor="?iconColor" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M14,18V16H16V6.31L13.5,7.75V5.44L16,4H18V16H20V18H14Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_header_three.xml b/app/src/main/res/drawable/ic_header_three.xml
index 65f1883e..2cf205a7 100644
--- a/app/src/main/res/drawable/ic_header_three.xml
+++ b/app/src/main/res/drawable/ic_header_three.xml
@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="@color/primary_text" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M15,4H19A2,2 0 0,1 21,6V16A2,2 0 0,1 19,18H15A2,2 0 0,1 13,16V15H15V16H19V12H15V10H19V6H15V7H13V6A2,2 0 0,1 15,4Z" />
+    <path android:fillColor="?iconColor" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M15,4H19A2,2 0 0,1 21,6V16A2,2 0 0,1 19,18H15A2,2 0 0,1 13,16V15H15V16H19V12H15V10H19V6H15V7H13V6A2,2 0 0,1 15,4Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_header_two.xml b/app/src/main/res/drawable/ic_header_two.xml
index 6601c6a3..b7649db5 100644
--- a/app/src/main/res/drawable/ic_header_two.xml
+++ b/app/src/main/res/drawable/ic_header_two.xml
@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="@color/primary_text" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M21,18H15A2,2 0 0,1 13,16C13,15.47 13.2,15 13.54,14.64L18.41,9.41C18.78,9.05 19,8.55 19,8A2,2 0 0,0 17,6A2,2 0 0,0 15,8H13A4,4 0 0,1 17,4A4,4 0 0,1 21,8C21,9.1 20.55,10.1 19.83,10.83L15,16H21V18Z" />
+    <path android:fillColor="?iconColor" android:pathData="M3,4H5V10H9V4H11V18H9V12H5V18H3V4M21,18H15A2,2 0 0,1 13,16C13,15.47 13.2,15 13.54,14.64L18.41,9.41C18.78,9.05 19,8.55 19,8A2,2 0 0,0 17,6A2,2 0 0,0 15,8H13A4,4 0 0,1 17,4A4,4 0 0,1 21,8C21,9.1 20.55,10.1 19.83,10.83L15,16H21V18Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml
index fb08bb54..df1bb705 100644
--- a/app/src/main/res/drawable/ic_heart.xml
+++ b/app/src/main/res/drawable/ic_heart.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index c4a807fd..37efe63c 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_image.xml b/app/src/main/res/drawable/ic_image.xml
index 3d87ce04..840bc71c 100644
--- a/app/src/main/res/drawable/ic_image.xml
+++ b/app/src/main/res/drawable/ic_image.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_incognito.xml b/app/src/main/res/drawable/ic_incognito.xml
index 55d17223..f75ef0ce 100644
--- a/app/src/main/res/drawable/ic_incognito.xml
+++ b/app/src/main/res/drawable/ic_incognito.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
-        android:pathData="M12,3C9.31,3 7.41,4.22 7.41,4.22L6,9H18L16.59,4.22C16.59,4.22 14.69,3 12,3M12,11C9.27,11 5.39,11.54 5.13,11.59C4.09,11.87 3.25,12.15 2.59,12.41C1.58,12.75 1,13 1,13H23C23,13 22.42,12.75 21.41,12.41C20.75,12.15 19.89,11.87 18.84,11.59C18.84,11.59 14.82,11 12,11M7.5,14A3.5,3.5 0 0,0 4,17.5A3.5,3.5 0 0,0 7.5,21A3.5,3.5 0 0,0 11,17.5C11,17.34 11,17.18 10.97,17.03C11.29,16.96 11.63,16.9 12,16.91C12.37,16.91 12.71,16.96 13.03,17.03C13,17.18 13,17.34 13,17.5A3.5,3.5 0 0,0 16.5,21A3.5,3.5 0 0,0 20,17.5A3.5,3.5 0 0,0 16.5,14C15.03,14 13.77,14.9 13.25,16.19C12.93,16.09 12.55,16 12,16C11.45,16 11.07,16.09 10.75,16.19C10.23,14.9 8.97,14 7.5,14M7.5,15A2.5,2.5 0 0,1 10,17.5A2.5,2.5 0 0,1 7.5,20A2.5,2.5 0 0,1 5,17.5A2.5,2.5 0 0,1 7.5,15M16.5,15A2.5,2.5 0 0,1 19,17.5A2.5,2.5 0 0,1 16.5,20A2.5,2.5 0 0,1 14,17.5A2.5,2.5 0 0,1 16.5,15Z"/>
+        android:fillColor="?iconColor"
+        android:pathData="M12,3C9.31,3 7.41,4.22 7.41,4.22L6,9H18L16.59,4.22C16.59,4.22 14.69,3 12,3M12,11C9.27,11 5.39,11.54 5.13,11.59C4.09,11.87 3.25,12.15 2.59,12.41C1.58,12.75 1,13 1,13H23C23,13 22.42,12.75 21.41,12.41C20.75,12.15 19.89,11.87 18.84,11.59C18.84,11.59 14.82,11 12,11M7.5,14A3.5,3.5 0 0,0 4,17.5A3.5,3.5 0 0,0 7.5,21A3.5,3.5 0 0,0 11,17.5C11,17.34 11,17.18 10.97,17.03C11.29,16.96 11.63,16.9 12,16.91C12.37,16.91 12.71,16.96 13.03,17.03C13,17.18 13,17.34 13,17.5A3.5,3.5 0 0,0 16.5,21A3.5,3.5 0 0,0 20,17.5A3.5,3.5 0 0,0 16.5,14C15.03,14 13.77,14.9 13.25,16.19C12.93,16.09 12.55,16 12,16C11.45,16 11.07,16.09 10.75,16.19C10.23,14.9 8.97,14 7.5,14M7.5,15A2.5,2.5 0 0,1 10,17.5A2.5,2.5 0 0,1 7.5,20A2.5,2.5 0 0,1 5,17.5A2.5,2.5 0 0,1 7.5,15M16.5,15A2.5,2.5 0 0,1 19,17.5A2.5,2.5 0 0,1 16.5,20A2.5,2.5 0 0,1 14,17.5A2.5,2.5 0 0,1 16.5,15Z"
+        tools:ignore="VectorPath"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_insert_link.xml b/app/src/main/res/drawable/ic_insert_link.xml
index 5d643c2d..de4798b7 100644
--- a/app/src/main/res/drawable/ic_insert_link.xml
+++ b/app/src/main/res/drawable/ic_insert_link.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_issues.xml b/app/src/main/res/drawable/ic_issues.xml
index d3dae049..764e1544 100644
--- a/app/src/main/res/drawable/ic_issues.xml
+++ b/app/src/main/res/drawable/ic_issues.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_label.xml b/app/src/main/res/drawable/ic_label.xml
index 8b45b965..e771cb46 100644
--- a/app/src/main/res/drawable/ic_label.xml
+++ b/app/src/main/res/drawable/ic_label.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="14.70"
         android:viewportHeight="14.70">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M7.73 1.73C7.26 1.26 6.62 1 5.96 1H3.5C2.13 1 1 2.13 1 3.5v2.47c0 .66.27 1.3.73 1.77l6.06 6.06c.39.39 1.02.39 1.41 0l4.59-4.59a.996.996 0 0 0 0-1.41L7.73 1.73zM2.38 7.09c-.31-.3-.47-.7-.47-1.13V3.5c0-.88.72-1.59 1.59-1.59h2.47c.42 0 .83.16 1.13.47l6.14 6.13-4.73 4.73-6.13-6.15zM3.01 3h2v2H3V3h.01z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index 3ba854ea..9352e82a 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
-        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
+        android:fillColor="?iconColor"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"
+        tools:ignore="VectorPath"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_license.xml b/app/src/main/res/drawable/ic_license.xml
index 1758c8f9..82885899 100644
--- a/app/src/main/res/drawable/ic_license.xml
+++ b/app/src/main/res/drawable/ic_license.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,3C10.73,3 9.6,3.8 9.18,5H3V7H4.95L2,14C1.53,16 3,17 5.5,17C8,17 9.56,16 9,14L6.05,7H9.17C9.5,7.85 10.15,8.5 11,8.83V20H2V22H22V20H13V8.82C13.85,8.5 14.5,7.85 14.82,7H17.95L15,14C14.53,16 16,17 18.5,17C21,17 22.56,16 22,14L19.05,7H21V5H14.83C14.4,3.8 13.27,3 12,3M12,5A1,1 0 0,1 13,6A1,1 0 0,1 12,7A1,1 0 0,1 11,6A1,1 0 0,1 12,5M5.5,10.25L7,14H4L5.5,10.25M18.5,10.25L20,14H17L18.5,10.25Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_list_numbers.xml b/app/src/main/res/drawable/ic_list_numbers.xml
index 918410f5..56dceed9 100644
--- a/app/src/main/res/drawable/ic_list_numbers.xml
+++ b/app/src/main/res/drawable/ic_list_numbers.xml
@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="@color/primary_text" android:pathData="M7,13H21V11H7M7,19H21V17H7M7,7H21V5H7M2,11H3.8L2,13.1V14H5V13H3.2L5,10.9V10H2M3,8H4V4H2V5H3M2,17H4V17.5H3V18.5H4V19H2V20H5V16H2V17Z" />
+    <path android:fillColor="?iconColor" android:pathData="M7,13H21V11H7M7,19H21V17H7M7,7H21V5H7M2,11H3.8L2,13.1V14H5V13H3.2L5,10.9V10H2M3,8H4V4H2V5H3M2,17H4V17.5H3V18.5H4V19H2V20H5V16H2V17Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
index 22feb929..70eb3d4f 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index 65ea7c77..cd9c083e 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml
index 382bb24d..dc1ecd68 100644
--- a/app/src/main/res/drawable/ic_logout.xml
+++ b/app/src/main/res/drawable/ic_logout.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
index 6b35e7f5..bab6618a 100644
--- a/app/src/main/res/drawable/ic_menu.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M3,18h18v-2H3v2zm0,-5h18v-2H3v2zm0,-7v2h18V6H3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_merge.xml b/app/src/main/res/drawable/ic_merge.xml
index 3b1ba519..80bb278c 100644
--- a/app/src/main/res/drawable/ic_merge.xml
+++ b/app/src/main/res/drawable/ic_merge.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M7,3A3,3 0 0,1 10,6C10,7.29 9.19,8.39 8.04,8.81C8.58,13.81 13.08,14.77 15.19,14.96C15.61,13.81 16.71,13 18,13A3,3 0 0,1 21,16A3,3 0 0,1 18,19C16.69,19 15.57,18.16 15.16,17C10.91,16.8 9.44,15.19 8,13.39V15.17C9.17,15.58 10,16.69 10,18A3,3 0 0,1 7,21A3,3 0 0,1 4,18C4,16.69 4.83,15.58 6,15.17V8.83C4.83,8.42 4,7.31 4,6A3,3 0 0,1 7,3M7,5A1,1 0 0,0 6,6A1,1 0 0,0 7,7A1,1 0 0,0 8,6A1,1 0 0,0 7,5M7,17A1,1 0 0,0 6,18A1,1 0 0,0 7,19A1,1 0 0,0 8,18A1,1 0 0,0 7,17M18,15A1,1 0 0,0 17,16A1,1 0 0,0 18,17A1,1 0 0,0 19,16A1,1 0 0,0 18,15Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_milestone.xml b/app/src/main/res/drawable/ic_milestone.xml
index a44a9881..6e412d0a 100644
--- a/app/src/main/res/drawable/ic_milestone.xml
+++ b/app/src/main/res/drawable/ic_milestone.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="14.0"
         android:viewportWidth="14.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M8 2H6V0h2v2zm4 5H2c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1h10l2 2-2 2zM8 4H6v2h2V4zM6 16h2V8H6v8z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_minus.xml b/app/src/main/res/drawable/ic_minus.xml
index 50fabe5b..3683ee6a 100644
--- a/app/src/main/res/drawable/ic_minus.xml
+++ b/app/src/main/res/drawable/ic_minus.xml
@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="@color/primary_text" android:pathData="M19,13H5V11H19V13Z" />
+    <path android:fillColor="?iconColor" android:pathData="M19,13H5V11H19V13Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_profile.xml b/app/src/main/res/drawable/ic_profile.xml
index 47cca5c5..63cc0e6b 100644
--- a/app/src/main/res/drawable/ic_profile.xml
+++ b/app/src/main/res/drawable/ic_profile.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pull_requests.xml b/app/src/main/res/drawable/ic_pull_requests.xml
index 33b01826..a9784865 100644
--- a/app/src/main/res/drawable/ic_pull_requests.xml
+++ b/app/src/main/res/drawable/ic_pull_requests.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24"
         android:viewportWidth="24">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M6,3A3,3 0 0,1 9,6C9,7.31 8.17,8.42 7,8.83V15.17C8.17,15.58 9,16.69 9,18A3,3 0 0,1 6,21A3,3 0 0,1 3,18C3,16.69 3.83,15.58 5,15.17V8.83C3.83,8.42 3,7.31 3,6A3,3 0 0,1 6,3M6,5A1,1 0 0,0 5,6A1,1 0 0,0 6,7A1,1 0 0,0 7,6A1,1 0 0,0 6,5M6,17A1,1 0 0,0 5,18A1,1 0 0,0 6,19A1,1 0 0,0 7,18A1,1 0 0,0 6,17M21,18A3,3 0 0,1 18,21A3,3 0 0,1 15,18C15,16.69 15.83,15.58 17,15.17V7H15V10.25L10.75,6L15,1.75V5H17A2,2 0 0,1 19,7V15.17C20.17,15.58 21,16.69 21,18M18,17A1,1 0 0,0 17,18A1,1 0 0,0 18,19A1,1 0 0,0 19,18A1,1 0 0,0 18,17Z"/>
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_redo.xml b/app/src/main/res/drawable/ic_redo.xml
index 99c31d7b..e29fc971 100644
--- a/app/src/main/res/drawable/ic_redo.xml
+++ b/app/src/main/res/drawable/ic_redo.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_ring.xml b/app/src/main/res/drawable/ic_ring.xml
index 674c2abf..980d5e7d 100644
--- a/app/src/main/res/drawable/ic_ring.xml
+++ b/app/src/main/res/drawable/ic_ring.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 3d0fa1ba..3381c5fa 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zm-6,0C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
index df11ef4b..459df1c1 100644
--- a/app/src/main/res/drawable/ic_send.xml
+++ b/app/src/main/res/drawable/ic_send.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 348faed6..1000ea48 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+        android:fillColor="?iconColor"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"
+        tools:ignore="VectorPath"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index e37dfdbd..56223959 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
index 6bcbf2dd..1e596d9f 100644
--- a/app/src/main/res/drawable/ic_star.xml
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_filled.xml b/app/src/main/res/drawable/ic_star_filled.xml
index 12edecb5..b25baf99 100644
--- a/app/src/main/res/drawable/ic_star_filled.xml
+++ b/app/src/main/res/drawable/ic_star_filled.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_small.xml b/app/src/main/res/drawable/ic_star_small.xml
index 63804235..dfe33e7c 100644
--- a/app/src/main/res/drawable/ic_star_small.xml
+++ b/app/src/main/res/drawable/ic_star_small.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_sync.xml b/app/src/main/res/drawable/ic_sync.xml
index 260f061a..88a852d3 100644
--- a/app/src/main/res/drawable/ic_sync.xml
+++ b/app/src/main/res/drawable/ic_sync.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_time.xml b/app/src/main/res/drawable/ic_time.xml
index 24a3d3c4..59ac6ea1 100644
--- a/app/src/main/res/drawable/ic_time.xml
+++ b/app/src/main/res/drawable/ic_time.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_time_small.xml b/app/src/main/res/drawable/ic_time_small.xml
index 1a24d8a9..e3361f0b 100644
--- a/app/src/main/res/drawable/ic_time_small.xml
+++ b/app/src/main/res/drawable/ic_time_small.xml
@@ -4,6 +4,6 @@
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_trash.xml b/app/src/main/res/drawable/ic_trash.xml
index 0cec62b3..9a156956 100644
--- a/app/src/main/res/drawable/ic_trash.xml
+++ b/app/src/main/res/drawable/ic_trash.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_undo.xml b/app/src/main/res/drawable/ic_undo.xml
index 9806baf2..6f14d47c 100644
--- a/app/src/main/res/drawable/ic_undo.xml
+++ b/app/src/main/res/drawable/ic_undo.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_unlock.xml b/app/src/main/res/drawable/ic_unlock.xml
index efe8c03b..42e0bbf3 100644
--- a/app/src/main/res/drawable/ic_unlock.xml
+++ b/app/src/main/res/drawable/ic_unlock.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/primary_text"
+        android:fillColor="?iconColor"
         android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
 </vector>
diff --git a/app/src/main/res/layouts/main_layouts/layout/settings_layout.xml b/app/src/main/res/layouts/main_layouts/layout/settings_layout.xml
index 6b969b76..8da74ff5 100644
--- a/app/src/main/res/layouts/main_layouts/layout/settings_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/settings_layout.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/windowBackground"
+    android:background="?android:attr/windowBackground"
     android:orientation="vertical">
 
     <include layout="@layout/appbar_elevation_dark"/>
diff --git a/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml b/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml
index 4b33521f..a2f049b5 100644
--- a/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml
+++ b/app/src/main/res/layouts/main_layouts/layout/title_header_layout.xml
@@ -44,7 +44,7 @@
                 android:layout_weight="1"
                 android:ellipsize="end"
                 android:maxLines="2"
-                android:textColor="@color/primary_text"
+                android:textColor="?android:textColorPrimary"
                 tools:text="One must invent the visitor in order to Bliss happens when you follow art so compassionately that whatsoever you are luring is your relativity.praise the sinner of remarkable vision."/>
 
             <com.fastaccess.ui.widgets.ForegroundImageView
diff --git a/app/src/main/res/layouts/other_layouts/layout/message_dialog.xml b/app/src/main/res/layouts/other_layouts/layout/message_dialog.xml
index f513a4f7..7e6ef4a6 100644
--- a/app/src/main/res/layouts/other_layouts/layout/message_dialog.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/message_dialog.xml
@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="@dimen/spacing_xs_large"
-        android:textColor="@color/primary_text"
+        android:textColor="?android:textColorPrimary"
         android:textStyle="bold"
         tools:text="How jolly. You loot like a mast."/>
 
@@ -43,7 +43,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:autoLink="all"
-                android:textColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
                 tools:text="Hello World"/>
         </LinearLayout>
 
diff --git a/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml b/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml
index a5cc0d33..b754af70 100644
--- a/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/simple_footer_list_dialog.xml
@@ -5,59 +5,65 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?android:attr/windowBackground"
     android:minWidth="300dp"
-    android:background="@color/card_background"
     android:orientation="vertical">
 
-    <LinearLayout
+    <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="?actionBarSize"
-        android:elevation="@dimen/spacing_micro"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-        <LinearLayout
+        <android.support.v7.widget.Toolbar
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingEnd="@dimen/spacing_normal"
-            android:paddingStart="@dimen/spacing_normal">
+            app:contentInsetEnd="0dp"
+            app:contentInsetLeft="0dp"
+            app:contentInsetRight="0dp"
+            app:contentInsetStart="0dp">
 
-            <com.fastaccess.ui.widgets.ForegroundImageView
-                android:id="@+id/cancel"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="?selectableItemBackgroundBorderless"
-                android:contentDescription="@string/back"
-                android:padding="@dimen/spacing_normal"
-                android:scaleType="centerCrop"
-                android:src="@drawable/ic_clear"/>
+                android:orientation="horizontal"
+                android:paddingEnd="@dimen/spacing_normal"
+                android:paddingStart="@dimen/spacing_normal">
 
-            <com.fastaccess.ui.widgets.FontTextView
-                android:id="@+id/title"
-                style="@style/TextAppearance.AppCompat.Title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:padding="@dimen/spacing_xs_large"
-                android:textColor="@color/primary_text"
-                android:textStyle="bold"
-                tools:text="How jolly. You loot like a mast."/>
+                <com.fastaccess.ui.widgets.ForegroundImageView
+                    android:id="@+id/cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:background="?selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/back"
+                    android:padding="@dimen/spacing_normal"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/ic_clear"/>
 
-            <com.fastaccess.ui.widgets.ForegroundImageView
-                android:id="@+id/ok"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:background="?selectableItemBackgroundBorderless"
-                android:contentDescription="@string/submit"
-                android:padding="@dimen/spacing_normal"
-                android:scaleType="centerCrop"
-                android:src="@drawable/ic_send"/>
+                <com.fastaccess.ui.widgets.FontTextView
+                    android:id="@+id/title"
+                    style="@style/TextAppearance.AppCompat.Title"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:padding="@dimen/spacing_xs_large"
+                    android:textColor="?android:textColorPrimary"
+                    android:textStyle="bold"
+                    tools:text="How jolly. You loot like a mast."/>
 
-        </LinearLayout>
+                <com.fastaccess.ui.widgets.ForegroundImageView
+                    android:id="@+id/ok"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:background="?selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/submit"
+                    android:padding="@dimen/spacing_normal"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/ic_send"/>
 
-    </LinearLayout>
+            </LinearLayout>
+        </android.support.v7.widget.Toolbar>
+    </android.support.design.widget.AppBarLayout>
 
 
     <com.fastaccess.ui.widgets.recyclerview.DynamicRecyclerView
diff --git a/app/src/main/res/layouts/other_layouts/layout/simple_list_dialog.xml b/app/src/main/res/layouts/other_layouts/layout/simple_list_dialog.xml
index 7480b06c..afd5f6dc 100644
--- a/app/src/main/res/layouts/other_layouts/layout/simple_list_dialog.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/simple_list_dialog.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/card_background"
+    android:background="?android:attr/windowBackground"
     android:orientation="vertical">
 
     <com.fastaccess.ui.widgets.FontTextView
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:minWidth="250dp"
         android:padding="@dimen/spacing_xs_large"
-        android:textColor="@color/primary_text"
+        android:textColor="?android:textColorPrimary"
         android:textStyle="bold"
         tools:text="How jolly. You loot like a mast."/>
 
diff --git a/app/src/main/res/layouts/row_layouts/layout/comments_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/comments_row_item.xml
index b24a269f..f1ff9069 100644
--- a/app/src/main/res/layouts/row_layouts/layout/comments_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/comments_row_item.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/spacing_micro"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:stateListAnimator="@animator/cardview_selector"
     app:cardBackgroundColor="@color/card_background"
@@ -41,7 +40,7 @@
                 android:layout_weight="1"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="@color/primary_text"
+                android:textColor="?android:textColorPrimary"
                 tools:text="When one acquires"/>
 
             <com.fastaccess.ui.widgets.FontTextView
@@ -51,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:maxLines="1"
-                android:textColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
                 tools:text="50 minutes ago"/>
         </LinearLayout>
 
diff --git a/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml
index d862dc0b..22cd3f69 100644
--- a/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/commit_file_row_item.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/spacing_micro"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:stateListAnimator="@animator/cardview_selector"
     app:cardBackgroundColor="@color/card_background"
@@ -34,7 +33,7 @@
                 android:layout_weight="1"
                 android:ellipsize="end"
                 android:maxLines="2"
-                android:textColor="@color/primary_text"
+                android:textColor="?android:textColorPrimary"
                 tools:text="When one acquires"/>
 
             <com.fastaccess.ui.widgets.ForegroundImageView
diff --git a/app/src/main/res/layouts/row_layouts/layout/feeds_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/feeds_row_item.xml
index ecfb4796..d376014f 100644
--- a/app/src/main/res/layouts/row_layouts/layout/feeds_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/feeds_row_item.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_spacing"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:paddingBottom="@dimen/spacing_normal"
     android:paddingEnd="@dimen/spacing_xs_large"
@@ -39,7 +38,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="3"
-                android:textColor="@color/primary_text"
+                android:textColor="?android:textColorPrimary"
                 android:transitionName="@string/title_transition"
                 tools:text="When one acquires music and afterlife, one is able to capture heaven."/>
 
@@ -48,7 +47,7 @@
                 style="@style/TextAppearance.AppCompat.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
                 tools:text="50 minutes ago"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layouts/row_layouts/layout/feeds_row_no_image_item.xml b/app/src/main/res/layouts/row_layouts/layout/feeds_row_no_image_item.xml
index 65344ffd..2fed6d01 100644
--- a/app/src/main/res/layouts/row_layouts/layout/feeds_row_no_image_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/feeds_row_no_image_item.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_spacing"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:paddingBottom="@dimen/spacing_normal"
     android:paddingEnd="@dimen/spacing_xs_large"
@@ -26,7 +25,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="3"
-            android:textColor="@color/primary_text"
+            android:textColor="?android:textColorPrimary"
             android:transitionName="@string/title_transition"
             tools:text="When one acquires music and afterlife, one is able to capture heaven."/>
 
@@ -35,7 +34,7 @@
             style="@style/TextAppearance.AppCompat.Small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/secondary_text"
+            android:textColor="?android:attr/textColorSecondary"
             tools:text="50 minutes ago"/>
     </LinearLayout>
 
diff --git a/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml
index 98fce83e..ff7cc0e6 100644
--- a/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/gist_files_row_item.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/spacing_micro"
-    android:clickable="true"
     android:foreground="?attr/selectableItemBackground"
     android:stateListAnimator="@animator/cardview_selector"
     app:cardBackgroundColor="@color/card_background">
@@ -26,7 +25,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/spacing_normal"
-            android:textColor="@color/primary_text"
+            android:textColor="?android:textColorPrimary"
             tools:text="Yes, there is wonderland, it becomes with vision."/>
 
         <LinearLayout
@@ -42,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_weight="1"
-                android:textColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
                 tools:text="JAVASCRIPT"/>
 
             <com.fastaccess.ui.widgets.FontTextView
@@ -56,7 +55,7 @@
                 android:gravity="center"
                 android:paddingEnd="@dimen/spacing_normal"
                 android:paddingStart="@dimen/spacing_normal"
-                android:textColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
                 tools:text="500 KB"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layouts/row_layouts/layout/issue_detail_header_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/issue_detail_header_row_item.xml
index 1b411097..678b6d1a 100644
--- a/app/src/main/res/layouts/row_layouts/layout/issue_detail_header_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/issue_detail_header_row_item.xml
@@ -40,7 +40,7 @@
                 android:layout_weight="1"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="@color/primary_text"
+                android:textColor="?android:textColorPrimary"
                 tools:text="When one acquires"/>
 
             <com.fastaccess.ui.widgets.FontTextView
@@ -50,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:maxLines="1"
-                android:textColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
                 tools:text="50 minutes ago"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml
index 8a4a5b01..1e44ff21 100644
--- a/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/issue_no_image_row_item.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_spacing"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:paddingBottom="@dimen/spacing_normal"
     android:paddingEnd="@dimen/spacing_xs_large"
@@ -26,7 +25,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="3"
-            android:textColor="@color/primary_text"
+            android:textColor="?android:textColorPrimary"
             android:textStyle="bold"
             tools:text="When one acquires music and afterlife, one is able to capture heaven."/>
 
@@ -35,8 +34,8 @@
             style="@style/TextAppearance.AppCompat.Small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/secondary_text"
-            app:drawableColor="@color/secondary_text"
+            android:textColor="?android:attr/textColorSecondary"
+            app:drawableColor="?android:attr/textColorSecondary"
             tools:text="1000"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layouts/row_layouts/layout/issue_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/issue_row_item.xml
index ff915baa..89f594bd 100644
--- a/app/src/main/res/layouts/row_layouts/layout/issue_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/issue_row_item.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_spacing"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:paddingBottom="@dimen/spacing_normal"
     android:paddingEnd="@dimen/spacing_xs_large"
@@ -40,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="2"
-                android:textColor="@color/primary_text"
+                android:textColor="?android:textColorPrimary"
                 android:textStyle="bold"
                 tools:text="When one acquires music and afterlife, one is able to capture heaven."/>
 
@@ -49,8 +48,8 @@
                 style="@style/TextAppearance.AppCompat.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="@color/secondary_text"
-                app:drawableColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
+                app:drawableColor="?android:attr/textColorSecondary"
                 tools:text="1000"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layouts/row_layouts/layout/label_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/label_row_item.xml
index 06efcb68..62e3b0e5 100644
--- a/app/src/main/res/layouts/row_layouts/layout/label_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/label_row_item.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_spacing"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:paddingBottom="@dimen/spacing_normal"
     android:paddingEnd="@dimen/spacing_xs_large"
@@ -15,7 +14,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        tools:ignore="UselessParent">
 
         <android.support.v7.widget.AppCompatImageView
             android:id="@+id/colorImage"
@@ -29,9 +29,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginStart="@dimen/spacing_xs_large"
-            android:maxLines="3"
             android:ellipsize="end"
-            android:textColor="@color/primary_text"
+            android:maxLines="3"
+            android:textColor="?android:textColorPrimary"
             android:transitionName="@string/title_transition"
             tools:text="Bug Fixes."/>
 
diff --git a/app/src/main/res/layouts/row_layouts/layout/notifications_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/notifications_row_item.xml
index b03f6c75..22be192a 100644
--- a/app/src/main/res/layouts/row_layouts/layout/notifications_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/notifications_row_item.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_spacing"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:paddingBottom="@dimen/spacing_normal"
     android:paddingEnd="@dimen/spacing_xs_large"
@@ -32,7 +31,7 @@
                 android:layout_weight="1"
                 android:ellipsize="end"
                 android:maxLines="1"
-                android:textColor="@color/primary_text"
+                android:textColor="?android:textColorPrimary"
                 android:textStyle="bold"
                 tools:text="When one acquires music and afterlife, one is able to capture heaven."/>
 
@@ -44,8 +43,8 @@
                 android:layout_gravity="top|center"
                 android:layout_marginStart="@dimen/spacing_normal"
                 android:gravity="start|center"
-                android:textColor="@color/secondary_text"
-                app:drawableColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
+                app:drawableColor="?android:attr/textColorSecondary"
                 tools:text="50 minutes ago"/>
         </LinearLayout>
 
@@ -54,7 +53,7 @@
             style="@style/TextAppearance.AppCompat.Body1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/secondary_text"
+            android:textColor="?android:attr/textColorSecondary"
             tools:text="1000"/>
     </LinearLayout>
 
diff --git a/app/src/main/res/layouts/row_layouts/layout/profile_overview_layout.xml b/app/src/main/res/layouts/row_layouts/layout/profile_overview_layout.xml
index ff5c0c66..234ad760 100644
--- a/app/src/main/res/layouts/row_layouts/layout/profile_overview_layout.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/profile_overview_layout.xml
@@ -210,7 +210,7 @@
             android:id="@+id/progress"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?android:windowBackground"
+            android:background="?android:attr/windowBackground"
             android:visibility="gone">
 
             <ProgressBar
diff --git a/app/src/main/res/layouts/row_layouts/layout/releases_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/releases_row_item.xml
index eaf1f413..d8b98fc1 100644
--- a/app/src/main/res/layouts/row_layouts/layout/releases_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/releases_row_item.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_spacing"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:paddingBottom="@dimen/spacing_normal"
     android:paddingEnd="@dimen/spacing_xs_large"
@@ -47,7 +46,7 @@
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="3"
-                    android:textColor="@color/primary_text"
+                    android:textColor="?android:textColorPrimary"
                     tools:text="When one acquires music and afterlife, one is able to capture heaven\nWhen one acquires music and afterlife, one is able to capture heaven\n."/>
 
 
@@ -57,8 +56,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:textColor="@color/secondary_text"
-                    app:drawableColor="@color/secondary_text"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:drawableColor="?android:attr/textColorSecondary"
                     tools:text="1000"/>
             </LinearLayout>
 
diff --git a/app/src/main/res/layouts/row_layouts/layout/repo_files_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/repo_files_row_item.xml
index e7fa70c9..f88b8d88 100644
--- a/app/src/main/res/layouts/row_layouts/layout/repo_files_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/repo_files_row_item.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_spacing"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:paddingBottom="@dimen/spacing_normal"
     android:paddingEnd="@dimen/spacing_xs_large"
@@ -44,7 +43,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="3"
-                android:textColor="@color/primary_text"
+                android:textColor="?android:textColorPrimary"
                 tools:text="File Name"/>
 
             <com.fastaccess.ui.widgets.FontTextView
diff --git a/app/src/main/res/layouts/row_layouts/layout/repos_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/repos_row_item.xml
index 1d81c555..840564d8 100644
--- a/app/src/main/res/layouts/row_layouts/layout/repos_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/repos_row_item.xml
@@ -39,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="3"
-                android:textColor="@color/primary_text"
+                android:textColor="?android:textColorPrimary"
                 android:textStyle="bold"
                 tools:text="When one acquires music and afterlife, one is able to capture heaven."/>
 
@@ -61,8 +61,8 @@
                     android:drawablePadding="@dimen/spacing_micro"
                     android:drawableStart="@drawable/ic_star_small"
                     android:gravity="start|center"
-                    android:textColor="@color/secondary_text"
-                    app:drawableColor="@color/secondary_text"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:drawableColor="?android:attr/textColorSecondary"
                     tools:text="10000"/>
 
                 <com.fastaccess.ui.widgets.FontTextView
@@ -75,8 +75,8 @@
                     android:drawablePadding="@dimen/spacing_micro"
                     android:drawableStart="@drawable/ic_fork_small"
                     android:gravity="start|center"
-                    android:textColor="@color/secondary_text"
-                    app:drawableColor="@color/secondary_text"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:drawableColor="?android:attr/textColorSecondary"
                     tools:text="50000"/>
 
                 <com.fastaccess.ui.widgets.FontTextView
@@ -88,8 +88,8 @@
                     android:drawablePadding="@dimen/spacing_micro"
                     android:drawableStart="@drawable/ic_time_small"
                     android:gravity="start|center"
-                    android:textColor="@color/secondary_text"
-                    app:drawableColor="@color/secondary_text"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:drawableColor="?android:attr/textColorSecondary"
                     tools:text="50 minutes ago"/>
 
                 <com.fastaccess.ui.widgets.FontTextView
@@ -100,7 +100,7 @@
                     android:layout_gravity="center"
                     android:layout_marginStart="@dimen/spacing_normal"
                     android:gravity="start|center"
-                    android:textColor="@color/secondary_text"
+                    android:textColor="?android:attr/textColorSecondary"
                     android:visibility="gone"
                     tools:text="TypeScript"/>
 
diff --git a/app/src/main/res/layouts/row_layouts/layout/repos_row_no_image_item.xml b/app/src/main/res/layouts/row_layouts/layout/repos_row_no_image_item.xml
index 377a3d45..b652b522 100644
--- a/app/src/main/res/layouts/row_layouts/layout/repos_row_no_image_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/repos_row_no_image_item.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/grid_spacing"
-    android:clickable="true"
     android:foreground="?android:selectableItemBackground"
     android:paddingBottom="@dimen/spacing_normal"
     android:paddingEnd="@dimen/spacing_xs_large"
@@ -27,7 +26,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="3"
-            android:textColor="@color/primary_text"
+            android:textColor="?android:textColorPrimary"
             android:textStyle="bold"
             tools:text="When one acquires music and afterlife, one is able to capture heaven."/>
 
@@ -48,8 +47,8 @@
                 android:drawablePadding="@dimen/spacing_micro"
                 android:drawableStart="@drawable/ic_star_small"
                 android:gravity="start|center"
-                android:textColor="@color/secondary_text"
-                app:drawableColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
+                app:drawableColor="?android:attr/textColorSecondary"
                 tools:text="1000"/>
 
             <com.fastaccess.ui.widgets.FontTextView
@@ -62,8 +61,8 @@
                 android:drawablePadding="@dimen/spacing_micro"
                 android:drawableStart="@drawable/ic_fork_small"
                 android:gravity="start|center"
-                android:textColor="@color/secondary_text"
-                app:drawableColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
+                app:drawableColor="?android:attr/textColorSecondary"
                 tools:text="5000"/>
 
             <com.fastaccess.ui.widgets.FontTextView
@@ -75,8 +74,8 @@
                 android:drawablePadding="@dimen/spacing_micro"
                 android:drawableStart="@drawable/ic_time_small"
                 android:gravity="start|center"
-                android:textColor="@color/secondary_text"
-                app:drawableColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
+                app:drawableColor="?android:attr/textColorSecondary"
                 tools:text="50 minutes ago"/>
 
             <com.fastaccess.ui.widgets.FontTextView
@@ -88,7 +87,7 @@
                 android:layout_marginStart="@dimen/spacing_normal"
                 android:drawablePadding="@dimen/spacing_normal"
                 android:gravity="start|center"
-                android:textColor="@color/secondary_text"
+                android:textColor="?android:attr/textColorSecondary"
                 android:visibility="gone"
                 tools:text="TypeScript"
                 tools:visibility="visible"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1caa1666..b46f1d57 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -27,9 +27,11 @@
         <item name="android:statusBarColor">@color/transparent</item>
         <item name="android:windowContentTransitions">true</item>
         <item name="android:dialogTheme">@style/DialogTheme</item>
+        <item name="iconColor">@color/primary_text</item>
     </style>
 
     <style name="WhenLargeTheme.Base" parent="Theme.AppCompat.DayNight.DialogWhenLarge">
+        <item name="iconColor">@color/primary_text</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowBackground">@color/windowBackground</item>
@@ -75,6 +77,7 @@
 
     <style name="DialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
         <item name="android:windowBackground">@color/windowBackground</item>
+        <item name="iconColor">@color/primary_text</item>
     </style>
 
     <style name="SplashTheme" parent="AppTheme">
diff --git a/app/src/main/res/values/themes_attrs.xml b/app/src/main/res/values/themes_attrs.xml
new file mode 100644
index 00000000..5370234a
--- /dev/null
+++ b/app/src/main/res/values/themes_attrs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="iconColor" format="color"/>
+</resources>
\ No newline at end of file