From a8a34ccc7af42b3a945a9982f7c7269ecbdf1af7 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@noreply.codeberg.org>
Date: Fri, 10 Jul 2020 22:54:09 +0200
Subject: [PATCH] New icons (#587)

repo info icons update

Update icons across the app

Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/587
Reviewed-by: 6543 <6543@noreply.codeberg.org>
---
 .../adapters/ExploreRepositoriesAdapter.java  |  2 +-
 .../mian/gitnex/adapters/FilesAdapter.java    |  4 ++--
 .../gitnex/adapters/MyReposListAdapter.java   |  2 +-
 .../gitnex/adapters/ReposListAdapter.java     |  2 +-
 .../adapters/RepositoriesByOrgAdapter.java    |  2 +-
 .../adapters/StarredReposListAdapter.java     |  2 +-
 app/src/main/res/drawable/ic_archive.xml      | 19 +++++++++++++++----
 app/src/main/res/drawable/ic_calendar.xml     | 13 +++++++++----
 app/src/main/res/drawable/ic_comment.xml      | 13 +++++++++----
 app/src/main/res/drawable/ic_comment_20.xml   |  5 -----
 app/src/main/res/drawable/ic_directory.xml    | 10 ++++++++++
 app/src/main/res/drawable/ic_download.xml     |  9 +++++++++
 app/src/main/res/drawable/ic_file.xml         | 13 +++++++++----
 app/src/main/res/drawable/ic_file_new.xml     | 11 -----------
 app/src/main/res/drawable/ic_folder_24.xml    |  5 -----
 app/src/main/res/drawable/ic_fork.xml         | 18 ++++++++++++++++++
 app/src/main/res/drawable/ic_forks_24.xml     |  5 -----
 app/src/main/res/drawable/ic_issue.xml        | 13 +++++++++++++
 app/src/main/res/drawable/ic_issue_closed.xml | 15 +++++++++++----
 app/src/main/res/drawable/ic_issue_open.xml   |  5 -----
 .../main/res/drawable/ic_issue_open_white.xml |  5 -----
 app/src/main/res/drawable/ic_label.xml        | 16 ++++++++++++----
 app/src/main/res/drawable/ic_lock.xml         | 10 ++++++++++
 app/src/main/res/drawable/ic_lock_24dp.xml    |  5 -----
 app/src/main/res/drawable/ic_lock_bold.xml    |  5 -----
 app/src/main/res/drawable/ic_merge.xml        |  5 -----
 app/src/main/res/drawable/ic_milestone.xml    | 13 +++++++++----
 .../main/res/drawable/ic_my_repositories.xml  |  5 -----
 app/src/main/res/drawable/ic_organization.xml | 13 +++++++++++++
 app/src/main/res/drawable/ic_pull_request.xml | 14 ++++++++++++++
 app/src/main/res/drawable/ic_repo.xml         | 13 +++++++++++++
 app/src/main/res/drawable/ic_repos.xml        |  5 -----
 app/src/main/res/layout/activity_login.xml    |  4 ++--
 .../res/layout/bottom_sheet_file_viewer.xml   |  2 +-
 .../res/layout/bottom_sheet_issues_filter.xml |  2 +-
 .../layout/bottom_sheet_milestones_filter.xml |  4 ++--
 .../res/layout/bottom_sheet_organization.xml  |  2 +-
 .../bottom_sheet_pull_request_filter.xml      |  2 +-
 app/src/main/res/layout/bottom_sheet_repo.xml |  2 +-
 .../res/layout/bottom_sheet_single_issue.xml  |  4 ++--
 .../main/res/layout/fragment_repo_info.xml    | 16 ++++++++--------
 app/src/main/res/layout/list_issues.xml       |  2 +-
 app/src/main/res/layout/list_milestones.xml   | 16 ++++++++--------
 app/src/main/res/layout/list_pr.xml           |  2 +-
 app/src/main/res/layout/list_releases.xml     |  4 ++--
 .../res/layout/list_releases_downloads.xml    |  2 +-
 app/src/main/res/layout/list_repositories.xml | 14 +++++++-------
 app/src/main/res/menu/drawer_menu.xml         |  6 +++---
 48 files changed, 223 insertions(+), 138 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_comment_20.xml
 create mode 100644 app/src/main/res/drawable/ic_directory.xml
 create mode 100644 app/src/main/res/drawable/ic_download.xml
 delete mode 100644 app/src/main/res/drawable/ic_file_new.xml
 delete mode 100644 app/src/main/res/drawable/ic_folder_24.xml
 create mode 100644 app/src/main/res/drawable/ic_fork.xml
 delete mode 100644 app/src/main/res/drawable/ic_forks_24.xml
 create mode 100644 app/src/main/res/drawable/ic_issue.xml
 delete mode 100644 app/src/main/res/drawable/ic_issue_open.xml
 delete mode 100644 app/src/main/res/drawable/ic_issue_open_white.xml
 create mode 100644 app/src/main/res/drawable/ic_lock.xml
 delete mode 100644 app/src/main/res/drawable/ic_lock_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_lock_bold.xml
 delete mode 100644 app/src/main/res/drawable/ic_merge.xml
 delete mode 100644 app/src/main/res/drawable/ic_my_repositories.xml
 create mode 100644 app/src/main/res/drawable/ic_organization.xml
 create mode 100644 app/src/main/res/drawable/ic_pull_request.xml
 create mode 100644 app/src/main/res/drawable/ic_repo.xml
 delete mode 100644 app/src/main/res/drawable/ic_repos.xml

diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
index 49b362a0..7a06ff43 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -258,7 +258,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 		}
 		holder.fullName.setText(currentItem.getFullname());
 		if(currentItem.getPrivateFlag()) {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
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 7630ca31..022c21d5 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
@@ -160,13 +160,13 @@ 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_new));
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_file));
             holder.fileInfo.setVisibility(View.VISIBLE);
             holder.fileInfo.setText(AppUtil.formatFileSizeInDetail(currentItem.getSize()));
         }
         else if(currentItem.getType().equals("dir")) {
 	        holder.fileInfo.setVisibility(View.GONE);
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_folder_24));
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_directory));
         }
         else {
             holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question_mark_24));
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
index a380714a..ac6fba97 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@@ -260,7 +260,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 		}
 		holder.repoFullName.setText(currentItem.getFullname());
 		if(currentItem.getPrivateFlag()) {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index 186afb2e..49d14d7f 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -261,7 +261,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 		}
 		holder.fullName.setText(currentItem.getFullname());
 		if(currentItem.getPrivateFlag()) {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
 			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
index 46e25d18..e02a6120 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@@ -263,7 +263,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
         }
         holder.fullName.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
             holder.repoType.setText(R.string.strPrivate);
         }
         else {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
index b6b6f683..bebfd190 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@@ -264,7 +264,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
         }
         holder.fullName.setText(currentItem.getFullname());
         if(currentItem.getPrivateFlag()) {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock_bold);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_lock);
             holder.repoType.setText(R.string.strPrivate);
         }
         else {
diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml
index e69b8bfd..4605e3d2 100644
--- a/app/src/main/res/drawable/ic_archive.xml
+++ b/app/src/main/res/drawable/ic_archive.xml
@@ -1,5 +1,16 @@
-<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="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M2.75,2A1.75,1.75 0,0 0,1 3.75v3.5C1,8.216 1.784,9 2.75,9h18.5A1.75,1.75 0,0 0,23 7.25v-3.5A1.75,1.75 0,0 0,21.25 2L2.75,2zM21.25,3.5L2.75,3.5a0.25,0.25 0,0 0,-0.25 0.25v3.5c0,0.138 0.112,0.25 0.25,0.25h18.5a0.25,0.25 0,0 0,0.25 -0.25v-3.5a0.25,0.25 0,0 0,-0.25 -0.25z"
+      android:fillType="evenOdd"/>
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M2.75,10a0.75,0.75 0,0 1,0.75 0.75v9.5c0,0.138 0.112,0.25 0.25,0.25h16.5a0.25,0.25 0,0 0,0.25 -0.25v-9.5a0.75,0.75 0,0 1,1.5 0v9.5A1.75,1.75 0,0 1,20.25 22H3.75A1.75,1.75 0,0 1,2 20.25v-9.5a0.75,0.75 0,0 1,0.75 -0.75z"/>
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M9.75,11.5a0.75,0.75 0,0 0,0 1.5h4.5a0.75,0.75 0,0 0,0 -1.5h-4.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index bb4524e6..e0feca00 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -1,5 +1,10 @@
-<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="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2h-1L18,1h-2zM19,19L5,19L5,8h14v11z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M6.75,0a0.75,0.75 0,0 1,0.75 0.75L7.5,3h9L16.5,0.75a0.75,0.75 0,0 1,1.5 0L18,3h2.75c0.966,0 1.75,0.784 1.75,1.75v16a1.75,1.75 0,0 1,-1.75 1.75L3.25,22.5a1.75,1.75 0,0 1,-1.75 -1.75v-16C1.5,3.784 2.284,3 3.25,3L6,3L6,0.75A0.75,0.75 0,0 1,6.75 0zM3.25,4.5a0.25,0.25 0,0 0,-0.25 0.25L3,8h18L21,4.75a0.25,0.25 0,0 0,-0.25 -0.25L3.25,4.5zM21,9.5L3,9.5v11.25c0,0.138 0.112,0.25 0.25,0.25h17.5a0.25,0.25 0,0 0,0.25 -0.25L21,9.5z"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml
index 8aebe804..cbc8cb9d 100644
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -1,5 +1,10 @@
-<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="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M3.25,4a0.25,0.25 0,0 0,-0.25 0.25v12.5c0,0.138 0.112,0.25 0.25,0.25h2.5a0.75,0.75 0,0 1,0.75 0.75v3.19l3.72,-3.72a0.75,0.75 0,0 1,0.53 -0.22h10a0.25,0.25 0,0 0,0.25 -0.25L21,4.25a0.25,0.25 0,0 0,-0.25 -0.25L3.25,4zM1.5,4.25c0,-0.966 0.784,-1.75 1.75,-1.75h17.5c0.966,0 1.75,0.784 1.75,1.75v12.5a1.75,1.75 0,0 1,-1.75 1.75h-9.69l-3.573,3.573A1.457,1.457 0,0 1,5 21.043L5,18.5L3.25,18.5a1.75,1.75 0,0 1,-1.75 -1.75L1.5,4.25z"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_comment_20.xml b/app/src/main/res/drawable/ic_comment_20.xml
deleted file mode 100644
index e776fbea..00000000
--- a/app/src/main/res/drawable/ic_comment_20.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="20dp" android:tint="#368f73"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_directory.xml b/app/src/main/res/drawable/ic_directory.xml
new file mode 100644
index 00000000..77134c41
--- /dev/null
+++ b/app/src/main/res/drawable/ic_directory.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M2,4.75C2,3.784 2.784,3 3.75,3h4.971c0.58,0 1.12,0.286 1.447,0.765l1.404,2.063a0.25,0.25 0,0 0,0.207 0.11h8.471c0.966,0 1.75,0.783 1.75,1.75V19.25A1.75,1.75 0,0 1,20.25 21H3.75A1.75,1.75 0,0 1,2 19.25V4.75z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
new file mode 100644
index 00000000..d5ac6a96
--- /dev/null
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M4.97,11.03a0.75,0.75 0,1 1,1.06 -1.06L11,14.94L11,2.75a0.75,0.75 0,0 1,1.5 0v12.19l4.97,-4.97a0.75,0.75 0,1 1,1.06 1.06l-6.25,6.25a0.75,0.75 0,0 1,-1.06 0l-6.25,-6.25zM4.75,20.5a0.75,0.75 0,0 0,0 1.5h14.5a0.75,0.75 0,0 0,0 -1.5L4.75,20.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_file.xml b/app/src/main/res/drawable/ic_file.xml
index dba37435..f1a8abca 100644
--- a/app/src/main/res/drawable/ic_file.xml
+++ b/app/src/main/res/drawable/ic_file.xml
@@ -1,5 +1,10 @@
-<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,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M5,2.5a0.5,0.5 0,0 0,-0.5 0.5v18a0.5,0.5 0,0 0,0.5 0.5h14a0.5,0.5 0,0 0,0.5 -0.5L19.5,8.5h-4a2,2 0,0 1,-2 -2v-4L5,2.5zM15,2.5v4a0.5,0.5 0,0 0,0.5 0.5h4a0.5,0.5 0,0 0,-0.146 -0.336l-4.018,-4.018A0.5,0.5 0,0 0,15 2.5zM3,3a2,2 0,0 1,2 -2h9.982a2,2 0,0 1,1.414 0.586l4.018,4.018A2,2 0,0 1,21 7.018L21,21a2,2 0,0 1,-2 2L5,23a2,2 0,0 1,-2 -2L3,3z"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_file_new.xml b/app/src/main/res/drawable/ic_file_new.xml
deleted file mode 100644
index 489e3ec0..00000000
--- a/app/src/main/res/drawable/ic_file_new.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16"
-    tools:ignore="VectorRaster">
-  <path
-      android:fillColor="#368f73"
-      android:pathData="m13.707,3.293 l-3,-3c-0.1875,-0.1875 -0.4419,-0.293 -0.707,-0.293h-7c-0.5522,0 -1,0.4478 -1,1v14c0,0.5527 0.4478,1 1,1h10c0.5522,0 1,-0.4473 1,-1v-11c0,-0.2651 -0.1055,-0.5195 -0.293,-0.707zM8,12h-3v-2h3zM11,9h-6v-2h6zM11,4c-0.5523,0 -1,-0.4478 -1,-1v-2l3,3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_24.xml b/app/src/main/res/drawable/ic_folder_24.xml
deleted file mode 100644
index 0e4fa59c..00000000
--- a/app/src/main/res/drawable/ic_folder_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_fork.xml b/app/src/main/res/drawable/ic_fork.xml
new file mode 100644
index 00000000..96bf2e7b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fork.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      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: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:pathData="M11.25,16.25v-5h1.5v5h-1.5z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_forks_24.xml b/app/src/main/res/drawable/ic_forks_24.xml
deleted file mode 100644
index 25ac239f..00000000
--- a/app/src/main/res/drawable/ic_forks_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="M14,4l2.29,2.29 -2.88,2.88 1.42,1.42 2.88,-2.88L20,10L20,4zM10,4L4,4v6l2.29,-2.29 4.71,4.7L11,20h2v-8.41l-5.29,-5.3z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_issue.xml b/app/src/main/res/drawable/ic_issue.xml
new file mode 100644
index 00000000..e0079e94
--- /dev/null
+++ b/app/src/main/res/drawable/ic_issue.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M12,7a0.75,0.75 0,0 1,0.75 0.75v4.5a0.75,0.75 0,0 1,-1.5 0v-4.5A0.75,0.75 0,0 1,12 7zM13,16a1,1 0,1 1,-2 0,1 1,0 0,1 2,0z"/>
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M12,1C5.925,1 1,5.925 1,12s4.925,11 11,11 11,-4.925 11,-11S18.075,1 12,1zM2.5,12a9.5,9.5 0,1 1,19 0,9.5 9.5,0 0,1 -19,0z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_issue_closed.xml b/app/src/main/res/drawable/ic_issue_closed.xml
index f60d56e6..36b53975 100644
--- a/app/src/main/res/drawable/ic_issue_closed.xml
+++ b/app/src/main/res/drawable/ic_issue_closed.xml
@@ -1,5 +1,12 @@
-<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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M2.5,12c0,-5.24 4.288,-9.5 9.593,-9.5a9.608,9.608 0,0 1,7.197 3.219,0.75 0.75,0 0,0 1.12,-0.998A11.108,11.108 0,0 0,12.093 1C5.973,1 1,5.919 1,12s4.973,11 11.093,11c5.403,0 9.91,-3.832 10.893,-8.915a0.75,0.75 0,1 0,-1.472 -0.285c-0.848,4.381 -4.74,7.7 -9.421,7.7C6.788,21.5 2.5,17.24 2.5,12z"/>
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M12,17a1,1 0,1 0,0 -2,1 1,0 0,0 0,2zM12,7a0.75,0.75 0,0 1,0.75 0.75v4.5a0.75,0.75 0,0 1,-1.5 0v-4.5A0.75,0.75 0,0 1,12 7zM23.28,7.78a0.75,0.75 0,0 0,-1.06 -1.06l-3.47,3.47 -1.47,-1.47a0.75,0.75 0,1 0,-1.06 1.06l2,2a0.75,0.75 0,0 0,1.06 0l4,-4z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_issue_open.xml b/app/src/main/res/drawable/ic_issue_open.xml
deleted file mode 100644
index 7180582e..00000000
--- a/app/src/main/res/drawable/ic_issue_open.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_issue_open_white.xml b/app/src/main/res/drawable/ic_issue_open_white.xml
deleted file mode 100644
index 7180582e..00000000
--- a/app/src/main/res/drawable/ic_issue_open_white.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_label.xml b/app/src/main/res/drawable/ic_label.xml
index 580cc961..e5d33e5c 100644
--- a/app/src/main/res/drawable/ic_label.xml
+++ b/app/src/main/res/drawable/ic_label.xml
@@ -1,5 +1,13 @@
-<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="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2H4c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M7.75,6.5a1.25,1.25 0,1 0,0 2.5,1.25 1.25,0 0,0 0,-2.5z"/>
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M2.5,1A1.5,1.5 0,0 0,1 2.5v8.44c0,0.397 0.158,0.779 0.44,1.06l10.25,10.25a1.5,1.5 0,0 0,2.12 0l8.44,-8.44a1.5,1.5 0,0 0,0 -2.12L12,1.44A1.5,1.5 0,0 0,10.94 1L2.5,1zM2.5,2.5h8.44l10.25,10.25 -8.44,8.44L2.5,10.94L2.5,2.5z"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 00000000..aa0bfc23
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M6,9L6,7.25C6,3.845 8.503,1 12,1s6,2.845 6,6.25L18,9h0.5a2.5,2.5 0,0 1,2.5 2.5v8a2.5,2.5 0,0 1,-2.5 2.5h-13A2.5,2.5 0,0 1,3 19.5v-8A2.5,2.5 0,0 1,5.5 9L6,9zM7.5,7.25C7.5,4.58 9.422,2.5 12,2.5c2.578,0 4.5,2.08 4.5,4.75L16.5,9h-9L7.5,7.25zM4.5,11.5a1,1 0,0 1,1 -1h13a1,1 0,0 1,1 1v8a1,1 0,0 1,-1 1h-13a1,1 0,0 1,-1 -1v-8z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_24dp.xml b/app/src/main/res/drawable/ic_lock_24dp.xml
deleted file mode 100644
index c8826764..00000000
--- a/app/src/main/res/drawable/ic_lock_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_lock_bold.xml b/app/src/main/res/drawable/ic_lock_bold.xml
deleted file mode 100644
index c6daf188..00000000
--- a/app/src/main/res/drawable/ic_lock_bold.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_merge.xml b/app/src/main/res/drawable/ic_merge.xml
deleted file mode 100644
index 4f3b8225..00000000
--- a/app/src/main/res/drawable/ic_merge.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="M17,20.41L18.41,19 15,15.59 13.59,17 17,20.41zM7.5,8H11v5.59L5.59,19 7,20.41l6,-6V8h3.5L12,3.5 7.5,8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_milestone.xml b/app/src/main/res/drawable/ic_milestone.xml
index a04d7e2e..57c297fe 100644
--- a/app/src/main/res/drawable/ic_milestone.xml
+++ b/app/src/main/res/drawable/ic_milestone.xml
@@ -1,5 +1,10 @@
-<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="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      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_my_repositories.xml b/app/src/main/res/drawable/ic_my_repositories.xml
deleted file mode 100644
index 52e62dad..00000000
--- a/app/src/main/res/drawable/ic_my_repositories.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="M10,16v-1L3.01,15L3,19c0,1.11 0.89,2 2,2h14c1.11,0 2,-0.89 2,-2v-4h-7v1h-4zM20,7h-4.01L15.99,5l-2,-2h-4l-2,2v2L4,7c-1.1,0 -2,0.9 -2,2v3c0,1.11 0.89,2 2,2h6v-2h4v2h6c1.1,0 2,-0.9 2,-2L22,9c0,-1.1 -0.9,-2 -2,-2zM14,7h-4L10,5h4v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_organization.xml b/app/src/main/res/drawable/ic_organization.xml
new file mode 100644
index 00000000..d6af441f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_organization.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      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: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_pull_request.xml b/app/src/main/res/drawable/ic_pull_request.xml
new file mode 100644
index 00000000..7a06e761
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pull_request.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M4.75,3a1.75,1.75 0,1 0,0 3.5,1.75 1.75,0 0,0 0,-3.5zM1.5,4.75a3.25,3.25 0,1 1,6.5 0,3.25 3.25,0 0,1 -6.5,0zM4.75,17.5a1.75,1.75 0,1 0,0 3.5,1.75 1.75,0 0,0 0,-3.5zM1.5,19.25a3.25,3.25 0,1 1,6.5 0,3.25 3.25,0 0,1 -6.5,0zM19.25,17.5a1.75,1.75 0,1 0,0 3.5,1.75 1.75,0 0,0 0,-3.5zM16,19.25a3.25,3.25 0,1 1,6.5 0,3.25 3.25,0 0,1 -6.5,0z"
+      android:fillType="evenOdd"/>
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M4.75,7.25A0.75,0.75 0,0 1,5.5 8v8A0.75,0.75 0,0 1,4 16L4,8a0.75,0.75 0,0 1,0.75 -0.75zM13.405,1.72a0.75,0.75 0,0 1,0 1.06L12.185,4h4.065A3.75,3.75 0,0 1,20 7.75v8.75a0.75,0.75 0,0 1,-1.5 0L18.5,7.75a2.25,2.25 0,0 0,-2.25 -2.25h-4.064l1.22,1.22a0.75,0.75 0,0 1,-1.061 1.06l-2.5,-2.5a0.75,0.75 0,0 1,0 -1.06l2.5,-2.5a0.75,0.75 0,0 1,1.06 0z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_repo.xml b/app/src/main/res/drawable/ic_repo.xml
new file mode 100644
index 00000000..05eed15b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repo.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#368f73"
+      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: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_repos.xml b/app/src/main/res/drawable/ic_repos.xml
deleted file mode 100644
index 7773644d..00000000
--- a/app/src/main/res/drawable/ic_repos.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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="M20,6h-3L17,4c0,-1.11 -0.89,-2 -2,-2L9,2c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -2,0.89 -2,2v11c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM9,4h6v2L9,6L9,4zM20,19L4,19v-2h16v2zM20,14L4,14L4,8h3v2h2L9,8h6v2h2L17,8h3v6z"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 714e5b2a..fcaeed91 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -142,7 +142,7 @@
             android:padding="10dp"
             android:textSize="14sp"
             tools:ignore="Autofill"
-            android:drawableStart="@drawable/ic_lock_24dp"
+            android:drawableStart="@drawable/ic_lock"
             android:drawablePadding="10dp"
             android:background="@drawable/shape_inputs"
             android:textColor="?attr/inputTextColor"
@@ -178,7 +178,7 @@
             android:padding="10dp"
             android:textSize="14sp"
             tools:ignore="Autofill"
-            android:drawableStart="@drawable/ic_lock_24dp"
+            android:drawableStart="@drawable/ic_lock"
             android:drawablePadding="10dp"
             android:background="@drawable/shape_inputs"
             android:textColor="?attr/inputTextColor"
diff --git a/app/src/main/res/layout/bottom_sheet_file_viewer.xml b/app/src/main/res/layout/bottom_sheet_file_viewer.xml
index 107015dd..65f535e2 100644
--- a/app/src/main/res/layout/bottom_sheet_file_viewer.xml
+++ b/app/src/main/res/layout/bottom_sheet_file_viewer.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/downloadFile"
-                android:drawableStart="@drawable/ic_file_download_24dp"
+                android:drawableStart="@drawable/ic_download"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/bottom_sheet_issues_filter.xml b/app/src/main/res/layout/bottom_sheet_issues_filter.xml
index 1193ba65..4ae9e66e 100644
--- a/app/src/main/res/layout/bottom_sheet_issues_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_issues_filter.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isOpen"
-                android:drawableStart="@drawable/ic_issue_open"
+                android:drawableStart="@drawable/ic_issue"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/bottom_sheet_milestones_filter.xml b/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
index 6fc48f88..3bbc112a 100644
--- a/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isOpen"
-                android:drawableStart="@drawable/ic_check"
+                android:drawableStart="@drawable/ic_milestone"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isClosed"
-                android:drawableStart="@drawable/ic_close"
+                android:drawableStart="@drawable/ic_done"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/bottom_sheet_organization.xml b/app/src/main/res/layout/bottom_sheet_organization.xml
index 6ef158fe..f6e5fa11 100644
--- a/app/src/main/res/layout/bottom_sheet_organization.xml
+++ b/app/src/main/res/layout/bottom_sheet_organization.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/createRepository"
-                android:drawableStart="@drawable/ic_repos"
+                android:drawableStart="@drawable/ic_repo"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml b/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
index d339478d..6f1d7f07 100644
--- a/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isOpen"
-                android:drawableStart="@drawable/ic_merge"
+                android:drawableStart="@drawable/ic_pull_request"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/bottom_sheet_repo.xml b/app/src/main/res/layout/bottom_sheet_repo.xml
index 70f828a5..cf1890aa 100644
--- a/app/src/main/res/layout/bottom_sheet_repo.xml
+++ b/app/src/main/res/layout/bottom_sheet_repo.xml
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleCreateNewIssue"
-                android:drawableStart="@drawable/ic_issue_open_white"
+                android:drawableStart="@drawable/ic_issue"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/bottom_sheet_single_issue.xml b/app/src/main/res/layout/bottom_sheet_single_issue.xml
index f3287c6a..45b1640c 100644
--- a/app/src/main/res/layout/bottom_sheet_single_issue.xml
+++ b/app/src/main/res/layout/bottom_sheet_single_issue.xml
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/mergePullRequestText"
-                android:drawableStart="@drawable/ic_merge"
+                android:drawableStart="@drawable/ic_pull_request"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
@@ -149,7 +149,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/closeIssue"
-                android:drawableStart="@drawable/ic_done"
+                android:drawableStart="@drawable/ic_issue_closed"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index 99efc044..945a47e9 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -97,7 +97,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:contentDescription="@string/repoStargazersInMenu"
-                            app:srcCompat="@drawable/ic_star" />
+                            app:srcCompat="@drawable/ic_star_border_24dp" />
 
                         <TextView
                             android:id="@+id/repoMetaStars"
@@ -119,7 +119,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:contentDescription="@string/tabPullRequests"
-                            app:srcCompat="@drawable/ic_merge" />
+                            app:srcCompat="@drawable/ic_pull_request" />
 
                         <TextView
                             android:id="@+id/repoMetaPullRequests"
@@ -141,7 +141,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:contentDescription="@string/infoTabRepoForksCount"
-                            app:srcCompat="@drawable/ic_forks_24" />
+                            app:srcCompat="@drawable/ic_fork" />
 
                         <TextView
                             android:id="@+id/repoMetaForks"
@@ -163,7 +163,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:contentDescription="@string/repoWatchersInMenu"
-                            app:srcCompat="@drawable/ic_watchers" />
+                            app:srcCompat="@drawable/ic_unwatch" />
 
                         <TextView
                             android:id="@+id/repoMetaWatchers"
@@ -193,12 +193,12 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:contentDescription="@string/repoWatchersInMenu"
-                        app:srcCompat="@drawable/ic_file_download_24dp" />
+                        app:srcCompat="@drawable/ic_download" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="15dp"
+                        android:layout_marginStart="15dp"
                         android:gravity="center_vertical"
                         android:orientation="vertical">
 
@@ -238,7 +238,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="15dp"
+                        android:layout_marginStart="15dp"
                         android:gravity="center_vertical"
                         android:orientation="vertical">
 
@@ -278,7 +278,7 @@
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="15dp"
+                        android:layout_marginStart="15dp"
                         android:gravity="center_vertical"
                         android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/list_issues.xml b/app/src/main/res/layout/list_issues.xml
index 6a15a290..6cb864ac 100644
--- a/app/src/main/res/layout/list_issues.xml
+++ b/app/src/main/res/layout/list_issues.xml
@@ -74,7 +74,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="start"
                         android:drawablePadding="5dp"
-                        android:drawableStart="@drawable/ic_comment_20"
+                        android:drawableStart="@drawable/ic_comment"
                         android:layout_gravity="center_horizontal"
                         android:textColor="?attr/primaryTextColor"
                         android:textSize="14sp" />
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index f6b5ebab..6b3540ad 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -51,8 +51,8 @@
                 style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                 android:layout_width="0dp"
                 android:layout_height="10dp"
-                android:layout_marginLeft="15dp"
-                android:layout_marginRight="10dp"
+                android:layout_marginStart="15dp"
+                android:layout_marginEnd="10dp"
                 android:layout_weight="1"
                 android:indeterminate="false"
                 android:progress="50"
@@ -70,14 +70,14 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginRight="15dp"
+                android:layout_marginEnd="15dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <ImageView
                     android:layout_width="15dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginEnd="5dp"
                     android:contentDescription="@string/generalImgContentText"
                     app:srcCompat="@drawable/ic_calendar" />
 
@@ -93,16 +93,16 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginRight="15dp"
+                android:layout_marginEnd="15dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <ImageView
                     android:layout_width="15dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginEnd="5dp"
                     android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_issue_open" />
+                    app:srcCompat="@drawable/ic_issue" />
 
                 <TextView
                     android:id="@+id/milestoneIssuesOpen"
@@ -122,7 +122,7 @@
                 <ImageView
                     android:layout_width="15dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginEnd="5dp"
                     android:contentDescription="@string/generalImgContentText"
                     app:srcCompat="@drawable/ic_issue_closed" />
 
diff --git a/app/src/main/res/layout/list_pr.xml b/app/src/main/res/layout/list_pr.xml
index 7aecb804..5e049754 100644
--- a/app/src/main/res/layout/list_pr.xml
+++ b/app/src/main/res/layout/list_pr.xml
@@ -97,7 +97,7 @@
                         android:layout_height="wrap_content"
                         android:gravity="start"
                         android:drawablePadding="5dp"
-                        android:drawableStart="@drawable/ic_comment_20"
+                        android:drawableStart="@drawable/ic_comment"
                         android:layout_gravity="center_horizontal"
                         android:textColor="?attr/primaryTextColor"
                         android:textSize="14sp" />
diff --git a/app/src/main/res/layout/list_releases.xml b/app/src/main/res/layout/list_releases.xml
index 12963600..95851f25 100644
--- a/app/src/main/res/layout/list_releases.xml
+++ b/app/src/main/res/layout/list_releases.xml
@@ -221,7 +221,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
-                android:drawableStart="@drawable/ic_file_download_24dp"
+                android:drawableStart="@drawable/ic_download"
                 android:drawablePadding="8dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
@@ -232,7 +232,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
-                android:drawableStart="@drawable/ic_file_download_24dp"
+                android:drawableStart="@drawable/ic_download"
                 android:drawablePadding="8dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
diff --git a/app/src/main/res/layout/list_releases_downloads.xml b/app/src/main/res/layout/list_releases_downloads.xml
index 89b5d92a..851e4dc2 100644
--- a/app/src/main/res/layout/list_releases_downloads.xml
+++ b/app/src/main/res/layout/list_releases_downloads.xml
@@ -12,7 +12,7 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_file_download_24dp"
+        app:srcCompat="@drawable/ic_download"
         android:contentDescription="@string/generalImgContentText" />
 
     <TextView
diff --git a/app/src/main/res/layout/list_repositories.xml b/app/src/main/res/layout/list_repositories.xml
index e9926f21..b2382c65 100644
--- a/app/src/main/res/layout/list_repositories.xml
+++ b/app/src/main/res/layout/list_repositories.xml
@@ -88,7 +88,7 @@
                     android:layout_height="20dp"
                     android:layout_weight=".05"
                     android:contentDescription="@string/privateAvatar"
-                    android:src="@drawable/ic_lock_24dp" />
+                    android:src="@drawable/ic_lock" />
 
             </LinearLayout>
 
@@ -128,10 +128,10 @@
                 <TextView
                     android:id="@+id/repoOpenIssuesCount"
                     android:layout_width="0dp"
-                    android:layout_height="20dp"
+                    android:layout_height="24dp"
                     android:layout_gravity="center_vertical"
                     android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_issue_open"
+                    android:drawableStart="@drawable/ic_issue"
                     android:drawablePadding="6dp"
                     android:gravity="center_vertical"
                     android:text="@string/repoWatchers"
@@ -141,10 +141,10 @@
                 <TextView
                     android:id="@+id/repoStars"
                     android:layout_width="0dp"
-                    android:layout_height="20dp"
+                    android:layout_height="24dp"
                     android:layout_gravity="center_vertical"
                     android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_star"
+                    android:drawableStart="@drawable/ic_star_border_24dp"
                     android:drawablePadding="6dp"
                     android:gravity="center_vertical"
                     android:text="@string/repoStars"
@@ -154,10 +154,10 @@
                 <TextView
                     android:id="@+id/repoForks"
                     android:layout_width="0dp"
-                    android:layout_height="20dp"
+                    android:layout_height="24dp"
                     android:layout_gravity="center_vertical"
                     android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_forks_24"
+                    android:drawableStart="@drawable/ic_fork"
                     android:drawablePadding="6dp"
                     android:gravity="center_vertical"
                     android:text="@string/repoWatchers"
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index ec7236e9..d1beede0 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -6,16 +6,16 @@
     <group android:checkableBehavior="single"
         android:id="@+id/nav_main">
         <item android:id="@+id/nav_home"
-            android:icon="@drawable/ic_my_repositories"
+            android:icon="@drawable/ic_repo"
             android:title="@string/navMyRepos" />
         <item android:id="@+id/nav_starred_repos"
             android:icon="@drawable/ic_star"
             android:title="@string/navStarredRepos" />
         <item android:id="@+id/nav_organizations"
-            android:icon="@drawable/ic_organizations"
+            android:icon="@drawable/ic_organization"
             android:title="@string/navOrgs" />
         <item android:id="@+id/nav_repositories"
-            android:icon="@drawable/ic_repos"
+            android:icon="@drawable/ic_repo"
             android:title="@string/navRepos" />
         <item android:id="@+id/nav_explore"
             android:icon="@drawable/ic_search"