diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index 9aa98db0..277e70d3 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -193,7 +193,6 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		final View hView = navigationView.getHeaderView(0);
 
 		ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-		toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.darkGreen));
 
 		drawer.addDrawerListener(toggle);
 		drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
@@ -294,6 +293,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 		});
 
 		toggle.syncState();
+		toolbar.setNavigationIcon(R.drawable.ic_menu);
 
 		if(launchFragment != null) {
 
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 429b5330..f49fe883 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -264,7 +264,7 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
 			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
 			holder.repoType.setText(R.string.strPublic);
 		}
 		holder.repoStars.setText(currentItem.getStars_count());
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 153ec99c..7525532b 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/FilesAdapter.java
@@ -166,7 +166,7 @@ public class FilesAdapter extends RecyclerView.Adapter<FilesAdapter.FilesViewHol
             holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_directory));
         }
         else {
-            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question_mark_24));
+            holder.fileTypeImage.setImageDrawable(mCtx.getResources().getDrawable(R.drawable.ic_question));
         }
 
     }
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 9534d8ea..e64f27bb 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@@ -268,7 +268,7 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
 			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
 			holder.repoType.setText(R.string.strPublic);
 		}
 		holder.repoStars.setText(currentItem.getStars_count());
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
index ccd2db45..7606ae8c 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReleasesAdapter.java
@@ -210,13 +210,13 @@ public class ReleasesAdapter extends RecyclerView.Adapter<ReleasesAdapter.Releas
 
 		    if(holder.downloads.getVisibility() == View.GONE) {
 
-			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_arrow_down);
+			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_down);
 			    holder.downloads.setVisibility(View.VISIBLE);
 
 		    }
 		    else {
 
-			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_arrow_right);
+			    holder.downloadDropdownIcon.setImageResource(R.drawable.ic_chevron_right);
 			    holder.downloads.setVisibility(View.GONE);
 
 		    }
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 548bb39a..a1a582d4 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -269,7 +269,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
 			holder.repoType.setText(R.string.strPrivate);
 		}
 		else {
-			holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+			holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
 			holder.repoType.setText(R.string.strPublic);
 		}
 		holder.repoStars.setText(currentItem.getStars_count());
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 02ba176f..d8520b2b 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@@ -271,7 +271,7 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
             holder.repoType.setText(R.string.strPrivate);
         }
         else {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
             holder.repoType.setText(R.string.strPublic);
         }
         holder.repoStars.setText(currentItem.getStars_count());
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 994bad1b..71c6a771 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@@ -272,7 +272,7 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
             holder.repoType.setText(R.string.strPrivate);
         }
         else {
-            holder.repoPrivatePublic.setImageResource(R.drawable.ic_public);
+            holder.repoPrivatePublic.setImageResource(R.drawable.ic_unlock);
             holder.repoType.setText(R.string.strPublic);
         }
         holder.repoStars.setText(currentItem.getStars_count());
