diff --git a/app/build.gradle b/app/build.gradle
index dcae54cd..09a30b92 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,6 +28,9 @@ android {
         targetCompatibility = "8"
         sourceCompatibility = "8"
     }
+    defaultConfig{
+        vectorDrawables.useSupportLibrary = true
+    }
 }
 
 configurations {
diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index 2d4059d6..f0d0c1e0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -51,6 +51,19 @@ public abstract class BaseActivity extends AppCompatActivity {
 				}
 				break;
 
+			case 3:
+				setTheme(R.style.AppThemeRetro);
+				break;
+
+			case 4:
+				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
+					setTheme(R.style.AppTheme);
+				}
+				else {
+					setTheme(R.style.AppThemeRetro);
+				}
+				break;
+
 			default:
 				setTheme(R.style.AppTheme);
 				break;
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
index 46a17b9a..0e6c74ad 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateFileActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -142,7 +141,6 @@ public class CreateFileActivity extends BaseActivity {
         closeActivity.setOnClickListener(onClickListener);
 
         newFileBranchesSpinner = findViewById(R.id.newFileBranchesSpinner);
-        newFileBranchesSpinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getBranches(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
 
         newFileBranchesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
index a2c09393..cce00a8c 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import android.app.DatePickerDialog;
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -126,7 +125,6 @@ public class CreateIssueActivity extends BaseActivity implements View.OnClickLis
         newIssueDueDate.setOnClickListener(this);
 
         newIssueMilestoneSpinner = findViewById(R.id.newIssueMilestoneSpinner);
-        newIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getMilestones(instanceUrl, instanceToken, repoOwner, repoName, loginUid, resultLimit);
 
         getLabels(instanceUrl, instanceToken, repoOwner, repoName, loginUid);
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
index 2a2b951a..99cba7d3 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -87,7 +86,6 @@ public class CreateReleaseActivity extends BaseActivity {
         closeActivity.setOnClickListener(onClickListener);
 
         releaseBranch = findViewById(R.id.releaseBranch);
-        releaseBranch.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getBranches(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), repoOwner, repoName);
         releaseBranch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
index b3b94b94..c231068d 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateRepoActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -86,9 +85,8 @@ public class CreateRepoActivity extends BaseActivity {
         closeActivity.setOnClickListener(onClickListener);
 
         spinner = findViewById(R.id.ownerSpinner);
-        spinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
         getOrganizations(instanceUrl, Authorization.returnAuthentication(ctx, loginUid, instanceToken), userLogin);
-        
+
         spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
diff --git a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
index d0cfde78..9c0b84c6 100644
--- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
@@ -3,7 +3,6 @@ package org.mian.gitnex.activities;
 import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -108,7 +107,6 @@ public class EditIssueActivity extends BaseActivity implements View.OnClickListe
         loadCollaboratorsList();
 
         editIssueMilestoneSpinner = findViewById(R.id.editIssueMilestoneSpinner);
-        editIssueMilestoneSpinner.getBackground().setColorFilter(getResources().getColor(R.color.colorWhite), PorterDuff.Mode.SRC_ATOP);
 
         editIssueDescription.setMentionAdapter(defaultMentionAdapter);
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
index e763a23b..b7cf2c14 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
@@ -35,7 +35,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 	private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
 	private static int customFontSelectedChoice = 0;
 
-	private static String[] themeList = {"Dark", "Light", "Auto (Day/Night)"};
+	private static String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)"};
 	private static int themeSelectedChoice = 0;
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
index 7217ba00..c9b273a3 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
@@ -37,6 +37,8 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
     class FilesViewHolder extends RecyclerView.ViewHolder {
 
         private ImageView fileTypeImage;
+	    private ImageView dirTypeImage;
+	    private ImageView unknownTypeImage;
         private TextView fileName;
         private TextView fileType;
         private TextView fileInfo;
@@ -46,6 +48,8 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
             super(itemView);
             fileName = itemView.findViewById(R.id.fileName);
             fileTypeImage = itemView.findViewById(R.id.fileImage);
+	        dirTypeImage = itemView.findViewById(R.id.dirImage);
+	        unknownTypeImage = itemView.findViewById(R.id.unknownImage);
             fileType = itemView.findViewById(R.id.fileType);
             fileInfo = itemView.findViewById(R.id.fileInfo);
 
@@ -157,16 +161,22 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
         holder.fileName.setText(currentItem.getName());
 
         if(currentItem.getType().equals("file")) {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file));
+            holder.fileTypeImage.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.unknownTypeImage.setVisibility(View.GONE);
             holder.fileInfo.setVisibility(View.VISIBLE);
             holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
         }
         else if(currentItem.getType().equals("dir")) {
+	        holder.dirTypeImage.setVisibility(View.VISIBLE);
+	        holder.unknownTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeImage.setVisibility(View.GONE);
 	        holder.fileInfo.setVisibility(View.GONE);
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_directory));
         }
         else {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question));
+	        holder.unknownTypeImage.setVisibility(View.VISIBLE);
+	        holder.dirTypeImage.setVisibility(View.GONE);
+	        holder.fileTypeImage.setVisibility(View.GONE);
         }
 
     }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
index 7733c2d1..a76ccd36 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java
@@ -44,7 +44,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 		private LinearLayout frame;
 		private TextView subject;
 		private TextView repository;
-		private ImageView type;
+		private ImageView typePr;
+		private ImageView typeIssue;
+		private ImageView typeUnknown;
 		private ImageView pinned;
 		private ImageView more;
 
@@ -55,7 +57,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 			frame = itemView.findViewById(R.id.frame);
 			subject = itemView.findViewById(R.id.subject);
 			repository = itemView.findViewById(R.id.repository);
-			type = itemView.findViewById(R.id.type);
+			typePr = itemView.findViewById(R.id.typePr);
+			typeIssue = itemView.findViewById(R.id.typeIssue);
+			typeUnknown = itemView.findViewById(R.id.typeUnknown);
 			pinned = itemView.findViewById(R.id.pinned);
 			more = itemView.findViewById(R.id.more);
 
@@ -93,15 +97,21 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
 		switch(notificationThread.getSubject().getType()) {
 
 			case "Pull":
-				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_pull_request, null));
+				holder.typePr.setVisibility(View.VISIBLE);
+				holder.typeIssue.setVisibility(View.GONE);
+				holder.typeUnknown.setVisibility(View.GONE);
 				break;
 
 			case "Issue":
-				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_issue, null));
+				holder.typePr.setVisibility(View.GONE);
+				holder.typeIssue.setVisibility(View.VISIBLE);
+				holder.typeUnknown.setVisibility(View.GONE);
 				break;
 
 			default:
-				holder.type.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_question, null));
+				holder.typePr.setVisibility(View.GONE);
+				holder.typeIssue.setVisibility(View.GONE);
+				holder.typeUnknown.setVisibility(View.VISIBLE);
 				break;
 
 		}
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
index eafb25d5..5241889d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java
@@ -97,7 +97,7 @@ public class UserAccountsNavAdapter extends RecyclerView.Adapter<UserAccountsNav
 	private void customDialogUserAccountsList(List<UserAccount> allAccountsList) {
 
 		TinyDB tinyDB = new TinyDB(mCtx);
-		Dialog dialog = new Dialog(mCtx);
+		Dialog dialog = new Dialog(mCtx, R.style.ThemeOverlay_MaterialComponents_Dialog_Alert);
 		dialog.setContentView(R.layout.custom_user_accounts_dialog);
 
 		ListView listView = dialog.findViewById(R.id.accountsList);
diff --git a/app/src/main/res/drawable/ic_account_circle.xml b/app/src/main/res/drawable/ic_account_circle.xml
deleted file mode 100644
index 6461e8cc..00000000
--- a/app/src/main/res/drawable/ic_account_circle.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#368F73"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_android.xml b/app/src/main/res/drawable/ic_android.xml
index 75126b08..b45d1adc 100644
--- a/app/src/main/res/drawable/ic_android.xml
+++ b/app/src/main/res/drawable/ic_android.xml
@@ -1,5 +1,5 @@
 <vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
+    <path android:fillColor="?attr/iconsColor" android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_appearance.xml b/app/src/main/res/drawable/ic_appearance.xml
index a8308016..43bb0fda 100644
--- a/app/src/main/res/drawable/ic_appearance.xml
+++ b/app/src/main/res/drawable/ic_appearance.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M8,21L16,21"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,17L12,21"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml
index bfb3657c..261883be 100644
--- a/app/src/main/res/drawable/ic_archive.xml
+++ b/app/src/main/res/drawable/ic_archive.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M1,3h22v5h-22z"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M10,12L14,12"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
index afc8e6da..7771303c 100644
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,19l-7,-7l7,-7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
index edf7c074..4b9aeb78 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M19,12l-7,7l-7,-7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
index bbcf096c..e66fc4b0 100644
--- a/app/src/main/res/drawable/ic_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,5l7,7l-7,7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_up.xml b/app/src/main/res/drawable/ic_arrow_up.xml
index 2c5991ef..53aba22c 100644
--- a/app/src/main/res/drawable/ic_arrow_up.xml
+++ b/app/src/main/res/drawable/ic_arrow_up.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M5,12l7,-7l7,7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_branch.xml b/app/src/main/res/drawable/ic_branch.xml
index 89723ab7..af27d484 100644
--- a/app/src/main/res/drawable/ic_branch.xml
+++ b/app/src/main/res/drawable/ic_branch.xml
@@ -8,27 +8,27 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M18,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M6,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M18,9a9,9 0,0 1,-9 9"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_browser.xml b/app/src/main/res/drawable/ic_browser.xml
index 93c33100..6a0bacc4 100644
--- a/app/src/main/res/drawable/ic_browser.xml
+++ b/app/src/main/res/drawable/ic_browser.xml
@@ -1,4 +1,4 @@
 <vector android:height="24dp" android:viewportHeight="16"
     android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#368f73" android:fillType="evenOdd" android:pathData="M6,3h1v1L6,4L6,3zM4,3h1v1L4,4L4,3zM2,3h1v1L2,4L2,3zM14,13L2,13L2,5h12v8zM14,4L8,4L8,3h6v1zM15,3c0,-0.55 -0.45,-1 -1,-1L2,2c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1L15,3z"/>
+    <path android:fillColor="?attr/iconsColor" android:fillType="evenOdd" android:pathData="M6,3h1v1L6,4L6,3zM4,3h1v1L4,4L4,3zM2,3h1v1L2,4L2,3zM14,13L2,13L2,5h12v8zM14,4L8,4L8,3h6v1zM15,3c0,-0.55 -0.45,-1 -1,-1L2,2c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1L15,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bug_report.xml b/app/src/main/res/drawable/ic_bug_report.xml
index f7555d7c..0c7a7a74 100644
--- a/app/src/main/res/drawable/ic_bug_report.xml
+++ b/app/src/main/res/drawable/ic_bug_report.xml
@@ -8,76 +8,76 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M2,12.5l2,2l3,0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M22,12.5l-2,2l-3,0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M3,21.5l2,-3l2,-1"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M21,21.5l-2,-3l-2,-1"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M3,8.5l2,2l2,1"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M21,8.5l-2,2l-2,1"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,7.5L12,21.5"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M15.38,8.82A3,3 0,0 0,16 7h0a3,3 0,0 0,-3 -3H11A3,3 0,0 0,8 7H8a3,3 0,0 0,0.61 1.82"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M9,4.5L8,2.5"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M15,4.5L16,2.5"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index ebfcbd96..e1b21ec9 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -8,27 +8,27 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M16,2L16,6"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M8,2L8,6"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M3,10L21,10"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
index 3895ab41..c29fab52 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
index b0798569..ad83d5ae 100644
--- a/app/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_left.xml b/app/src/main/res/drawable/ic_chevron_left.xml
index be2100ca..46dc2ef5 100644
--- a/app/src/main/res/drawable/ic_chevron_left.xml
+++ b/app/src/main/res/drawable/ic_chevron_left.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_right.xml b/app/src/main/res/drawable/ic_chevron_right.xml
index 97b3f2be..e1870d55 100644
--- a/app/src/main/res/drawable/ic_chevron_right.xml
+++ b/app/src/main/res/drawable/ic_chevron_right.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml
index df1703a2..3492762d 100644
--- a/app/src/main/res/drawable/ic_chevron_up.xml
+++ b/app/src/main/res/drawable/ic_chevron_up.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index e1be4e03..c88b244f 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M6,6L18,18"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_code.xml b/app/src/main/res/drawable/ic_code.xml
index 0e732e1d..ca3382ea 100644
--- a/app/src/main/res/drawable/ic_code.xml
+++ b/app/src/main/res/drawable/ic_code.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M8,6l-6,6l6,6"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml
index cb87d675..a461e578 100644
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
index e3631b0e..80b19fec 100644
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M5,15H4a2,2 0,0 1,-2 -2V4a2,2 0,0 1,2 -2h9a2,2 0,0 1,2 2v1"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 623fdbc3..93e8f59b 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -8,27 +8,27 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M19,6v14a2,2 0,0 1,-2 2H7a2,2 0,0 1,-2 -2V6m3,0V4a2,2 0,0 1,2 -2h4a2,2 0,0 1,2 2v2"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M10,11L10,17"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M14,11L14,17"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_directory.xml b/app/src/main/res/drawable/ic_directory.xml
index b78ad9dd..3165bd97 100644
--- a/app/src/main/res/drawable/ic_directory.xml
+++ b/app/src/main/res/drawable/ic_directory.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_done.xml
index 421be914..8043ef1b 100644
--- a/app/src/main/res/drawable/ic_done.xml
+++ b/app/src/main/res/drawable/ic_done.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="?attr/iconsColor"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
diff --git a/app/src/main/res/drawable/ic_dotted_menu.xml b/app/src/main/res/drawable/ic_dotted_menu.xml
index 624f6510..96809e08 100644
--- a/app/src/main/res/drawable/ic_dotted_menu.xml
+++ b/app/src/main/res/drawable/ic_dotted_menu.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,5m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,19m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml b/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
index 2a157dd8..d6632219 100644
--- a/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
+++ b/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
+      android:fillColor="?attr/iconsColor"
       android:pathData="M6,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM14,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM20,14a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index b3e56ea6..0254bca5 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M7,10l5,5l5,-5"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,15L12,3"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_drafts.xml b/app/src/main/res/drawable/ic_drafts.xml
index e4c63015..c7334b0b 100644
--- a/app/src/main/res/drawable/ic_drafts.xml
+++ b/app/src/main/res/drawable/ic_drafts.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M5.45,5.11L2,12v6a2,2 0,0 0,2 2h16a2,2 0,0 0,2 -2v-6l-3.45,-6.89A2,2 0,0 0,16.76 4H7.24a2,2 0,0 0,-1.79 1.11z"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index a350e72b..c32b9318 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M16.5,3.5a2.121,2.121 0,0 1,3 3L7,19l-4,1 1,-4L16.5,3.5z"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
index 0577ff76..30a2eb64 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M22,6l-10,7l-10,-7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_file.xml b/app/src/main/res/drawable/ic_file.xml
index 09f190ec..45577def 100644
--- a/app/src/main/res/drawable/ic_file.xml
+++ b/app/src/main/res/drawable/ic_file.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M13,2l0,7l7,0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index ee204906..df817d87 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_flag.xml b/app/src/main/res/drawable/ic_flag.xml
index de00d90e..b45a7177 100644
--- a/app/src/main/res/drawable/ic_flag.xml
+++ b/app/src/main/res/drawable/ic_flag.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M4,22L4,15"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_fork.xml b/app/src/main/res/drawable/ic_fork.xml
index 96bf2e7b..4ad23171 100644
--- a/app/src/main/res/drawable/ic_fork.xml
+++ b/app/src/main/res/drawable/ic_fork.xml
@@ -4,15 +4,15 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
+      android:fillColor="?attr/iconsColor"
       android:pathData="M12,21a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM8.75,19.25a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0zM5.75,6.5a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM2.5,4.75a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0zM18.25,6.5a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM15,4.75a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0z"
       android:fillType="evenOdd"/>
   <path
-      android:fillColor="#368f73"
+      android:fillColor="?attr/iconsColor"
       android:pathData="M6.5,7.75v1A2.25,2.25 0,0 0,8.75 11h6.5a2.25,2.25 0,0 0,2.25 -2.25v-1H19v1a3.75,3.75 0,0 1,-3.75 3.75h-6.5A3.75,3.75 0,0 1,5 8.75v-1h1.5z"
       android:fillType="evenOdd"/>
   <path
-      android:fillColor="#368f73"
+      android:fillColor="?attr/iconsColor"
       android:pathData="M11.25,16.25v-5h1.5v5h-1.5z"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 0591f38a..4a854b7c 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,16L12,12"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,8L12.01,8"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_issue.xml b/app/src/main/res/drawable/ic_issue.xml
index 8c379104..9a371b6b 100644
--- a/app/src/main/res/drawable/ic_issue.xml
+++ b/app/src/main/res/drawable/ic_issue.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,8L12,12"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,16L12.01,16"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_issue_closed.xml b/app/src/main/res/drawable/ic_issue_closed.xml
index 38013e41..3633cbb5 100644
--- a/app/src/main/res/drawable/ic_issue_closed.xml
+++ b/app/src/main/res/drawable/ic_issue_closed.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M22,4l-10,10.01l-3,-3"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_label.xml b/app/src/main/res/drawable/ic_label.xml
index 2904637e..f7f3fbe1 100644
--- a/app/src/main/res/drawable/ic_label.xml
+++ b/app/src/main/res/drawable/ic_label.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M7,7L7.01,7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index 26a7bf52..f99a18bc 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="?attr/iconsColor"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" 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"/>
diff --git a/app/src/main/res/drawable/ic_like.xml b/app/src/main/res/drawable/ic_like.xml
index bf554fd0..216ce2d0 100644
--- a/app/src/main/res/drawable/ic_like.xml
+++ b/app/src/main/res/drawable/ic_like.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml
index 5e04c607..34212db0 100644
--- a/app/src/main/res/drawable/ic_link.xml
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M14,11a5,5 0,0 0,-7.54 -0.54l-3,3a5,5 0,0 0,7.07 7.07l1.71,-1.71"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_loader.xml b/app/src/main/res/drawable/ic_loader.xml
index fdc6689c..10eea365 100644
--- a/app/src/main/res/drawable/ic_loader.xml
+++ b/app/src/main/res/drawable/ic_loader.xml
@@ -3,5 +3,5 @@
     android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillAlpha="0.2" android:fillColor="@color/colorAccent"
         android:pathData="M20.201,5.169c-8.254,0 -14.946,6.692 -14.946,14.946c0,8.255 6.692,14.946 14.946,14.946s14.946,-6.691 14.946,-14.946C35.146,11.861 28.455,5.169 20.201,5.169zM20.201,31.749c-6.425,0 -11.634,-5.208 -11.634,-11.634c0,-6.425 5.209,-11.634 11.634,-11.634c6.425,0 11.633,5.209 11.633,11.634C31.834,26.541 26.626,31.749 20.201,31.749z" android:strokeAlpha="0.2"/>
-    <path android:fillColor="@color/darkGreen" android:pathData="M26.013,10.047l1.654,-2.866c-2.198,-1.272 -4.743,-2.012 -7.466,-2.012h0v3.312h0C22.32,8.481 24.301,9.057 26.013,10.047z"/>
+    <path android:fillColor="@color/colorAccent" android:pathData="M26.013,10.047l1.654,-2.866c-2.198,-1.272 -4.743,-2.012 -7.466,-2.012h0v3.312h0C22.32,8.481 24.301,9.057 26.013,10.047z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
index 92b1b30e..603fd244 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,10m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index 84dfbfda..87eaf2be 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M7,11V7a5,5 0,0 1,10 0v4"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml
index 9af0500d..1d3ff3d1 100644
--- a/app/src/main/res/drawable/ic_logout.xml
+++ b/app/src/main/res/drawable/ic_logout.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M16,17l5,-5l-5,-5"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M21,12L9,12"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_markdown.xml b/app/src/main/res/drawable/ic_markdown.xml
index 2317f368..93fa75dc 100644
--- a/app/src/main/res/drawable/ic_markdown.xml
+++ b/app/src/main/res/drawable/ic_markdown.xml
@@ -1,4 +1,4 @@
 <vector android:height="24dp" android:viewportHeight="16"
     android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#368f73" android:fillType="evenOdd" android:pathData="M14.85,3L1.15,3C0.52,3 0,3.52 0,4.15v7.69C0,12.48 0.52,13 1.15,13h13.69c0.64,0 1.15,-0.52 1.15,-1.15v-7.7C16,3.52 15.48,3 14.85,3zM9,11L7,11L7,8L5.5,9.92 4,8v3L2,11L2,5h2l1.5,2L7,5h2v6zM11.99,11.5L9.5,8L11,8L11,5h2v3h1.5l-2.51,3.5z"/>
+    <path android:fillColor="?attr/iconsColor" android:fillType="evenOdd" android:pathData="M14.85,3L1.15,3C0.52,3 0,3.52 0,4.15v7.69C0,12.48 0.52,13 1.15,13h13.69c0.64,0 1.15,-0.52 1.15,-1.15v-7.7C16,3.52 15.48,3 14.85,3zM9,11L7,11L7,8L5.5,9.92 4,8v3L2,11L2,5h2l1.5,2L7,5h2v6zM11.99,11.5L9.5,8L11,8L11,5h2v3h1.5l-2.51,3.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
index 255a0631..0b25012e 100644
--- a/app/src/main/res/drawable/ic_menu.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M3,6L21,6"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M3,18L21,18"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_milestone.xml b/app/src/main/res/drawable/ic_milestone.xml
index 57c297fe..7d9998dc 100644
--- a/app/src/main/res/drawable/ic_milestone.xml
+++ b/app/src/main/res/drawable/ic_milestone.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
+      android:fillColor="?attr/iconsColor"
       android:pathData="M11.75,1a0.75,0.75 0,0 1,0.75 0.75L12.5,4h6.532c0.42,0 0.826,0.15 1.143,0.425l3.187,2.75a1.75,1.75 0,0 1,0 2.65l-3.187,2.75a1.75,1.75 0,0 1,-1.143 0.425L12.5,13v9.25a0.75,0.75 0,0 1,-1.5 0L11,13L3.75,13A1.75,1.75 0,0 1,2 11.25v-5.5C2,4.783 2.784,4 3.75,4L11,4L11,1.75a0.75,0.75 0,0 1,0.75 -0.75zM11.75,5.5h7.282a0.25,0.25 0,0 1,0.163 0.06l3.188,2.75a0.25,0.25 0,0 1,0 0.38l-3.188,2.75a0.25,0.25 0,0 1,-0.163 0.06L3.75,11.5a0.25,0.25 0,0 1,-0.25 -0.25v-5.5a0.25,0.25 0,0 1,0.25 -0.25h8z"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
index 7fbbb611..341baca5 100644
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M13.73,21a2,2 0,0 1,-3.46 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_organization.xml b/app/src/main/res/drawable/ic_organization.xml
index d6af441f..045235d3 100644
--- a/app/src/main/res/drawable/ic_organization.xml
+++ b/app/src/main/res/drawable/ic_organization.xml
@@ -4,10 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
+      android:fillColor="?attr/iconsColor"
       android:pathData="M7.25,12a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM6.5,9.25a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM7.25,5a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM10,12.75a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM10.75,8.5a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM10,5.75a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM14.25,12a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5zM13.5,9.25a0.75,0.75 0,0 1,0.75 -0.75h0.5a0.75,0.75 0,0 1,0 1.5h-0.5a0.75,0.75 0,0 1,-0.75 -0.75zM14.25,5a0.75,0.75 0,0 0,0 1.5h0.5a0.75,0.75 0,0 0,0 -1.5h-0.5z"/>
   <path
-      android:fillColor="#368f73"
+      android:fillColor="?attr/iconsColor"
       android:pathData="M3,20a2,2 0,0 0,2 2h3.75a0.75,0.75 0,0 0,0.75 -0.75L9.5,19h3v2.25c0,0.414 0.336,0.75 0.75,0.75L17,22c0.092,0 0.183,-0.006 0.272,-0.018a0.758,0.758 0,0 0,0.166 0.018L21.5,22a2,2 0,0 0,2 -2v-7.625a2,2 0,0 0,-0.8 -1.6l-1,-0.75a0.75,0.75 0,1 0,-0.9 1.2l1,0.75a0.5,0.5 0,0 1,0.2 0.4L22,20a0.5,0.5 0,0 1,-0.5 0.5h-2.563c0.041,-0.16 0.063,-0.327 0.063,-0.5L19,3a2,2 0,0 0,-2 -2L5,1a2,2 0,0 0,-2 2v17zM5,20.5a0.5,0.5 0,0 1,-0.5 -0.5L4.5,3a0.5,0.5 0,0 1,0.5 -0.5h12a0.5,0.5 0,0 1,0.5 0.5v17a0.5,0.5 0,0 1,-0.5 0.5h-3v-2.25a0.75,0.75 0,0 0,-0.75 -0.75h-4.5a0.75,0.75 0,0 0,-0.75 0.75v2.25L5,20.5z"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_otp.xml b/app/src/main/res/drawable/ic_otp.xml
index 3c7f1084..2c12e3ad 100644
--- a/app/src/main/res/drawable/ic_otp.xml
+++ b/app/src/main/res/drawable/ic_otp.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,18L12.01,18"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_people.xml b/app/src/main/res/drawable/ic_people.xml
index 8f7cfdad..69852ba9 100644
--- a/app/src/main/res/drawable/ic_people.xml
+++ b/app/src/main/res/drawable/ic_people.xml
@@ -8,27 +8,27 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M9,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M23,21v-2a4,4 0,0 0,-3 -3.87"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M16,3.13a4,4 0,0 1,0 7.75"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
index 11907879..8bebc422 100644
--- a/app/src/main/res/drawable/ic_person.xml
+++ b/app/src/main/res/drawable/ic_person.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_person_add.xml b/app/src/main/res/drawable/ic_person_add.xml
index aefcd29f..9d952ac7 100644
--- a/app/src/main/res/drawable/ic_person_add.xml
+++ b/app/src/main/res/drawable/ic_person_add.xml
@@ -8,27 +8,27 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M8.5,7m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M20,8L20,14"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M23,11L17,11"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pin.xml b/app/src/main/res/drawable/ic_pin.xml
index c8d666e3..420f66c8 100644
--- a/app/src/main/res/drawable/ic_pin.xml
+++ b/app/src/main/res/drawable/ic_pin.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#368f73"
+    android:tint="?attr/iconsColor"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/drawable/ic_pull_request.xml b/app/src/main/res/drawable/ic_pull_request.xml
index e53e37d7..04022300 100644
--- a/app/src/main/res/drawable/ic_pull_request.xml
+++ b/app/src/main/res/drawable/ic_pull_request.xml
@@ -8,27 +8,27 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M6,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M13,6h3a2,2 0,0 1,2 2v7"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M6,9L6,21"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_question.xml b/app/src/main/res/drawable/ic_question.xml
index 596eab72..cbe0237d 100644
--- a/app/src/main/res/drawable/ic_question.xml
+++ b/app/src/main/res/drawable/ic_question.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M9.09,9a3,3 0,0 1,5.83 1c0,2 -3,3 -3,3"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,17L12.01,17"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_release.xml b/app/src/main/res/drawable/ic_release.xml
index e32128c9..30a995d8 100644
--- a/app/src/main/res/drawable/ic_release.xml
+++ b/app/src/main/res/drawable/ic_release.xml
@@ -8,27 +8,27 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M21,16V8a2,2 0,0 0,-1 -1.73l-7,-4a2,2 0,0 0,-2 0l-7,4A2,2 0,0 0,3 8v8a2,2 0,0 0,1 1.73l7,4a2,2 0,0 0,2 0l7,-4A2,2 0,0 0,21 16z"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M3.27,6.96l8.73,5.05l8.73,-5.05"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M12,22.08L12,12"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_reopen.xml b/app/src/main/res/drawable/ic_reopen.xml
index aa8b34d1..3598d914 100644
--- a/app/src/main/res/drawable/ic_reopen.xml
+++ b/app/src/main/res/drawable/ic_reopen.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M20.49,15a9,9 0,1 1,-2.12 -9.36L23,10"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_reply.xml b/app/src/main/res/drawable/ic_reply.xml
index 9ff78ee1..8e780355 100644
--- a/app/src/main/res/drawable/ic_reply.xml
+++ b/app/src/main/res/drawable/ic_reply.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="?attr/iconsColor"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
diff --git a/app/src/main/res/drawable/ic_repo.xml b/app/src/main/res/drawable/ic_repo.xml
index 05eed15b..ed771016 100644
--- a/app/src/main/res/drawable/ic_repo.xml
+++ b/app/src/main/res/drawable/ic_repo.xml
@@ -4,10 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
+      android:fillColor="?attr/iconsColor"
       android:pathData="M3,2.75A2.75,2.75 0,0 1,5.75 0h14.5a0.75,0.75 0,0 1,0.75 0.75v20.5a0.75,0.75 0,0 1,-0.75 0.75h-6a0.75,0.75 0,0 1,0 -1.5h5.25v-4H6A1.5,1.5 0,0 0,4.5 18v0.75c0,0.716 0.43,1.334 1.05,1.605a0.75,0.75 0,0 1,-0.6 1.374A3.25,3.25 0,0 1,3 18.75v-16zM19.5,1.5V15H6c-0.546,0 -1.059,0.146 -1.5,0.401V2.75c0,-0.69 0.56,-1.25 1.25,-1.25H19.5z"
       android:fillType="evenOdd"/>
   <path
-      android:fillColor="#368f73"
+      android:fillColor="?attr/iconsColor"
       android:pathData="M7,18.25a0.25,0.25 0,0 1,0.25 -0.25h5a0.25,0.25 0,0 1,0.25 0.25v5.01a0.25,0.25 0,0 1,-0.397 0.201l-2.206,-1.604a0.25,0.25 0,0 0,-0.294 0L7.397,23.46a0.25,0.25 0,0 1,-0.397 -0.2v-5.01z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index f4028471..14d35950 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M21,21L16.65,16.65"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_security.xml b/app/src/main/res/drawable/ic_security.xml
index 27910cb9..d03068a9 100644
--- a/app/src/main/res/drawable/ic_security.xml
+++ b/app/src/main/res/drawable/ic_security.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index c28e9ec2..5930c1f8 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,12 +1,20 @@
 <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"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M11.31,2.525a9.648,9.648 0,0 1,1.38 0c0.055,0.004 0.135,0.05 0.162,0.16l0.351,1.45c0.153,0.628 0.626,1.08 1.173,1.278 0.205,0.074 0.405,0.157 0.6,0.249a1.832,1.832 0,0 0,1.733 -0.074l1.275,-0.776c0.097,-0.06 0.186,-0.036 0.228,0 0.348,0.302 0.674,0.628 0.976,0.976 0.036,0.042 0.06,0.13 0,0.228l-0.776,1.274a1.832,1.832 0,0 0,-0.074 1.734c0.092,0.195 0.175,0.395 0.248,0.6 0.198,0.547 0.652,1.02 1.278,1.172l1.45,0.353c0.111,0.026 0.157,0.106 0.161,0.161a9.653,9.653 0,0 1,0 1.38c-0.004,0.055 -0.05,0.135 -0.16,0.162l-1.45,0.351a1.833,1.833 0,0 0,-1.278 1.173,6.926 6.926,0 0,1 -0.25,0.6 1.832,1.832 0,0 0,0.075 1.733l0.776,1.275c0.06,0.097 0.036,0.186 0,0.228a9.555,9.555 0,0 1,-0.976 0.976c-0.042,0.036 -0.13,0.06 -0.228,0l-1.275,-0.776a1.832,1.832 0,0 0,-1.733 -0.074,6.926 6.926,0 0,1 -0.6,0.248 1.833,1.833 0,0 0,-1.172 1.278l-0.353,1.45c-0.026,0.111 -0.106,0.157 -0.161,0.161a9.653,9.653 0,0 1,-1.38 0c-0.055,-0.004 -0.135,-0.05 -0.162,-0.16l-0.351,-1.45a1.833,1.833 0,0 0,-1.173 -1.278,6.928 6.928,0 0,1 -0.6,-0.25 1.832,1.832 0,0 0,-1.734 0.075l-1.274,0.776c-0.097,0.06 -0.186,0.036 -0.228,0a9.56,9.56 0,0 1,-0.976 -0.976c-0.036,-0.042 -0.06,-0.13 0,-0.228l0.776,-1.275a1.832,1.832 0,0 0,0.074 -1.733,6.948 6.948,0 0,1 -0.249,-0.6 1.833,1.833 0,0 0,-1.277 -1.172l-1.45,-0.353c-0.111,-0.026 -0.157,-0.106 -0.161,-0.161a9.648,9.648 0,0 1,0 -1.38c0.004,-0.055 0.05,-0.135 0.16,-0.162l1.45,-0.351a1.833,1.833 0,0 0,1.278 -1.173,6.95 6.95,0 0,1 0.249,-0.6 1.832,1.832 0,0 0,-0.074 -1.734l-0.776,-1.274c-0.06,-0.097 -0.036,-0.186 0,-0.228 0.302,-0.348 0.628,-0.674 0.976,-0.976 0.042,-0.036 0.13,-0.06 0.228,0l1.274,0.776a1.832,1.832 0,0 0,1.734 0.074,6.95 6.95,0 0,1 0.6,-0.249 1.833,1.833 0,0 0,1.172 -1.277l0.353,-1.45c0.026,-0.111 0.106,-0.157 0.161,-0.161zM12,1c-0.268,0 -0.534,0.01 -0.797,0.028 -0.763,0.055 -1.345,0.617 -1.512,1.304l-0.352,1.45c-0.02,0.078 -0.09,0.172 -0.225,0.22a8.45,8.45 0,0 0,-0.728 0.303c-0.13,0.06 -0.246,0.044 -0.315,0.002l-1.274,-0.776c-0.604,-0.368 -1.412,-0.354 -1.99,0.147 -0.403,0.348 -0.78,0.726 -1.129,1.128 -0.5,0.579 -0.515,1.387 -0.147,1.99l0.776,1.275c0.042,0.069 0.059,0.185 -0.002,0.315a8.45,8.45 0,0 0,-0.302 0.728c-0.05,0.135 -0.143,0.206 -0.221,0.225l-1.45,0.352c-0.687,0.167 -1.249,0.749 -1.304,1.512a11.149,11.149 0,0 0,0 1.594c0.055,0.763 0.617,1.345 1.304,1.512l1.45,0.352c0.078,0.02 0.172,0.09 0.22,0.225 0.09,0.248 0.191,0.491 0.303,0.729 0.06,0.129 0.044,0.245 0.002,0.314l-0.776,1.274c-0.368,0.604 -0.354,1.412 0.147,1.99 0.348,0.403 0.726,0.78 1.128,1.129 0.579,0.5 1.387,0.515 1.99,0.147l1.275,-0.776c0.069,-0.042 0.185,-0.059 0.315,0.002 0.237,0.112 0.48,0.213 0.728,0.302 0.135,0.05 0.206,0.143 0.225,0.221l0.352,1.45c0.167,0.687 0.749,1.249 1.512,1.303a11.125,11.125 0,0 0,1.594 0c0.763,-0.054 1.345,-0.616 1.512,-1.303l0.352,-1.45c0.02,-0.078 0.09,-0.172 0.225,-0.22 0.248,-0.09 0.491,-0.191 0.729,-0.303 0.129,-0.06 0.245,-0.044 0.314,-0.002l1.274,0.776c0.604,0.368 1.412,0.354 1.99,-0.147 0.403,-0.348 0.78,-0.726 1.129,-1.128 0.5,-0.579 0.515,-1.387 0.147,-1.99l-0.776,-1.275c-0.042,-0.069 -0.059,-0.185 0.002,-0.315 0.112,-0.237 0.213,-0.48 0.302,-0.728 0.05,-0.135 0.143,-0.206 0.221,-0.225l1.45,-0.352c0.687,-0.167 1.249,-0.749 1.303,-1.512a11.125,11.125 0,0 0,0 -1.594c-0.054,-0.763 -0.616,-1.345 -1.303,-1.512l-1.45,-0.352c-0.078,-0.02 -0.172,-0.09 -0.22,-0.225a8.469,8.469 0,0 0,-0.303 -0.728c-0.06,-0.13 -0.044,-0.246 -0.002,-0.315l0.776,-1.274c0.368,-0.604 0.354,-1.412 -0.147,-1.99 -0.348,-0.403 -0.726,-0.78 -1.128,-1.129 -0.579,-0.5 -1.387,-0.515 -1.99,-0.147l-1.275,0.776c-0.069,0.042 -0.185,0.059 -0.315,-0.002a8.465,8.465 0,0 0,-0.728 -0.302c-0.135,-0.05 -0.206,-0.143 -0.225,-0.221l-0.352,-1.45c-0.167,-0.687 -0.749,-1.249 -1.512,-1.304A11.149,11.149 0,0 0,12 1zM14.5,12a2.5,2.5 0,1 1,-5 0,2.5 2.5,0 0,1 5,0zM16,12a4,4 0,1 1,-8 0,4 4,0 0,1 8,0z"
-      android:fillType="evenOdd"
-      tools:ignore="VectorPath" />
+      android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M19.4,15a1.65,1.65 0,0 0,0.33 1.82l0.06,0.06a2,2 0,0 1,0 2.83,2 2,0 0,1 -2.83,0l-0.06,-0.06a1.65,1.65 0,0 0,-1.82 -0.33,1.65 1.65,0 0,0 -1,1.51V21a2,2 0,0 1,-2 2,2 2,0 0,1 -2,-2v-0.09A1.65,1.65 0,0 0,9 19.4a1.65,1.65 0,0 0,-1.82 0.33l-0.06,0.06a2,2 0,0 1,-2.83 0,2 2,0 0,1 0,-2.83l0.06,-0.06a1.65,1.65 0,0 0,0.33 -1.82,1.65 1.65,0 0,0 -1.51,-1H3a2,2 0,0 1,-2 -2,2 2,0 0,1 2,-2h0.09A1.65,1.65 0,0 0,4.6 9a1.65,1.65 0,0 0,-0.33 -1.82l-0.06,-0.06a2,2 0,0 1,0 -2.83,2 2,0 0,1 2.83,0l0.06,0.06a1.65,1.65 0,0 0,1.82 0.33H9a1.65,1.65 0,0 0,1 -1.51V3a2,2 0,0 1,2 -2,2 2,0 0,1 2,2v0.09a1.65,1.65 0,0 0,1 1.51,1.65 1.65,0 0,0 1.82,-0.33l0.06,-0.06a2,2 0,0 1,2.83 0,2 2,0 0,1 0,2.83l-0.06,0.06a1.65,1.65 0,0 0,-0.33 1.82V9a1.65,1.65 0,0 0,1.51 1H21a2,2 0,0 1,2 2,2 2,0 0,1 -2,2h-0.09a1.65,1.65 0,0 0,-1.51 1z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="?attr/iconsColor"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 03d2ce36..494c9dc4 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -8,34 +8,34 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M6,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M18,19m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M8.59,13.51L15.42,17.49"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M15.41,6.51L8.59,10.49"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
index d332c8ec..46e8ad01 100644
--- a/app/src/main/res/drawable/ic_star.xml
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -8,7 +8,7 @@
         android:pathData="M12,2l3.09,6.26l6.91,1.01l-5,4.87l1.18,6.88l-6.18,-3.25l-6.18,3.25l1.18,-6.88l-5,-4.87l6.91,-1.01l3.09,-6.26z"
         android:strokeLineJoin="round"
         android:strokeWidth="2"
-        android:fillColor="#368F73"
-        android:strokeColor="#368F73"
+        android:fillColor="?attr/iconsColor"
+        android:strokeColor="?attr/iconsColor"
         android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_unfilled.xml b/app/src/main/res/drawable/ic_star_unfilled.xml
index 0e338c4c..2ad4c8e9 100644
--- a/app/src/main/res/drawable/ic_star_unfilled.xml
+++ b/app/src/main/res/drawable/ic_star_unfilled.xml
@@ -9,6 +9,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_tool.xml b/app/src/main/res/drawable/ic_tool.xml
index e4cce1e7..cec91fef 100644
--- a/app/src/main/res/drawable/ic_tool.xml
+++ b/app/src/main/res/drawable/ic_tool.xml
@@ -8,6 +8,6 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_unlock.xml b/app/src/main/res/drawable/ic_unlock.xml
index a06f66b2..69322218 100644
--- a/app/src/main/res/drawable/ic_unlock.xml
+++ b/app/src/main/res/drawable/ic_unlock.xml
@@ -8,13 +8,13 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M7,11V7a5,5 0,0 1,9.9 -1"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368F73"
+      android:strokeColor="?attr/iconsColor"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_unwatch.xml b/app/src/main/res/drawable/ic_unwatch.xml
index 051d0208..abb78f9f 100644
--- a/app/src/main/res/drawable/ic_unwatch.xml
+++ b/app/src/main/res/drawable/ic_unwatch.xml
@@ -8,13 +8,13 @@
         android:strokeLineJoin="round"
         android:strokeWidth="2"
         android:fillColor="#00000000"
-        android:strokeColor="#368F73"
+        android:strokeColor="?attr/iconsColor"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
         android:strokeLineJoin="round"
         android:strokeWidth="2"
         android:fillColor="#00000000"
-        android:strokeColor="#368F73"
+        android:strokeColor="?attr/iconsColor"
         android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_verified_user.xml b/app/src/main/res/drawable/ic_verified_user.xml
index cc155514..fe957909 100644
--- a/app/src/main/res/drawable/ic_verified_user.xml
+++ b/app/src/main/res/drawable/ic_verified_user.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="?attr/iconsColor"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z"/>
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
index e5541c63..53514f5b 100644
--- a/app/src/main/res/drawable/ic_warning.xml
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="?attr/iconsColor"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
diff --git a/app/src/main/res/drawable/ic_watchers.xml b/app/src/main/res/drawable/ic_watchers.xml
index f585f63e..d4f40478 100644
--- a/app/src/main/res/drawable/ic_watchers.xml
+++ b/app/src/main/res/drawable/ic_watchers.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#368f73"
+<vector android:height="24dp" android:tint="?attr/iconsColor"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" 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"/>
diff --git a/app/src/main/res/drawable/shape_badge_background.xml b/app/src/main/res/drawable/shape_badge_background.xml
index 79c7f015..896ae05a 100644
--- a/app/src/main/res/drawable/shape_badge_background.xml
+++ b/app/src/main/res/drawable/shape_badge_background.xml
@@ -4,11 +4,11 @@
 
     <corners android:radius="2dp" />
     <solid
-        android:color="@color/colorDarkGreen"/>
+        android:color="?attr/iconsColor"/>
     <padding
         android:bottom="2dp"
         android:left="5dp"
         android:right="5dp"
         android:top="2dp" />
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/drawable/shape_circle.xml b/app/src/main/res/drawable/shape_circle.xml
index 63a896ff..a9381f54 100644
--- a/app/src/main/res/drawable/shape_circle.xml
+++ b/app/src/main/res/drawable/shape_circle.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <solid
-        android:color="@color/darkGreen"/>
+        android:color="?attr/iconsColor"/>
 </shape>
diff --git a/app/src/main/res/drawable/shape_dropdown.xml b/app/src/main/res/drawable/shape_dropdown.xml
index 9974acb5..f967901c 100644
--- a/app/src/main/res/drawable/shape_dropdown.xml
+++ b/app/src/main/res/drawable/shape_dropdown.xml
@@ -18,4 +18,4 @@ android:shape="rectangle">
         android:bottom="0dp">
     </padding>
 
-</shape>
\ No newline at end of file
+</shape>
diff --git a/app/src/main/res/layout/activity_file_diff.xml b/app/src/main/res/layout/activity_file_diff.xml
index 1ebc36b5..9c465288 100644
--- a/app/src/main/res/layout/activity_file_diff.xml
+++ b/app/src/main/res/layout/activity_file_diff.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:background="?attr/primaryBackgroundColor">
 
@@ -61,13 +61,11 @@
 
     </LinearLayout>
 
-    <ProgressBar
+    <com.google.android.material.progressindicator.ProgressIndicator
         android:id="@+id/progress_bar"
-        style="@style/Base.Widget.AppCompat.ProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_horizontal"
-        android:indeterminate="true"
-        android:visibility="visible" />
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Widget.MaterialComponents.ProgressIndicator.Linear.Indeterminate"
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index b0e62fb4..80efb9cd 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -48,7 +48,7 @@
             android:text="@string/commentButtonText"
             android:contentDescription="@string/commentButtonText"
             android:textColor="@color/colorWhite"
-            android:backgroundTint="@color/darkGreen"
+            android:backgroundTint="?attr/fabColor"
             android:layout_gravity="bottom|end"
             app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
             app:iconTint="@color/colorWhite"
diff --git a/app/src/main/res/layout/activity_org_detail.xml b/app/src/main/res/layout/activity_org_detail.xml
index 23ab3bce..ef9bb36c 100644
--- a/app/src/main/res/layout/activity_org_detail.xml
+++ b/app/src/main/res/layout/activity_org_detail.xml
@@ -40,6 +40,7 @@
             app:tabMode="scrollable"
             app:tabTextColor="?attr/primaryTextColor"
             android:background="?attr/primaryBackgroundColor"
+            app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/activity_repo_detail.xml b/app/src/main/res/layout/activity_repo_detail.xml
index 1b7a3d20..20e62336 100644
--- a/app/src/main/res/layout/activity_repo_detail.xml
+++ b/app/src/main/res/layout/activity_repo_detail.xml
@@ -41,7 +41,7 @@
             android:layout_width="match_parent"
             android:background="?attr/primaryBackgroundColor"
             app:tabTextColor="?attr/primaryTextColor"
-            app:tabIndicatorColor="@color/darkGreen"
+            app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
             android:layout_height="wrap_content">
 
             <com.google.android.material.tabs.TabItem
diff --git a/app/src/main/res/layout/custom_user_accounts_dialog.xml b/app/src/main/res/layout/custom_user_accounts_dialog.xml
index 1a6a660e..2035babb 100644
--- a/app/src/main/res/layout/custom_user_accounts_dialog.xml
+++ b/app/src/main/res/layout/custom_user_accounts_dialog.xml
@@ -34,7 +34,7 @@
         android:paddingEnd="4dp"
         android:text="@string/pageTitleUserAccounts"
         android:textColor="@color/colorWhite"
-        android:textSize="14sp" />
+        android:textSize="16sp" />
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/custom_user_accounts_list.xml b/app/src/main/res/layout/custom_user_accounts_list.xml
index 5df00a9c..4809bf39 100644
--- a/app/src/main/res/layout/custom_user_accounts_list.xml
+++ b/app/src/main/res/layout/custom_user_accounts_list.xml
@@ -31,7 +31,7 @@
             android:layout_weight=".95"
             android:layout_gravity="start"
             android:textColor="?attr/primaryTextColor"
-            android:textSize="14sp"
+            android:textSize="16sp"
             android:textStyle="bold" />
 
         <ImageView
@@ -54,7 +54,7 @@
         android:layout_toEndOf="@+id/profileImage"
         android:layout_below="@+id/frameAccountsInfo"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="14sp" />
+        android:textSize="16sp" />
 
 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_my_repositories.xml b/app/src/main/res/layout/fragment_my_repositories.xml
index d8d2c16b..8c4b141b 100644
--- a/app/src/main/res/layout/fragment_my_repositories.xml
+++ b/app/src/main/res/layout/fragment_my_repositories.xml
@@ -48,7 +48,7 @@
         android:text="@string/pageTitleNewRepo"
         android:contentDescription="@string/pageTitleNewRepo"
         android:textColor="@color/colorWhite"
-        android:backgroundTint="@color/darkGreen"
+        android:backgroundTint="?attr/fabColor"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
         app:iconTint="@color/colorWhite"
         app:icon="@drawable/ic_add" />
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
index 2ec2b49c..88442a5a 100644
--- a/app/src/main/res/layout/fragment_notifications.xml
+++ b/app/src/main/res/layout/fragment_notifications.xml
@@ -55,7 +55,7 @@
         android:text="@string/markAsRead"
         android:contentDescription="@string/markAsRead"
         android:textColor="@color/colorWhite"
-        android:backgroundTint="@color/darkGreen"
+        android:backgroundTint="?attr/fabColor"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
         app:iconTint="@color/colorWhite"
         app:icon="@drawable/ic_done" />
diff --git a/app/src/main/res/layout/fragment_organizations.xml b/app/src/main/res/layout/fragment_organizations.xml
index 27c50655..d14654ef 100644
--- a/app/src/main/res/layout/fragment_organizations.xml
+++ b/app/src/main/res/layout/fragment_organizations.xml
@@ -46,7 +46,7 @@
         android:text="@string/pageTitleCreateOrganization"
         android:contentDescription="@string/pageTitleCreateOrganization"
         android:textColor="@color/colorWhite"
-        android:backgroundTint="@color/darkGreen"
+        android:backgroundTint="?attr/fabColor"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
         app:iconTint="@color/colorWhite"
         app:icon="@drawable/ic_add" />
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index bfe0a10b..5be95c23 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -111,7 +111,7 @@
             android:layout_width="match_parent"
             app:tabTextColor="?attr/primaryTextColor"
             android:background="?attr/primaryBackgroundColor"
-            app:tabIndicatorColor="@color/darkGreen"
+            app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
             android:layout_height="wrap_content">
 
             <com.google.android.material.tabs.TabItem
diff --git a/app/src/main/res/layout/fragment_repositories.xml b/app/src/main/res/layout/fragment_repositories.xml
index 3044e1e0..a3b7ea53 100644
--- a/app/src/main/res/layout/fragment_repositories.xml
+++ b/app/src/main/res/layout/fragment_repositories.xml
@@ -48,7 +48,7 @@
         android:text="@string/pageTitleNewRepo"
         android:contentDescription="@string/pageTitleNewRepo"
         android:textColor="@color/colorWhite"
-        android:backgroundTint="@color/darkGreen"
+        android:backgroundTint="?attr/fabColor"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
         app:iconTint="@color/colorWhite"
         app:icon="@drawable/ic_add" />
diff --git a/app/src/main/res/layout/fragment_starred_repositories.xml b/app/src/main/res/layout/fragment_starred_repositories.xml
index 3044e1e0..a3b7ea53 100644
--- a/app/src/main/res/layout/fragment_starred_repositories.xml
+++ b/app/src/main/res/layout/fragment_starred_repositories.xml
@@ -48,7 +48,7 @@
         android:text="@string/pageTitleNewRepo"
         android:contentDescription="@string/pageTitleNewRepo"
         android:textColor="@color/colorWhite"
-        android:backgroundTint="@color/darkGreen"
+        android:backgroundTint="?attr/fabColor"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
         app:iconTint="@color/colorWhite"
         app:icon="@drawable/ic_add" />
diff --git a/app/src/main/res/layout/fragment_user_accounts.xml b/app/src/main/res/layout/fragment_user_accounts.xml
index 69e8abc3..1b9058bd 100644
--- a/app/src/main/res/layout/fragment_user_accounts.xml
+++ b/app/src/main/res/layout/fragment_user_accounts.xml
@@ -30,7 +30,7 @@
         android:text="@string/addNewAccount"
         android:contentDescription="@string/addNewAccount"
         android:textColor="@color/colorWhite"
-        android:backgroundTint="@color/darkGreen"
+        android:backgroundTint="?attr/fabColor"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
         app:iconTint="@color/colorWhite"
         app:icon="@drawable/ic_add" />
diff --git a/app/src/main/res/layout/list_files.xml b/app/src/main/res/layout/list_files.xml
index c4a18e5b..cf59bc16 100644
--- a/app/src/main/res/layout/list_files.xml
+++ b/app/src/main/res/layout/list_files.xml
@@ -13,19 +13,45 @@
         android:layout_height="wrap_content"
         android:visibility="invisible" />
 
-    <ImageView
-        android:id="@+id/fileImage"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
-        android:layout_marginEnd="15dp"
-        android:contentDescription="@string/repoContentAvatar"
-        android:src="@drawable/ic_file" />
+    <RelativeLayout
+        android:id="@+id/imageTypes"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/fileImage"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_marginEnd="15dp"
+            android:contentDescription="@string/generalImgContentText"
+            android:visibility="gone"
+            android:src="@drawable/ic_file" />
+
+        <ImageView
+            android:id="@+id/dirImage"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_marginEnd="15dp"
+            android:contentDescription="@string/generalImgContentText"
+            android:visibility="gone"
+            android:src="@drawable/ic_directory" />
+
+        <ImageView
+            android:id="@+id/unknownImage"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_marginEnd="15dp"
+            android:contentDescription="@string/generalImgContentText"
+            android:visibility="gone"
+            android:src="@drawable/ic_question" />
+
+    </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/infoSection"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@+id/fileImage"
+        android:layout_toEndOf="@+id/imageTypes"
         android:orientation="horizontal">
 
         <TextView
diff --git a/app/src/main/res/layout/list_notifications.xml b/app/src/main/res/layout/list_notifications.xml
index bc957bdc..381d57e5 100644
--- a/app/src/main/res/layout/list_notifications.xml
+++ b/app/src/main/res/layout/list_notifications.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="20dp">
+        android:padding="16dp">
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -21,13 +21,29 @@
             android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/type"
+                android:id="@+id/typePr"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="top"
                 android:contentDescription="@string/generalImgContentText"
                 app:srcCompat="@drawable/ic_pull_request" />
 
+            <ImageView
+                android:id="@+id/typeIssue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:contentDescription="@string/generalImgContentText"
+                app:srcCompat="@drawable/ic_issue" />
+
+            <ImageView
+                android:id="@+id/typeUnknown"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:contentDescription="@string/generalImgContentText"
+                app:srcCompat="@drawable/ic_question" />
+
             <Space
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
diff --git a/app/src/main/res/layout/spinner_item.xml b/app/src/main/res/layout/spinner_item.xml
index 0f40728f..3d27e7e0 100644
--- a/app/src/main/res/layout/spinner_item.xml
+++ b/app/src/main/res/layout/spinner_item.xml
@@ -4,4 +4,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:textSize="16sp"
-    android:textColor="@color/darkGreen" />
+    android:textColor="?attr/colorPrimary" />
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index e8fe3576..eebcf4cf 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- Light theme -->
     <style name="AppThemeLight" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="android:statusBarColor">@color/lightThemeBackground</item>
         <item name="android:windowLightStatusBar">true</item>
@@ -29,6 +30,46 @@
         <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
         <item name="searchViewStyle">@style/AppSearchViewStyle</item>
         <item name="progressIndicatorColor">@color/darkGreen</item>
+        <item name="fabColor">@color/darkGreen</item>
+        <item name="iconsColor">@color/darkGreen</item>
+        <item name="pagerTabIndicatorColor">@color/darkGreen</item>
     </style>
+    <!-- Light theme -->
+
+    <!-- Retro theme -->
+    <style name="AppThemeRetro" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/retroThemeBackground</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:typeface">monospace</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorSecondary">@color/retroThemeTextColor</item>
+        <item name="android:textColorPrimary">@color/retroThemeTextColor</item>
+        <item name="colorPrimary">@color/retroThemeColorPrimary</item>
+        <item name="colorSecondary">@color/retroThemeColorSecondary</item>
+
+        <item name="diffAddedColor">@color/retroThemeDiffAddedColor</item>
+        <item name="diffRemovedColor">@color/retroThemeDiffRemovedColor</item>
+        <item name="diffSelectedColor">@color/retroThemeDiffSelectedColor</item>
+        <item name="primaryTextColor">@color/retroThemeTextColor</item>
+        <item name="primaryBackgroundColor">@color/retroThemeBackground</item>
+        <item name="inputBackgroundColor">@color/retroThemeInputBackground</item>
+        <item name="inputTextColor">@color/retroThemeInputTextColor</item>
+        <item name="checkboxStyle">@style/AppThemeRetroCheckBoxStyle</item>
+        <item name="selectedTextColor">@color/retroThemeColorPrimary</item>
+        <item name="alertDialogTheme">@style/AppThemeRetroConfirmDialog</item>
+        <item name="popupMenuStyle">@style/AppThemeRetroPopupMenuStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="autoCompleteTextViewStyle">@style/AppThemeRetroSearchAutoCompleteTextView</item>
+        <item name="hintColor">@color/hintColor</item>
+        <item name="colorControlActivated">@color/retroThemeColorPrimary</item>
+        <item name="dividerColor">@color/retroThemeDividerColor</item>
+        <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
+        <item name="searchViewStyle">@style/AppSearchViewStyle</item>
+        <item name="progressIndicatorColor">@color/retroThemeColorPrimary</item>
+        <item name="fabColor">@color/retroThemeColorPrimary</item>
+        <item name="iconsColor">@color/retroThemeColorPrimary</item>
+        <item name="pagerTabIndicatorColor">@color/retroThemeColorPrimary</item>
+    </style>
+    <!-- Retro theme -->
 
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c1028eb7..268fa6c6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -12,4 +12,7 @@
     <attr name="alertDialogTheme" format="reference" />
     <attr name="dividerColor" format="reference" />
     <attr name="progressIndicatorColor" format="reference" />
+    <attr name="fabColor" format="reference" />
+    <attr name="iconsColor" format="reference" />
+    <attr name="pagerTabIndicatorColor" format="reference" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7d83a385..10192bf5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -35,8 +35,19 @@
     <color name="lightThemeDiffSelectedColor">#e0e0e0</color>
     <color name="lightThemeTextColor">#646565</color>
     <color name="lightThemeBackground">#f9f9f9</color>
-    <color name="lightThemeInputBackground">#b6bbbf</color>
+    <color name="lightThemeInputBackground">#f2f2f2</color>
     <color name="lightThemeInputTextColor">#212121</color>
     <color name="lightThemeDividerColor">#dbdbdb</color>
 
+    <color name="retroThemeDiffRemovedColor">#fad6d6</color>
+    <color name="retroThemeDiffAddedColor">#d0f7d9</color>
+    <color name="retroThemeDiffSelectedColor">#d8d8d8</color>
+    <color name="retroThemeTextColor">#212f3c</color>
+    <color name="retroThemeBackground">#fcfcfc</color>
+    <color name="retroThemeInputBackground">#f2f2f2</color>
+    <color name="retroThemeInputTextColor">#6200EE</color>
+    <color name="retroThemeDividerColor">#dbdbdb</color>
+    <color name="retroThemeColorPrimary">#6200EE</color>
+    <color name="retroThemeColorSecondary">#03DAC6</color>
+
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4d758fe6..d58a6b13 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -30,6 +30,9 @@
         <item name="bottomSheetDialogTheme">@style/AppThemeDarkBottomSheetDialog</item>
         <item name="searchViewStyle">@style/AppSearchViewStyle</item>
         <item name="progressIndicatorColor">@color/darkGreen</item>
+        <item name="fabColor">@color/darkGreen</item>
+        <item name="iconsColor">@color/darkGreen</item>
+        <item name="pagerTabIndicatorColor">@color/darkGreen</item>
     </style>
     <!-- Dark theme - default -->
 
@@ -62,9 +65,47 @@
         <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
         <item name="searchViewStyle">@style/AppSearchViewStyle</item>
         <item name="progressIndicatorColor">@color/darkGreen</item>
+        <item name="fabColor">@color/darkGreen</item>
+        <item name="iconsColor">@color/darkGreen</item>
+        <item name="pagerTabIndicatorColor">@color/darkGreen</item>
     </style>
     <!-- Light theme -->
 
+    <!-- Retro theme -->
+    <style name="AppThemeRetro" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/retroThemeBackground</item>
+        <item name="android:typeface">monospace</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorSecondary">@color/retroThemeTextColor</item>
+        <item name="android:textColorPrimary">@color/retroThemeTextColor</item>
+        <item name="colorPrimary">@color/retroThemeColorPrimary</item>
+        <item name="colorSecondary">@color/retroThemeColorSecondary</item>
+
+        <item name="diffAddedColor">@color/retroThemeDiffAddedColor</item>
+        <item name="diffRemovedColor">@color/retroThemeDiffRemovedColor</item>
+        <item name="diffSelectedColor">@color/retroThemeDiffSelectedColor</item>
+        <item name="primaryTextColor">@color/retroThemeTextColor</item>
+        <item name="primaryBackgroundColor">@color/retroThemeBackground</item>
+        <item name="inputBackgroundColor">@color/retroThemeInputBackground</item>
+        <item name="inputTextColor">@color/retroThemeInputTextColor</item>
+        <item name="checkboxStyle">@style/AppThemeRetroCheckBoxStyle</item>
+        <item name="selectedTextColor">@color/retroThemeColorPrimary</item>
+        <item name="alertDialogTheme">@style/AppThemeRetroConfirmDialog</item>
+        <item name="popupMenuStyle">@style/AppThemeRetroPopupMenuStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
+        <item name="autoCompleteTextViewStyle">@style/AppThemeRetroSearchAutoCompleteTextView</item>
+        <item name="hintColor">@color/hintColor</item>
+        <item name="colorControlActivated">@color/retroThemeColorPrimary</item>
+        <item name="dividerColor">@color/retroThemeDividerColor</item>
+        <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
+        <item name="searchViewStyle">@style/AppSearchViewStyle</item>
+        <item name="progressIndicatorColor">@color/retroThemeColorPrimary</item>
+        <item name="fabColor">@color/retroThemeColorPrimary</item>
+        <item name="iconsColor">@color/retroThemeColorPrimary</item>
+        <item name="pagerTabIndicatorColor">@color/retroThemeColorPrimary</item>
+    </style>
+    <!-- Retro theme -->
+
     <style name="AppSearchViewStyle" parent="Widget.AppCompat.SearchView">
         <item name="searchHintIcon">@drawable/ic_search</item>
         <item name="searchIcon">@null</item>
@@ -153,4 +194,47 @@
         <item name="buttonTint">@color/colorWhite</item>
     </style>
 
+    <!-- Retro theme styles -->
+    <style name="AppThemeRetroCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">
+        <item name="buttonTint">@color/retroThemeColorPrimary</item>
+    </style>
+
+    <style name="AppThemeRetroSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
+        <item name="android:textColor">@color/retroThemeColorPrimary</item>
+        <item name="android:textColorHint">@color/retroThemeColorPrimary</item>
+    </style>
+
+    <style name="AppThemeRetroConfirmDialog" parent="ThemeOverlay.MaterialComponents.Dialog.Alert">
+        <item name="android:background">@color/colorWhite</item>
+        <item name="android:textColorPrimary">@color/retroThemeTextColor</item>
+        <item name="android:textColor">@color/retroThemeTextColor</item>
+        <item name="colorControlNormal">@color/retroThemeTextColor</item>
+        <item name="colorControlActivated">@color/retroThemeColorPrimary</item>
+        <item name="buttonBarNegativeButtonStyle">@style/RetroNegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/RetroPositiveButtonStyle</item>
+        <item name="buttonBarNeutralButtonStyle">@style/RetroNeutralButtonStyle</item>
+        <item name="android:windowBackground">@drawable/shape_round_corners</item>
+    </style>
+
+    <style name="RetroNegativeButtonStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:textColor">@color/retroThemeTextColor</item>
+    </style>
+
+    <style name="RetroPositiveButtonStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:textColor">@color/darkRed</item>
+    </style>
+
+    <style name="RetroNeutralButtonStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:textColor">@color/retroThemeColorPrimary</item>
+    </style>
+
+    <style name="AppThemeRetroPopupMenuStyle" parent="Widget.MaterialComponents.PopupMenu">
+        <item name="android:popupBackground">@color/colorWhite</item>
+        <item name="android:itemBackground">@color/retroThemeBackground</item>
+        <item name="android:textColor">@color/retroThemeTextColor</item>
+        <item name="android:layout_marginStart">3dp</item>
+        <item name="android:layout_marginEnd">3dp</item>
+    </style>
+    <!-- Retro theme styles -->
+
 </resources>