diff --git a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
index d6f2dbcd..9e43e60a 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/RepoInfoFragment.java
@@ -191,13 +191,13 @@ public class RepoInfoFragment extends Fragment {
 	private void toggleExpandView() {
 
 		if (repoFileContents.getVisibility() == View.GONE) {
-			repoFilenameExpandCollapse.setImageResource(R.drawable.ic_arrow_up);
+			repoFilenameExpandCollapse.setImageResource(R.drawable.ic_chevron_up);
 			repoFileContents.setVisibility(View.VISIBLE);
 			//Animation slide_down = AnimationUtils.loadAnimation(getContext(), R.anim.slide_down);
 			//fileContentsFrame.startAnimation(slide_down);
 		}
 		else {
-			repoFilenameExpandCollapse.setImageResource(R.drawable.ic_arrow_down);
+			repoFilenameExpandCollapse.setImageResource(R.drawable.ic_chevron_down);
 			repoFileContents.setVisibility(View.GONE);
 			//Animation slide_up = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
 			//fileContentsFrame.startAnimation(slide_up);
@@ -211,13 +211,13 @@ public class RepoInfoFragment extends Fragment {
 	private void toggleExpandViewMeta() {
 
 		if (repoMetaFrame.getVisibility() == View.GONE) {
-			repoMetaDataExpandCollapse.setImageResource(R.drawable.ic_arrow_up);
+			repoMetaDataExpandCollapse.setImageResource(R.drawable.ic_chevron_up);
 			repoMetaFrame.setVisibility(View.VISIBLE);
 			//Animation slide_down = AnimationUtils.loadAnimation(getContext(), R.anim.slide_down);
 			//repoMetaFrame.startAnimation(slide_down);
 		}
 		else {
-			repoMetaDataExpandCollapse.setImageResource(R.drawable.ic_arrow_down);
+			repoMetaDataExpandCollapse.setImageResource(R.drawable.ic_chevron_down);
 			repoMetaFrame.setVisibility(View.GONE);
 			//Animation slide_up = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
 			//repoMetaFrame.startAnimation(slide_up);
diff --git a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
index 8224ca5c..5a6d633b 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
@@ -45,7 +45,7 @@ public class AlertDialogs {
 		    .setTitle(title)
 		    .setMessage(message)
 		    .setCancelable(false)
-		    .setIcon(R.drawable.ic_info_outline_24dp)
+		    .setIcon(R.drawable.ic_info)
 		    .setPositiveButton(copyPositiveButton, (dialog, which) -> {
 
 			    final TinyDB tinyDb = new TinyDB(context);
diff --git a/app/src/main/res/drawable/ic_add_person.xml b/app/src/main/res/drawable/ic_add_person.xml
deleted file mode 100644
index 4ffbfd7b..00000000
--- a/app/src/main/res/drawable/ic_add_person.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="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_admin.xml b/app/src/main/res/drawable/ic_admin.xml
deleted file mode 100644
index 59024e09..00000000
--- a/app/src/main/res/drawable/ic_admin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" 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="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 00000000..afc8e6da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19,12L5,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,19l-7,-7l7,-7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
deleted file mode 100644
index 839e3868..00000000
--- a/app/src/main/res/drawable/ic_arrow_back_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" 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,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
index 7b5745b0..edf7c074 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -1,5 +1,20 @@
-<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="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,5L12,19"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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: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 8c6d19f6..bbcf096c 100644
--- a/app/src/main/res/drawable/ic_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -1,5 +1,20 @@
-<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="M8.59,16.34l4.58,-4.59 -4.58,-4.59L10,5.75l6,6 -6,6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5,12L19,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,5l7,7l-7,7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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 a8148237..2c5991ef 100644
--- a/app/src/main/res/drawable/ic_arrow_up.xml
+++ b/app/src/main/res/drawable/ic_arrow_up.xml
@@ -1,5 +1,20 @@
-<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="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,19L12,5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M5,12l7,-7l7,7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_browser.xml b/app/src/main/res/drawable/ic_browser.xml
new file mode 100644
index 00000000..93c33100
--- /dev/null
+++ b/app/src/main/res/drawable/ic_browser.xml
@@ -0,0 +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"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
index cbaa42cd..eb67f792 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.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="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+<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="M21.03,5.72a0.75,0.75 0,0 1,0 1.06l-11.5,11.5a0.75,0.75 0,0 1,-1.072 -0.012l-5.5,-5.75a0.75,0.75 0,1 1,1.084 -1.036l4.97,5.195L19.97,5.72a0.75,0.75 0,0 1,1.06 0z"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
new file mode 100644
index 00000000..b0798569
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_down.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:pathData="M6,9l6,6l6,-6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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
new file mode 100644
index 00000000..be2100ca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_left.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:pathData="M15,18l-6,-6l6,-6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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
new file mode 100644
index 00000000..97b3f2be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_right.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:pathData="M9,18l6,-6l-6,-6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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
new file mode 100644
index 00000000..df1703a2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_up.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:pathData="M18,15l-6,-6l-6,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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 32323cf0..e1be4e03 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,5 +1,20 @@
-<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,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18,6L6,18"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M6,6L18,18"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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 7d1e5406..0e732e1d 100644
--- a/app/src/main/res/drawable/ic_code.xml
+++ b/app/src/main/res/drawable/ic_code.xml
@@ -1,5 +1,20 @@
-<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="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,18l6,-6l-6,-6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M8,6l-6,6l6,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml
deleted file mode 100644
index cf704c38..00000000
--- a/app/src/main/res/drawable/ic_content_copy.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="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
new file mode 100644
index 00000000..e3631b0e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,9L20,9A2,2 0,0 1,22 11L22,20A2,2 0,0 1,20 22L11,22A2,2 0,0 1,9 20L9,11A2,2 0,0 1,11 9z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index e892e7c0..623fdbc3 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,5 +1,34 @@
-<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,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,6l2,0l16,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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:strokeLineCap="round"/>
+  <path
+      android:pathData="M10,11L10,17"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M14,11L14,17"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_dotted_menu.xml b/app/src/main/res/drawable/ic_dotted_menu.xml
index 52b9c2ca..624f6510 100644
--- a/app/src/main/res/drawable/ic_dotted_menu.xml
+++ b/app/src/main/res/drawable/ic_dotted_menu.xml
@@ -1,5 +1,27 @@
-<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,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-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: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: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: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 3c2bb154..2a157dd8 100644
--- a/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
+++ b/app/src/main/res/drawable/ic_dotted_menu_horizontal.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,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+<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,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_drafts.xml b/app/src/main/res/drawable/ic_drafts.xml
new file mode 100644
index 00000000..e4c63015
--- /dev/null
+++ b/app/src/main/res/drawable/ic_drafts.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22,12l-6,0l-2,3l-4,0l-2,-3l-6,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_drafts_24dp.xml b/app/src/main/res/drawable/ic_drafts_24dp.xml
deleted file mode 100644
index d51695e8..00000000
--- a/app/src/main/res/drawable/ic_drafts_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" 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,8c0,-0.72 -0.37,-1.35 -0.94,-1.7L12,1 2.95,6.3C2.38,6.65 2,7.28 2,8v10c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2l-0.01,-10zM12,13L3.74,7.84 12,3l8.26,4.84L12,13z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index ab20cd1e..a350e72b 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -1,5 +1,20 @@
-<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="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,20h9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
index 8ce97f0c..8bf38e31 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.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="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
+<vector 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="M1.75,3A1.75,1.75 0,0 0,0 4.75v14c0,0.966 0.784,1.75 1.75,1.75h20.5A1.75,1.75 0,0 0,24 18.75v-14A1.75,1.75 0,0 0,22.25 3L1.75,3zM1.5,4.75a0.25,0.25 0,0 1,0.25 -0.25h20.5a0.25,0.25 0,0 1,0.25 0.25v0.852l-10.36,7a0.25,0.25 0,0 1,-0.28 0l-10.36,-7L1.5,4.75zM1.5,7.412L1.5,18.75c0,0.138 0.112,0.25 0.25,0.25h20.5a0.25,0.25 0,0 0,0.25 -0.25L22.5,7.412l-9.52,6.433c-0.592,0.4 -1.368,0.4 -1.96,0L1.5,7.412z"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_exit_24dp.xml b/app/src/main/res/drawable/ic_exit_24dp.xml
deleted file mode 100644
index 78f89ebd..00000000
--- a/app/src/main/res/drawable/ic_exit_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="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index e1f8fb45..156b4dbf 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -1,5 +1,9 @@
-<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,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+<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,6a0.75,0.75 0,0 0,0 1.5h18.5a0.75,0.75 0,0 0,0 -1.5L2.75,6zM6,11.75a0.75,0.75 0,0 1,0.75 -0.75h10.5a0.75,0.75 0,0 1,0 1.5L6.75,12.5a0.75,0.75 0,0 1,-0.75 -0.75zM10,16.688a0.75,0.75 0,0 1,0.75 -0.75h2.5a0.75,0.75 0,0 1,0 1.5h-2.5a0.75,0.75 0,0 1,-0.75 -0.75z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_closed.xml b/app/src/main/res/drawable/ic_filter_closed.xml
index bd7e5c94..e1891b5b 100644
--- a/app/src/main/res/drawable/ic_filter_closed.xml
+++ b/app/src/main/res/drawable/ic_filter_closed.xml
@@ -1,5 +1,9 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:tint="#AF4242" 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,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+<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="#AF4242"
+    android:pathData="M2.75,6a0.75,0.75 0,0 0,0 1.5h18.5a0.75,0.75 0,0 0,0 -1.5L2.75,6zM6,11.75a0.75,0.75 0,0 1,0.75 -0.75h10.5a0.75,0.75 0,0 1,0 1.5L6.75,12.5a0.75,0.75 0,0 1,-0.75 -0.75zM10,16.688a0.75,0.75 0,0 1,0.75 -0.75h2.5a0.75,0.75 0,0 1,0 1.5h-2.5a0.75,0.75 0,0 1,-0.75 -0.75z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
new file mode 100644
index 00000000..6d0434ae
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info.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="M13,7.5a1,1 0,1 1,-2 0,1 1,0 0,1 2,0zM10,11.25a0.75,0.75 0,0 1,0.75 -0.75h1.5a0.75,0.75 0,0 1,0.75 0.75v4.25h0.75a0.75,0.75 0,0 1,0 1.5h-3a0.75,0.75 0,0 1,0 -1.5h0.75L11.5,12h-0.75a0.75,0.75 0,0 1,-0.75 -0.75z"/>
+  <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_info_24dp.xml b/app/src/main/res/drawable/ic_info_24dp.xml
deleted file mode 100644
index f28cf03e..00000000
--- a/app/src/main/res/drawable/ic_info_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,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_info_outline_24dp.xml b/app/src/main/res/drawable/ic_info_outline_24dp.xml
deleted file mode 100644
index 5fcf7402..00000000
--- a/app/src/main/res/drawable/ic_info_outline_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="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_like.xml b/app/src/main/res/drawable/ic_like.xml
new file mode 100644
index 00000000..40a638c9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_like.xml
@@ -0,0 +1,12 @@
+<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="M12.596,2.043c-1.301,-0.092 -2.303,0.986 -2.303,2.206v1.053c0,2.666 -1.813,3.785 -2.774,4.2a1.866,1.866 0,0 1,-0.523 0.131A1.75,1.75 0,0 0,5.25 8h-1.5A1.75,1.75 0,0 0,2 9.75v10.5c0,0.967 0.784,1.75 1.75,1.75h1.5a1.75,1.75 0,0 0,1.742 -1.58c0.838,0.06 1.667,0.296 2.69,0.586l0.602,0.17c1.464,0.406 3.213,0.824 5.544,0.824 2.188,0 3.693,-0.204 4.583,-1.372 0.422,-0.554 0.65,-1.255 0.816,-2.05 0.148,-0.708 0.262,-1.57 0.396,-2.58l0.051,-0.39c0.319,-2.386 0.328,-4.18 -0.223,-5.394 -0.293,-0.644 -0.743,-1.125 -1.355,-1.431 -0.59,-0.296 -1.284,-0.404 -2.036,-0.404h-2.05l0.056,-0.429c0.025,-0.18 0.05,-0.372 0.076,-0.572 0.06,-0.483 0.117,-1.006 0.117,-1.438 0,-1.245 -0.222,-2.253 -0.92,-2.941 -0.684,-0.675 -1.668,-0.88 -2.743,-0.956zM7,18.918c1.059,0.064 2.079,0.355 3.118,0.652l0.568,0.16c1.406,0.39 3.006,0.77 5.142,0.77 2.277,0 3.004,-0.274 3.39,-0.781 0.216,-0.283 0.388,-0.718 0.54,-1.448 0.136,-0.65 0.242,-1.45 0.379,-2.477l0.05,-0.384c0.32,-2.4 0.253,-3.795 -0.102,-4.575 -0.16,-0.352 -0.375,-0.568 -0.66,-0.711 -0.305,-0.153 -0.74,-0.245 -1.365,-0.245h-2.37c-0.681,0 -1.293,-0.57 -1.211,-1.328 0.026,-0.243 0.065,-0.537 0.105,-0.834l0.07,-0.527c0.06,-0.482 0.105,-0.921 0.105,-1.25 0,-1.125 -0.213,-1.617 -0.473,-1.873 -0.275,-0.27 -0.774,-0.455 -1.795,-0.528 -0.351,-0.024 -0.698,0.274 -0.698,0.71v1.053c0,3.55 -2.488,5.063 -3.68,5.577 -0.372,0.16 -0.754,0.232 -1.113,0.26v7.78zM3.75,20.5a0.25,0.25 0,0 1,-0.25 -0.25V9.75a0.25,0.25 0,0 1,0.25 -0.25h1.5a0.25,0.25 0,0 1,0.25 0.25v10.5a0.25,0.25 0,0 1,-0.25 0.25h-1.5z"
+      android:fillType="evenOdd"
+      tools:ignore="VectorPath" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml
new file mode 100644
index 00000000..2373a76d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -0,0 +1,12 @@
+<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="M14.78,3.653a3.936,3.936 0,1 1,5.567 5.567l-3.627,3.627a3.936,3.936 0,0 1,-5.88 -0.353,0.75 0.75,0 0,0 -1.18,0.928 5.436,5.436 0,0 0,8.12 0.486l3.628,-3.628a5.436,5.436 0,1 0,-7.688 -7.688l-3,3a0.75,0.75 0,0 0,1.06 1.061l3,-3z"/>
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M7.28,11.153a3.936,3.936 0,0 1,5.88 0.353,0.75 0.75,0 0,0 1.18,-0.928 5.436,5.436 0,0 0,-8.12 -0.486L2.592,13.72a5.436,5.436 0,1 0,7.688 7.688l3,-3a0.75,0.75 0,1 0,-1.06 -1.06l-3,3a3.936,3.936 0,0 1,-5.567 -5.568l3.627,-3.627z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_link_24dp.xml b/app/src/main/res/drawable/ic_link_24dp.xml
deleted file mode 100644
index cfb3de32..00000000
--- a/app/src/main/res/drawable/ic_link_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="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
index ec251443..78b223ee 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -1,5 +1,13 @@
-<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,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+<vector 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,13.5a2.5,2.5 0,1 0,0 -5,2.5 2.5,0 0,0 0,5z"/>
+  <path
+      android:fillColor="#368f73"
+      android:pathData="M19.071,3.429C15.166,-0.476 8.834,-0.476 4.93,3.429c-3.905,3.905 -3.905,10.237 0,14.142l0.028,0.028 5.375,5.375a2.359,2.359 0,0 0,3.336 0l5.403,-5.403c3.905,-3.905 3.905,-10.237 0,-14.142zM5.99,4.489A8.5,8.5 0,0 1,18.01 16.51l-5.403,5.404a0.859,0.859 0,0 1,-1.214 0l-5.378,-5.378 -0.002,-0.002 -0.023,-0.024a8.5,8.5 0,0 1,0 -12.02z"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml
new file mode 100644
index 00000000..34e0c4a8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_logout.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,21H5a2,2 0,0 1,-2 -2V5a2,2 0,0 1,2 -2h4"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16,17l5,-5l-5,-5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M21,12L9,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
new file mode 100644
index 00000000..255a0631
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M3,12L21,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,6L21,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,18L21,18"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_new_releases.xml b/app/src/main/res/drawable/ic_new_releases.xml
deleted file mode 100644
index 6df66f71..00000000
--- a/app/src/main/res/drawable/ic_new_releases.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="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_browser.xml b/app/src/main/res/drawable/ic_open_in_browser.xml
deleted file mode 100644
index 0e583b3c..00000000
--- a/app/src/main/res/drawable/ic_open_in_browser.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="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_organizations.xml b/app/src/main/res/drawable/ic_organizations.xml
deleted file mode 100644
index 6e17c51c..00000000
--- a/app/src/main/res/drawable/ic_organizations.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="M16.5,12c1.38,0 2.49,-1.12 2.49,-2.5S17.88,7 16.5,7C15.12,7 14,8.12 14,9.5s1.12,2.5 2.5,2.5zM9,11c1.66,0 2.99,-1.34 2.99,-3S10.66,5 9,5C7.34,5 6,6.34 6,8s1.34,3 3,3zM16.5,14c-1.83,0 -5.5,0.92 -5.5,2.75L11,19h11v-2.25c0,-1.83 -3.67,-2.75 -5.5,-2.75zM9,13c-2.33,0 -7,1.17 -7,3.5L2,19h7v-2.25c0,-0.85 0.33,-2.34 2.37,-3.47C10.5,13.1 9.66,13 9,13z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_otp.xml b/app/src/main/res/drawable/ic_otp.xml
index a69c1eaa..3c7f1084 100644
--- a/app/src/main/res/drawable/ic_otp.xml
+++ b/app/src/main/res/drawable/ic_otp.xml
@@ -1,5 +1,20 @@
-<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,1L9,1c-1.1,0 -2,0.9 -2,2v3h2L9,4h10v16L9,20v-2L7,18v3c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L21,3c0,-1.1 -0.9,-2 -2,-2zM10.8,11L10.8,9.5C10.8,8.1 9.4,7 8,7S5.2,8.1 5.2,9.5L5.2,11c-0.6,0 -1.2,0.6 -1.2,1.2v3.5c0,0.7 0.6,1.3 1.2,1.3h5.5c0.7,0 1.3,-0.6 1.3,-1.2v-3.5c0,-0.7 -0.6,-1.3 -1.2,-1.3zM9.5,11h-3L6.5,9.5c0,-0.8 0.7,-1.3 1.5,-1.3s1.5,0.5 1.5,1.3L9.5,11z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7,2L17,2A2,2 0,0 1,19 4L19,20A2,2 0,0 1,17 22L7,22A2,2 0,0 1,5 20L5,4A2,2 0,0 1,7 2z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,18L12.01,18"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_people.xml b/app/src/main/res/drawable/ic_people.xml
new file mode 100644
index 00000000..8f7cfdad
--- /dev/null
+++ b/app/src/main/res/drawable/ic_people.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,21v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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: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: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:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person.xml b/app/src/main/res/drawable/ic_person.xml
new file mode 100644
index 00000000..11907879
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,21v-2a4,4 0,0 0,-4 -4H8a4,4 0,0 0,-4 4v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person_24dp.xml b/app/src/main/res/drawable/ic_person_24dp.xml
deleted file mode 100644
index 34c1d163..00000000
--- a/app/src/main/res/drawable/ic_person_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,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_person_add.xml b/app/src/main/res/drawable/ic_person_add.xml
new file mode 100644
index 00000000..aefcd29f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_add.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16,21v-2a4,4 0,0 0,-4 -4H5a4,4 0,0 0,-4 4v2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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:strokeLineCap="round"/>
+  <path
+      android:pathData="M20,8L20,14"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M23,11L17,11"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person_filled.xml b/app/src/main/res/drawable/ic_person_filled.xml
deleted file mode 100644
index 569ebace..00000000
--- a/app/src/main/res/drawable/ic_person_filled.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,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_public.xml b/app/src/main/res/drawable/ic_public.xml
deleted file mode 100644
index e3f5593c..00000000
--- a/app/src/main/res/drawable/ic_public.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,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_pull_request.xml b/app/src/main/res/drawable/ic_pull_request.xml
index 7a06e761..e53e37d7 100644
--- a/app/src/main/res/drawable/ic_pull_request.xml
+++ b/app/src/main/res/drawable/ic_pull_request.xml
@@ -4,11 +4,31 @@
     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"/>
+      android:pathData="M18,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:strokeLineCap="round"/>
   <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"/>
+      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: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:strokeLineCap="round"/>
+  <path
+      android:pathData="M6,9L6,21"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_question.xml b/app/src/main/res/drawable/ic_question.xml
new file mode 100644
index 00000000..596eab72
--- /dev/null
+++ b/app/src/main/res/drawable/ic_question.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,17L12.01,17"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_question_mark_24.xml b/app/src/main/res/drawable/ic_question_mark_24.xml
deleted file mode 100644
index c5741a68..00000000
--- a/app/src/main/res/drawable/ic_question_mark_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="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_release.xml b/app/src/main/res/drawable/ic_release.xml
new file mode 100644
index 00000000..e32128c9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_release.xml
@@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M16.5,9.4L7.5,4.21"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      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: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:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,22.08L12,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index e5ff5093..df8b2134 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.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="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+<vector 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="M14.53,15.59a8.25,8.25 0,1 1,1.06 -1.06l5.69,5.69a0.75,0.75 0,1 1,-1.06 1.06l-5.69,-5.69zM2.5,9.25a6.75,6.75 0,1 1,11.74 4.547,0.746 0.746,0 0,0 -0.443,0.442A6.75,6.75 0,0 1,2.5 9.25z"
+      android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 00000000..c28e9ec2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,12 @@
+<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" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml
deleted file mode 100644
index 86f0cbd8..00000000
--- a/app/src/main/res/drawable/ic_settings_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="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 00000000..3c439ab4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.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="M20,5.5a3.5,3.5 0,0 1,-6.062 2.385l-5.112,3.021a3.497,3.497 0,0 1,0 2.188l5.112,3.021a3.5,3.5 0,1 1,-0.764 1.29l-5.112,-3.02a3.5,3.5 0,1 1,0 -4.77l5.112,-3.021v0.001A3.5,3.5 0,1 1,20 5.5zM18.5,5.5a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM5.5,14a2,2 0,1 0,0 -4,2 2,0 0,0 0,4zM18.5,18.5a2,2 0,1 1,-4 0,2 2,0 0,1 4,0z"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml
deleted file mode 100644
index 850c201b..00000000
--- a/app/src/main/res/drawable/ic_share_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:autoMirrored="true" 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,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_thumb_up_like.xml b/app/src/main/res/drawable/ic_thumb_up_like.xml
deleted file mode 100644
index 03ab0483..00000000
--- a/app/src/main/res/drawable/ic_thumb_up_like.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="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_tool.xml b/app/src/main/res/drawable/ic_tool.xml
new file mode 100644
index 00000000..e4cce1e7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tool.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:pathData="M14.7,6.3a1,1 0,0 0,0 1.4l1.6,1.6a1,1 0,0 0,1.4 0l3.77,-3.77a6,6 0,0 1,-7.94 7.94l-6.91,6.91a2.12,2.12 0,0 1,-3 -3l6.91,-6.91a6,6 0,0 1,7.94 -7.94l-3.76,3.76z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368f73"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_unlock.xml b/app/src/main/res/drawable/ic_unlock.xml
new file mode 100644
index 00000000..a99a4c3a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unlock.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="M7.5,7.25C7.5,4.58 9.422,2.5 12,2.5c2.079,0 3.71,1.34 4.282,3.242a0.75,0.75 0,1 0,1.436 -0.432C16.971,2.825 14.792,1 12,1 8.503,1 6,3.845 6,7.25L6,9h-0.5A2.5,2.5 0,0 0,3 11.5v8A2.5,2.5 0,0 0,5.5 22h13a2.5,2.5 0,0 0,2.5 -2.5v-8A2.5,2.5 0,0 0,18.5 9h-11L7.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_users.xml b/app/src/main/res/drawable/ic_users.xml
deleted file mode 100644
index bdc23ad1..00000000
--- a/app/src/main/res/drawable/ic_users.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="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/badge_background.xml b/app/src/main/res/drawable/shape_badge_background.xml
similarity index 100%
rename from app/src/main/res/drawable/badge_background.xml
rename to app/src/main/res/drawable/shape_badge_background.xml
diff --git a/app/src/main/res/drawable/bottom_sheet_top_corners.xml b/app/src/main/res/drawable/shape_bottom_sheet_top_corners.xml
similarity index 100%
rename from app/src/main/res/drawable/bottom_sheet_top_corners.xml
rename to app/src/main/res/drawable/shape_bottom_sheet_top_corners.xml
diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/shape_circle.xml
similarity index 100%
rename from app/src/main/res/drawable/circle.xml
rename to app/src/main/res/drawable/shape_circle.xml
diff --git a/app/src/main/res/drawable/circle_red.xml b/app/src/main/res/drawable/shape_circle_red.xml
similarity index 100%
rename from app/src/main/res/drawable/circle_red.xml
rename to app/src/main/res/drawable/shape_circle_red.xml
diff --git a/app/src/main/res/drawable/circle_white.xml b/app/src/main/res/drawable/shape_circle_white.xml
similarity index 77%
rename from app/src/main/res/drawable/circle_white.xml
rename to app/src/main/res/drawable/shape_circle_white.xml
index d528ee44..c1ba16a6 100644
--- a/app/src/main/res/drawable/circle_white.xml
+++ b/app/src/main/res/drawable/shape_circle_white.xml
@@ -4,8 +4,8 @@
     android:shape="oval" >
 
     <size
-        android:width="32dp"
-        android:height="32dp" />
+        android:width="36dp"
+        android:height="36dp" />
     <solid
         android:color="@color/white" />
 
diff --git a/app/src/main/res/drawable/round_corners.xml b/app/src/main/res/drawable/shape_round_corners.xml
similarity index 100%
rename from app/src/main/res/drawable/round_corners.xml
rename to app/src/main/res/drawable/shape_round_corners.xml
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 7162e454..edacb2db 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -234,7 +234,7 @@
             android:layout_margin="15dp"
             android:layout_alignParentBottom="true"
             android:layout_alignParentEnd="true"
-            android:background="@drawable/circle"
+            android:background="@drawable/shape_circle"
             android:padding="@dimen/fab_padding"
             android:contentDescription="@string/addNewContent" />
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index fcaeed91..2dbcc1e5 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -92,7 +92,7 @@
                 android:id="@+id/info"
                 android:layout_width="28dp"
                 android:layout_height="28dp"
-                android:src="@drawable/ic_info_24dp"
+                android:src="@drawable/ic_info"
                 android:layout_marginStart="120dp"
                 android:layout_marginTop="10dp"
                 android:contentDescription="@string/urlInfoTooltip" />
@@ -107,7 +107,7 @@
             android:padding="10dp"
             android:textSize="14sp"
             tools:ignore="Autofill"
-            android:drawableStart="@drawable/ic_link_24dp"
+            android:drawableStart="@drawable/ic_link"
             android:drawablePadding="10dp"
             android:inputType="textUri"
             android:background="@drawable/shape_inputs"
@@ -124,7 +124,7 @@
             android:padding="10dp"
             android:textSize="14sp"
             tools:ignore="Autofill"
-            android:drawableStart="@drawable/ic_person_24dp"
+            android:drawableStart="@drawable/ic_person"
             android:drawablePadding="10dp"
             android:background="@drawable/shape_inputs"
             android:textColor="?attr/inputTextColor"
diff --git a/app/src/main/res/layout/badge_issue.xml b/app/src/main/res/layout/badge_issue.xml
index 425c80e2..ba69e3d0 100644
--- a/app/src/main/res/layout/badge_issue.xml
+++ b/app/src/main/res/layout/badge_issue.xml
@@ -23,8 +23,8 @@
         android:layout_marginTop="1dp"
         android:layout_marginStart="8dp"
         android:layout_toEndOf="@+id/counterBadgeIssueText"
-        android:background="@drawable/badge_background"
+        android:background="@drawable/shape_badge_background"
         android:text="@string/infoTabRepoZero"
         android:textColor="@color/white" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/badge_pull.xml b/app/src/main/res/layout/badge_pull.xml
index 414351ee..152d2a5c 100644
--- a/app/src/main/res/layout/badge_pull.xml
+++ b/app/src/main/res/layout/badge_pull.xml
@@ -21,10 +21,10 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="1dp"
         android:layout_toEndOf="@id/counterBadgePullText"
-        android:background="@drawable/badge_background"
+        android:background="@drawable/shape_badge_background"
         android:gravity="center"
         android:text="@string/infoTabRepoZero"
         android:textColor="@color/white"
         android:textSize="12sp" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/badge_release.xml b/app/src/main/res/layout/badge_release.xml
index 13c26d02..7f20a029 100644
--- a/app/src/main/res/layout/badge_release.xml
+++ b/app/src/main/res/layout/badge_release.xml
@@ -21,10 +21,10 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="1dp"
         android:layout_toEndOf="@id/counterBadgeReleaseText"
-        android:background="@drawable/badge_background"
+        android:background="@drawable/shape_badge_background"
         android:gravity="center"
         android:text="@string/infoTabRepoZero"
         android:textColor="@color/white"
         android:textSize="12sp" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_admin_users.xml b/app/src/main/res/layout/bottom_sheet_admin_users.xml
index cd6356ce..03c45404 100644
--- a/app/src/main/res/layout/bottom_sheet_admin_users.xml
+++ b/app/src/main/res/layout/bottom_sheet_admin_users.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/adminCreateNewUser"
-                android:drawableStart="@drawable/ic_add_person"
+                android:drawableStart="@drawable/ic_person_add"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/bottom_sheet_issue_comments.xml b/app/src/main/res/layout/bottom_sheet_issue_comments.xml
index f2de8fe4..32e7c5c0 100644
--- a/app/src/main/res/layout/bottom_sheet_issue_comments.xml
+++ b/app/src/main/res/layout/bottom_sheet_issue_comments.xml
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/menuCopyText"
-                android:drawableStart="@drawable/ic_content_copy"
+                android:drawableStart="@drawable/ic_copy"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
@@ -71,7 +71,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/issueCommentShare"
-                android:drawableStart="@drawable/ic_share_24dp"
+                android:drawableStart="@drawable/ic_share"
                 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 f6e5fa11..db6910bd 100644
--- a/app/src/main/res/layout/bottom_sheet_organization.xml
+++ b/app/src/main/res/layout/bottom_sheet_organization.xml
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/orgCreateTeam"
-                android:drawableStart="@drawable/ic_organizations"
+                android:drawableStart="@drawable/ic_people"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/bottom_sheet_organization_teams.xml b/app/src/main/res/layout/bottom_sheet_organization_teams.xml
index c163cbee..a4accfa8 100644
--- a/app/src/main/res/layout/bottom_sheet_organization_teams.xml
+++ b/app/src/main/res/layout/bottom_sheet_organization_teams.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/addNewMember"
-                android:drawableStart="@drawable/ic_add_person"
+                android:drawableStart="@drawable/ic_person_add"
                 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 3efc5900..dfc77c33 100644
--- a/app/src/main/res/layout/bottom_sheet_repo.xml
+++ b/app/src/main/res/layout/bottom_sheet_repo.xml
@@ -71,7 +71,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/createRelease"
-                android:drawableStart="@drawable/ic_new_releases"
+                android:drawableStart="@drawable/ic_release"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
@@ -91,7 +91,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/addCollaboratorTitle"
-                android:drawableStart="@drawable/ic_person_filled"
+                android:drawableStart="@drawable/ic_person_add"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
@@ -158,7 +158,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_share_24dp"
+                android:drawableStart="@drawable/ic_share"
                 android:drawablePadding="24dp"
                 android:text="@string/shareRepository"
                 android:textColor="?attr/primaryTextColor"
@@ -170,7 +170,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_open_in_browser"
+                android:drawableStart="@drawable/ic_browser"
                 android:drawablePadding="24dp"
                 android:text="@string/openWebRepo"
                 android:textColor="?attr/primaryTextColor"
diff --git a/app/src/main/res/layout/bottom_sheet_repository_in_list.xml b/app/src/main/res/layout/bottom_sheet_repository_in_list.xml
index 3174710d..364ac4c6 100644
--- a/app/src/main/res/layout/bottom_sheet_repository_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_repository_in_list.xml
@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/openWebRepo"
-                android:drawableStart="@drawable/ic_open_in_browser"
+                android:drawableStart="@drawable/ic_browser"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoStargazersInMenu"
-                android:drawableStart="@drawable/ic_star"
+                android:drawableStart="@drawable/ic_star_border_24dp"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoWatchersInMenu"
-                android:drawableStart="@drawable/ic_watchers"
+                android:drawableStart="@drawable/ic_unwatch"
                 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 45b1640c..84bf3c31 100644
--- a/app/src/main/res/layout/bottom_sheet_single_issue.xml
+++ b/app/src/main/res/layout/bottom_sheet_single_issue.xml
@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/addRemoveAssignees"
-                android:drawableStart="@drawable/ic_person_filled"
+                android:drawableStart="@drawable/ic_person_add"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
@@ -116,7 +116,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_share_24dp"
+                android:drawableStart="@drawable/ic_share"
                 android:drawablePadding="24dp"
                 android:text="@string/shareIssue"
                 android:textColor="?attr/primaryTextColor"
@@ -128,7 +128,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_content_copy"
+                android:drawableStart="@drawable/ic_copy"
                 android:drawablePadding="24dp"
                 android:text="@string/copyIssueUrl"
                 android:textColor="?attr/primaryTextColor"
diff --git a/app/src/main/res/layout/custom_toast.xml b/app/src/main/res/layout/custom_toast.xml
index 54baf0d1..729e9ba5 100644
--- a/app/src/main/res/layout/custom_toast.xml
+++ b/app/src/main/res/layout/custom_toast.xml
@@ -5,7 +5,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:padding="15dp"
-    android:background="@drawable/round_corners"
+    android:background="@drawable/shape_round_corners"
     android:backgroundTint="@color/toastBackground">
 
     <TextView android:id="@+id/toastText"
@@ -15,4 +15,4 @@
         android:layout_gravity="center"
         android:gravity="center" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/custom_toast_error.xml b/app/src/main/res/layout/custom_toast_error.xml
index 7bd724f3..75358c36 100644
--- a/app/src/main/res/layout/custom_toast_error.xml
+++ b/app/src/main/res/layout/custom_toast_error.xml
@@ -5,7 +5,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:padding="15dp"
-    android:background="@drawable/round_corners"
+    android:background="@drawable/shape_round_corners"
     android:backgroundTint="@color/toastBackground">
 
     <TextView android:id="@+id/toastText"
@@ -15,4 +15,4 @@
         android:layout_gravity="center"
         android:gravity="center" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_administration.xml b/app/src/main/res/layout/fragment_administration.xml
index 1cbf6b85..fa497b2b 100644
--- a/app/src/main/res/layout/fragment_administration.xml
+++ b/app/src/main/res/layout/fragment_administration.xml
@@ -19,7 +19,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/adminUsers"
-                android:drawableStart="@drawable/ic_users"
+                android:drawableStart="@drawable/ic_people"
                 android:drawablePadding="32dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
@@ -34,4 +34,4 @@
 
     </ScrollView>
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_milestones.xml b/app/src/main/res/layout/fragment_milestones.xml
index 4095f723..699f37ca 100644
--- a/app/src/main/res/layout/fragment_milestones.xml
+++ b/app/src/main/res/layout/fragment_milestones.xml
@@ -48,7 +48,7 @@
         android:layout_margin="15dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
-        android:background="@drawable/circle"
+        android:background="@drawable/shape_circle"
         android:padding="@dimen/fab_padding"
         android:visibility="gone"
         android:contentDescription="@string/addNewContent" />
diff --git a/app/src/main/res/layout/fragment_my_repositories.xml b/app/src/main/res/layout/fragment_my_repositories.xml
index 52b32497..64f73289 100644
--- a/app/src/main/res/layout/fragment_my_repositories.xml
+++ b/app/src/main/res/layout/fragment_my_repositories.xml
@@ -36,7 +36,7 @@
         android:layout_margin="15dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
-        android:background="@drawable/circle"
+        android:background="@drawable/shape_circle"
         android:padding="@dimen/fab_padding"
         android:contentDescription="@string/addNewContent" />
 
diff --git a/app/src/main/res/layout/fragment_organization_info.xml b/app/src/main/res/layout/fragment_organization_info.xml
index ea0d5c9b..c82367db 100644
--- a/app/src/main/res/layout/fragment_organization_info.xml
+++ b/app/src/main/res/layout/fragment_organization_info.xml
@@ -69,12 +69,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:contentDescription="@string/websiteText"
-                    app:srcCompat="@drawable/ic_link_24dp" />
+                    app:srcCompat="@drawable/ic_link" />
 
                 <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">
 
@@ -116,7 +116,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/fragment_organizations.xml b/app/src/main/res/layout/fragment_organizations.xml
index b1068f4d..30197e62 100644
--- a/app/src/main/res/layout/fragment_organizations.xml
+++ b/app/src/main/res/layout/fragment_organizations.xml
@@ -34,7 +34,7 @@
         android:layout_margin="15dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
-        android:background="@drawable/circle"
+        android:background="@drawable/shape_circle"
         android:padding="@dimen/fab_padding"
         android:contentDescription="@string/addNewContent" />
 
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index 945a47e9..e6896f88 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -47,7 +47,7 @@
                     android:layout_weight="0.1"
                     android:layout_gravity="center_vertical|end"
                     android:contentDescription="@string/issueDescriptionEmpty"
-                    app:srcCompat="@drawable/ic_arrow_down"/>
+                    app:srcCompat="@drawable/ic_chevron_down"/>
 
             </LinearLayout>
 
@@ -273,7 +273,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:contentDescription="@string/infoTabRepoWebsite"
-                        app:srcCompat="@drawable/ic_link_24dp" />
+                        app:srcCompat="@drawable/ic_link" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -347,7 +347,7 @@
                     android:layout_weight="0.1"
                     android:layout_gravity="center_vertical|end"
                     android:contentDescription="@string/issueDescriptionEmpty"
-                    app:srcCompat="@drawable/ic_arrow_up"/>
+                    app:srcCompat="@drawable/ic_chevron_up"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_repositories.xml b/app/src/main/res/layout/fragment_repositories.xml
index fd8b6aa9..37f0f638 100644
--- a/app/src/main/res/layout/fragment_repositories.xml
+++ b/app/src/main/res/layout/fragment_repositories.xml
@@ -47,7 +47,7 @@
         android:layout_margin="15dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
-        android:background="@drawable/circle"
+        android:background="@drawable/shape_circle"
         android:padding="@dimen/fab_padding"
         android:contentDescription="@string/addNewContent" />
 
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index d6e5f46c..9bf0e565 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -91,7 +91,7 @@
                     android:id="@+id/draftsHeader"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawableStart="@drawable/ic_drafts_24dp"
+                    android:drawableStart="@drawable/ic_drafts"
                     android:drawablePadding="24dp"
                     android:paddingStart="12dp"
                     android:paddingEnd="12dp"
diff --git a/app/src/main/res/layout/fragment_starred_repositories.xml b/app/src/main/res/layout/fragment_starred_repositories.xml
index fd8b6aa9..37f0f638 100644
--- a/app/src/main/res/layout/fragment_starred_repositories.xml
+++ b/app/src/main/res/layout/fragment_starred_repositories.xml
@@ -47,7 +47,7 @@
         android:layout_margin="15dp"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
-        android:background="@drawable/circle"
+        android:background="@drawable/shape_circle"
         android:padding="@dimen/fab_padding"
         android:contentDescription="@string/addNewContent" />
 
diff --git a/app/src/main/res/layout/list_collaborators.xml b/app/src/main/res/layout/list_collaborators.xml
index f945cc02..dd18cd98 100644
--- a/app/src/main/res/layout/list_collaborators.xml
+++ b/app/src/main/res/layout/list_collaborators.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="110dp"
         android:contentDescription="@string/tab_text_collaborators"
-        android:src="@drawable/ic_person_filled" />
+        android:src="@drawable/ic_person" />
 
     <TextView
         android:id="@+id/collaboratorName"
@@ -24,4 +24,4 @@
         android:textSize="14sp"
         android:textColor="?attr/primaryTextColor" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/list_collaborators_search.xml b/app/src/main/res/layout/list_collaborators_search.xml
index 93d01902..574197c0 100644
--- a/app/src/main/res/layout/list_collaborators_search.xml
+++ b/app/src/main/res/layout/list_collaborators_search.xml
@@ -73,7 +73,7 @@
             android:layout_height="40dp"
             android:layout_gravity="end"
             android:contentDescription="@string/addNewContent"
-            android:background="@drawable/circle"
+            android:background="@drawable/shape_circle"
             android:src="@drawable/ic_add"
             android:padding="8dp"
             android:visibility="gone"/>
@@ -84,7 +84,7 @@
             android:layout_height="40dp"
             android:layout_gravity="end"
             android:contentDescription="@string/removeContent"
-            android:background="@drawable/circle_red"
+            android:background="@drawable/shape_circle_red"
             android:src="@drawable/ic_remove"
             android:padding="8dp"
             android:visibility="gone"/>
diff --git a/app/src/main/res/layout/list_members_by_org.xml b/app/src/main/res/layout/list_members_by_org.xml
index 36043111..29cb94e0 100644
--- a/app/src/main/res/layout/list_members_by_org.xml
+++ b/app/src/main/res/layout/list_members_by_org.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="110dp"
         android:contentDescription="@string/orgMember"
-        android:src="@drawable/ic_person_filled" />
+        android:src="@drawable/ic_person" />
 
     <TextView
         android:id="@+id/memberName"
@@ -24,4 +24,4 @@
         android:textSize="14sp"
         android:textColor="?attr/primaryTextColor" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/list_members_by_team_by_org.xml b/app/src/main/res/layout/list_members_by_team_by_org.xml
index 74014172..459333d4 100644
--- a/app/src/main/res/layout/list_members_by_team_by_org.xml
+++ b/app/src/main/res/layout/list_members_by_team_by_org.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="110dp"
         android:contentDescription="@string/orgMember"
-        android:src="@drawable/ic_person_filled" />
+        android:src="@drawable/ic_person" />
 
     <TextView
         android:id="@+id/memberName"
diff --git a/app/src/main/res/layout/list_releases.xml b/app/src/main/res/layout/list_releases.xml
index 95851f25..bd64265e 100644
--- a/app/src/main/res/layout/list_releases.xml
+++ b/app/src/main/res/layout/list_releases.xml
@@ -194,8 +194,8 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/generalImgContentText"
                 android:tint="?attr/primaryTextColor"
-                android:src="@drawable/ic_arrow_right"
-                app:srcCompat="@drawable/ic_arrow_right" />
+                android:src="@drawable/ic_chevron_right"
+                app:srcCompat="@drawable/ic_chevron_right" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/list_repo_stargazers.xml b/app/src/main/res/layout/list_repo_stargazers.xml
index ac2775e7..4495a32e 100644
--- a/app/src/main/res/layout/list_repo_stargazers.xml
+++ b/app/src/main/res/layout/list_repo_stargazers.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="110dp"
         android:contentDescription="@string/starMember"
-        android:src="@drawable/ic_person_filled" />
+        android:src="@drawable/ic_person" />
 
     <TextView
         android:id="@+id/memberName"
diff --git a/app/src/main/res/layout/list_repo_watchers.xml b/app/src/main/res/layout/list_repo_watchers.xml
index 36557767..9ae81f35 100644
--- a/app/src/main/res/layout/list_repo_watchers.xml
+++ b/app/src/main/res/layout/list_repo_watchers.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="110dp"
         android:contentDescription="@string/watcherMember"
-        android:src="@drawable/ic_person_filled" />
+        android:src="@drawable/ic_person" />
 
     <TextView
         android:id="@+id/memberName"
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
index 72b02626..4ff76559 100644
--- a/app/src/main/res/layout/nav_header.xml
+++ b/app/src/main/res/layout/nav_header.xml
@@ -85,7 +85,7 @@
                         android:id="@+id/userAccounts"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:background="@drawable/circle_white"
+                        android:background="@drawable/shape_circle_white"
                         android:src="@drawable/ic_account_circle"
                         android:contentDescription="@string/generalImgContentText"/>
 
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index d1beede0..5d440e17 100644
--- a/app/src/main/res/menu/drawer_menu.xml
+++ b/app/src/main/res/menu/drawer_menu.xml
@@ -9,7 +9,7 @@
             android:icon="@drawable/ic_repo"
             android:title="@string/navMyRepos" />
         <item android:id="@+id/nav_starred_repos"
-            android:icon="@drawable/ic_star"
+            android:icon="@drawable/ic_star_border_24dp"
             android:title="@string/navStarredRepos" />
         <item android:id="@+id/nav_organizations"
             android:icon="@drawable/ic_organization"
@@ -21,13 +21,13 @@
             android:icon="@drawable/ic_search"
             android:title="@string/navExplore" />
         <item android:id="@+id/nav_comments_draft"
-            android:icon="@drawable/ic_drafts_24dp"
+            android:icon="@drawable/ic_drafts"
             android:title="@string/titleDrafts" />
         <item android:id="@+id/nav_profile"
-            android:icon="@drawable/ic_person_24dp"
+            android:icon="@drawable/ic_person"
             android:title="@string/navProfile" />
         <item android:id="@+id/nav_administration"
-            android:icon="@drawable/ic_admin"
+            android:icon="@drawable/ic_tool"
             android:title="@string/navAdministration"
             android:visible="false" />
     </group>
@@ -35,21 +35,21 @@
     <group android:checkableBehavior="single"
         android:id="@+id/nav_menu_settings">
         <item android:id="@+id/nav_settings"
-            android:icon="@drawable/ic_settings_24dp"
+            android:icon="@drawable/ic_settings"
             android:title="@string/navSettings" />
         <item android:id="@+id/nav_about"
-            android:icon="@drawable/ic_info_outline_24dp"
+            android:icon="@drawable/ic_info"
             android:title="@string/navAbout" />
     </group>
 
     <item android:id="@+id/nav_rate_app"
-        android:icon="@drawable/ic_thumb_up_like"
+        android:icon="@drawable/ic_like"
         android:title="@string/navRate" />
 
     <group android:checkableBehavior="single"
         android:id="@+id/nav_extra">
         <item android:id="@+id/nav_logout"
-            android:icon="@drawable/ic_exit_24dp"
+            android:icon="@drawable/ic_logout"
             android:title="@string/navLogout" />
     </group>
 
diff --git a/app/src/main/res/menu/reply_to_issue.xml b/app/src/main/res/menu/reply_to_issue.xml
index 3d57cd9b..77b30e50 100644
--- a/app/src/main/res/menu/reply_to_issue.xml
+++ b/app/src/main/res/menu/reply_to_issue.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/replyToIssueMenu"
-        android:icon="@drawable/ic_drafts_24dp"
+        android:icon="@drawable/ic_drafts"
         android:title="@string/titleDrafts"
         android:orderInCategory="1"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index 870d5332..1d3bb808 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -19,7 +19,7 @@
         <item name="selectedTextColor">@color/darkGreen</item>
         <item name="alertDialogTheme">@style/AppThemeLightConfirmDialog</item>
         <item name="popupMenuStyle">@style/AppThemeLightPopupMenuStyle</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="autoCompleteTextViewStyle">@style/AppThemeLightSearchAutoCompleteTextView</item>
         <item name="hintColor">@color/hintColor</item>
         <item name="colorControlActivated">@color/darkGreen</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 19fb3766..b86f300f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -19,7 +19,7 @@
         <item name="selectedTextColor">@color/darkGreen</item>
         <item name="alertDialogTheme">@style/AppThemeConfirmDialog</item>
         <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="autoCompleteTextViewStyle">@style/AppThemeDarkSearchAutoCompleteTextView</item>
         <item name="hintColor">@color/hintColor</item>
         <item name="colorControlActivated">@color/darkGreen</item>
@@ -46,7 +46,7 @@
         <item name="selectedTextColor">@color/darkGreen</item>
         <item name="alertDialogTheme">@style/AppThemeLightConfirmDialog</item>
         <item name="popupMenuStyle">@style/AppThemeLightPopupMenuStyle</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
         <item name="autoCompleteTextViewStyle">@style/AppThemeLightSearchAutoCompleteTextView</item>
         <item name="hintColor">@color/hintColor</item>
         <item name="colorControlActivated">@color/darkGreen</item>
@@ -64,7 +64,7 @@
     </style>
 
     <style name="AppBottomSheetModalStyle" parent="Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@drawable/bottom_sheet_top_corners</item>
+        <item name="android:background">@drawable/shape_bottom_sheet_top_corners</item>
     </style>
 
     <style name="AppThemeLightSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
@@ -83,7 +83,7 @@
         <item name="android:textColor">@color/white</item>
         <item name="colorControlNormal">@color/white</item>
         <item name="colorControlActivated">@color/darkGreen</item>
-        <item name="android:windowBackground">@drawable/round_corners</item>
+        <item name="android:windowBackground">@drawable/shape_round_corners</item>
     </style>
 
     <style name="AppThemeLightConfirmDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
@@ -92,7 +92,7 @@
         <item name="android:textColor">@color/lightThemeTextColor</item>
         <item name="colorControlNormal">@color/lightThemeTextColor</item>
         <item name="colorControlActivated">@color/darkGreen</item>
-        <item name="android:windowBackground">@drawable/round_corners</item>
+        <item name="android:windowBackground">@drawable/shape_round_corners</item>
     </style>
 
     <style name="AppThemePopupMenuStyle" parent="Widget.AppCompat.PopupMenu">