From e00fcd846ac9ec447c6ec2ac76ab4543709e26fb Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@noreply.codeberg.org>
Date: Sun, 19 Jul 2020 12:24:47 +0200
Subject: [PATCH] Add missed icons and improve the ratio of all icons across
 the app (#592)

Merge branch 'master' into new-missing-icons

Merge branch 'master' into new-missing-icons

Fix background and icon

Fix search bar icons and layout to match the themes

new lines?

Merge branch 'master' into new-missing-icons

Add missed icons, and improve the ratio of all icons across the app

Co-authored-by: 6543 <6543@noreply.codeberg.org>
Co-authored-by: M M Arif <mmarif@swatian.com>
Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/592
---
 app/src/main/res/drawable/ic_appearance.xml   | 27 ++++++++++++++
 app/src/main/res/drawable/ic_archive.xml      | 25 +++++++++----
 app/src/main/res/drawable/ic_branch.xml       | 34 ++++++++++++-----
 app/src/main/res/drawable/ic_bug_report.xml   | 13 +++++--
 app/src/main/res/drawable/ic_calendar.xml     | 30 +++++++++++++--
 app/src/main/res/drawable/ic_check.xml        |  9 +++--
 app/src/main/res/drawable/ic_color.xml        |  5 ---
 app/src/main/res/drawable/ic_comment.xml      |  9 +++--
 app/src/main/res/drawable/ic_directory.xml    |  9 +++--
 app/src/main/res/drawable/ic_download.xml     | 22 ++++++++++-
 app/src/main/res/drawable/ic_email.xml        | 16 ++++++--
 app/src/main/res/drawable/ic_file.xml         | 16 ++++++--
 .../res/drawable/ic_file_download_24dp.xml    |  5 ---
 app/src/main/res/drawable/ic_filter.xml       |  8 +++-
 .../main/res/drawable/ic_filter_closed.xml    |  8 +++-
 app/src/main/res/drawable/ic_flag.xml         | 20 ++++++++++
 app/src/main/res/drawable/ic_flag_country.xml |  5 ---
 app/src/main/res/drawable/ic_info.xml         | 24 +++++++++---
 app/src/main/res/drawable/ic_issue.xml        | 24 +++++++++---
 app/src/main/res/drawable/ic_issue_closed.xml | 16 ++++++--
 app/src/main/res/drawable/ic_label.xml        | 17 ++++++---
 app/src/main/res/drawable/ic_like.xml         | 11 +++---
 app/src/main/res/drawable/ic_link.xml         | 16 ++++++--
 app/src/main/res/drawable/ic_location.xml     | 17 ++++++---
 app/src/main/res/drawable/ic_lock.xml         | 16 ++++++--
 app/src/main/res/drawable/ic_logout.xml       |  6 +--
 app/src/main/res/drawable/ic_reopen.xml       | 23 ++++++++++--
 app/src/main/res/drawable/ic_search.xml       | 16 ++++++--
 app/src/main/res/drawable/ic_security.xml     | 13 +++++++
 .../main/res/drawable/ic_security_24dp.xml    |  5 ---
 app/src/main/res/drawable/ic_share.xml        | 37 +++++++++++++++++--
 app/src/main/res/drawable/ic_star.xml         | 17 +++++++--
 .../main/res/drawable/ic_star_border_24dp.xml |  5 ---
 .../main/res/drawable/ic_star_unfilled.xml    | 14 +++++++
 app/src/main/res/drawable/ic_unlock.xml       | 16 ++++++--
 app/src/main/res/drawable/ic_unwatch.xml      | 24 +++++++++---
 app/src/main/res/layout/activity_main.xml     |  2 +-
 app/src/main/res/layout/bottom_sheet_repo.xml |  2 +-
 .../bottom_sheet_repository_in_list.xml       |  2 +-
 .../main/res/layout/fragment_repo_info.xml    |  2 +-
 app/src/main/res/layout/fragment_settings.xml |  6 +--
 app/src/main/res/layout/list_repositories.xml |  2 +-
 app/src/main/res/menu/drawer_menu.xml         |  2 +-
 app/src/main/res/menu/search_menu.xml         |  2 +-
 app/src/main/res/values-v23/themes.xml        |  1 +
 app/src/main/res/values/themes.xml            |  8 ++++
 46 files changed, 467 insertions(+), 140 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_appearance.xml
 delete mode 100644 app/src/main/res/drawable/ic_color.xml
 delete mode 100644 app/src/main/res/drawable/ic_file_download_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_flag.xml
 delete mode 100644 app/src/main/res/drawable/ic_flag_country.xml
 create mode 100644 app/src/main/res/drawable/ic_security.xml
 delete mode 100644 app/src/main/res/drawable/ic_security_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_star_border_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_star_unfilled.xml

diff --git a/app/src/main/res/drawable/ic_appearance.xml b/app/src/main/res/drawable/ic_appearance.xml
new file mode 100644
index 00000000..a8308016
--- /dev/null
+++ b/app/src/main/res/drawable/ic_appearance.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="M4,3L20,3A2,2 0,0 1,22 5L22,15A2,2 0,0 1,20 17L4,17A2,2 0,0 1,2 15L2,5A2,2 0,0 1,4 3z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M8,21L16,21"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,17L12,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_archive.xml b/app/src/main/res/drawable/ic_archive.xml
index 4605e3d2..bfb3657c 100644
--- a/app/src/main/res/drawable/ic_archive.xml
+++ b/app/src/main/res/drawable/ic_archive.xml
@@ -4,13 +4,24 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M2.75,2A1.75,1.75 0,0 0,1 3.75v3.5C1,8.216 1.784,9 2.75,9h18.5A1.75,1.75 0,0 0,23 7.25v-3.5A1.75,1.75 0,0 0,21.25 2L2.75,2zM21.25,3.5L2.75,3.5a0.25,0.25 0,0 0,-0.25 0.25v3.5c0,0.138 0.112,0.25 0.25,0.25h18.5a0.25,0.25 0,0 0,0.25 -0.25v-3.5a0.25,0.25 0,0 0,-0.25 -0.25z"
-      android:fillType="evenOdd"/>
+      android:pathData="M21,8l0,13l-18,0l0,-13"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
   <path
-      android:fillColor="#368f73"
-      android:pathData="M2.75,10a0.75,0.75 0,0 1,0.75 0.75v9.5c0,0.138 0.112,0.25 0.25,0.25h16.5a0.25,0.25 0,0 0,0.25 -0.25v-9.5a0.75,0.75 0,0 1,1.5 0v9.5A1.75,1.75 0,0 1,20.25 22H3.75A1.75,1.75 0,0 1,2 20.25v-9.5a0.75,0.75 0,0 1,0.75 -0.75z"/>
+      android:pathData="M1,3h22v5h-22z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
   <path
-      android:fillColor="#368f73"
-      android:pathData="M9.75,11.5a0.75,0.75 0,0 0,0 1.5h4.5a0.75,0.75 0,0 0,0 -1.5h-4.5z"/>
+      android:pathData="M10,12L14,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_branch.xml b/app/src/main/res/drawable/ic_branch.xml
index 683ded41..89723ab7 100644
--- a/app/src/main/res/drawable/ic_branch.xml
+++ b/app/src/main/res/drawable/ic_branch.xml
@@ -4,15 +4,31 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M5.75,21a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM2.5,19.25a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0zM5.75,6.5a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM2.5,4.75a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0zM18.25,6.5a1.75,1.75 0,1 1,0 -3.5,1.75 1.75,0 0,1 0,3.5zM15,4.75a3.25,3.25 0,1 0,6.5 0,3.25 3.25,0 0,0 -6.5,0z"
-      android:fillType="evenOdd"/>
+      android:pathData="M6,3L6,15"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
   <path
-      android:fillColor="#368f73"
-      android:pathData="M5.75,16.75A0.75,0.75 0,0 0,6.5 16V8A0.75,0.75 0,0 0,5 8v8c0,0.414 0.336,0.75 0.75,0.75z"
-      android:fillType="evenOdd"/>
+      android:pathData="M18,6m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
   <path
-      android:fillColor="#368f73"
-      android:pathData="M17.5,8.75v-1H19v1a3.75,3.75 0,0 1,-3.75 3.75h-7a1.75,1.75 0,0 0,-1.75 1.75H5A3.25,3.25 0,0 1,8.25 11h7a2.25,2.25 0,0 0,2.25 -2.25z"
-      android:fillType="evenOdd"/>
+      android:pathData="M6,18m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M18,9a9,9 0,0 1,-9 9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bug_report.xml b/app/src/main/res/drawable/ic_bug_report.xml
index a63dcc86..c1cbfed4 100644
--- a/app/src/main/res/drawable/ic_bug_report.xml
+++ b/app/src/main/res/drawable/ic_bug_report.xml
@@ -1,5 +1,10 @@
-<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,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp" android:viewportHeight="324.274"
+    android:viewportWidth="324.274" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#368F73" android:pathData="M34.419,298V22h138.696h0.841v33.411c0,8.301 6.753,15.055 15.053,15.055h33.154v88.5c2.443,-0.484 4.957,-0.75 7.528,-0.75c5.087,0 9.962,0.994 14.472,2.804V64.006c0,-1.326 -0.526,-2.598 -1.464,-3.536L183.694,1.464C182.755,0.527 181.484,0 180.158,0H27.472c-8.3,0 -15.053,6.753 -15.053,15.054v289.893c0,8.301 6.753,15.054 15.053,15.054h111.884c-1.256,-6.713 1.504,-13.831 7.559,-17.83c2.341,-1.546 4.692,-2.919 7.034,-4.17H34.419z"/>
+    <path android:fillColor="#368F73" android:pathData="M308.487,310.515c-12.254,-8.092 -25.057,-11.423 -33.599,-12.795c6.02,-9.685 9.564,-21.448 9.564,-34.129c0,-9.12 -1.824,-17.889 -5.174,-25.781c8.22,-1.738 18.908,-5.176 29.209,-11.98c3.457,-2.283 4.408,-6.935 2.126,-10.392c-2.283,-3.456 -6.936,-4.407 -10.392,-2.125c-10.742,7.094 -22.229,9.723 -29.102,10.698c-3.459,-4.387 -7.5,-8.249 -12.077,-11.394c0.859,-3.081 1.294,-6.265 1.294,-9.509c0,-17.861 -13.062,-32.393 -29.117,-32.393c-16.055,0 -29.115,14.531 -29.115,32.393c0,3.244 0.435,6.428 1.294,9.509c-4.577,3.145 -8.618,7.007 -12.077,11.394c-6.873,-0.975 -18.358,-3.603 -29.102,-10.698c-3.456,-2.282 -8.108,-1.331 -10.392,2.125c-2.282,3.456 -1.331,8.109 2.126,10.392c10.301,6.803 20.988,10.241 29.208,11.979c-3.351,7.893 -5.175,16.661 -5.175,25.781c0,12.681 3.544,24.444 9.563,34.129c-8.541,1.372 -21.343,4.703 -33.597,12.794c-3.456,2.283 -4.408,6.935 -2.126,10.392c1.442,2.184 3.83,3.368 6.266,3.368c1.419,0 2.854,-0.402 4.126,-1.242c16.62,-10.975 35.036,-11.269 35.362,-11.272c0.639,-0.002 1.255,-0.093 1.847,-0.245c8.877,7.447 19.884,11.861 31.791,11.861c11.907,0 22.914,-4.415 31.791,-11.861c0.598,0.153 1.22,0.244 1.865,0.245c0.183,0 18.499,0.148 35.346,11.272c1.272,0.84 2.707,1.242 4.126,1.242c2.434,0 4.823,-1.184 6.266,-3.368C312.895,317.45 311.943,312.797 308.487,310.515zM238.719,296.005c0,4.142 -3.357,7.5 -7.5,7.5c-4.142,0 -7.5,-3.358 -7.5,-7.5v-64.83c0,-4.142 3.358,-7.5 7.5,-7.5c4.143,0 7.5,3.358 7.5,7.5V296.005z"
+        tools:ignore="VectorPath" />
+    <path android:fillColor="#368F73" android:pathData="M143.627,49.624h-78c-4.418,0 -8,3.582 -8,8c0,4.418 3.582,8 8,8h78c4.418,0 8,-3.582 8,-8C151.627,53.206 148.045,49.624 143.627,49.624z"/>
+    <path android:fillColor="#368F73" android:pathData="M143.627,99.624h-78c-4.418,0 -8,3.582 -8,8c0,4.419 3.582,8 8,8h78c4.418,0 8,-3.581 8,-8C151.627,103.206 148.045,99.624 143.627,99.624z"/>
+    <path android:fillColor="#368F73" android:pathData="M143.627,149.624h-78c-4.418,0 -8,3.582 -8,8c0,4.419 3.582,8 8,8h78c4.418,0 8,-3.581 8,-8C151.627,153.206 148.045,149.624 143.627,149.624z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index e0feca00..ebfcbd96 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -4,7 +4,31 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M6.75,0a0.75,0.75 0,0 1,0.75 0.75L7.5,3h9L16.5,0.75a0.75,0.75 0,0 1,1.5 0L18,3h2.75c0.966,0 1.75,0.784 1.75,1.75v16a1.75,1.75 0,0 1,-1.75 1.75L3.25,22.5a1.75,1.75 0,0 1,-1.75 -1.75v-16C1.5,3.784 2.284,3 3.25,3L6,3L6,0.75A0.75,0.75 0,0 1,6.75 0zM3.25,4.5a0.25,0.25 0,0 0,-0.25 0.25L3,8h18L21,4.75a0.25,0.25 0,0 0,-0.25 -0.25L3.25,4.5zM21,9.5L3,9.5v11.25c0,0.138 0.112,0.25 0.25,0.25h17.5a0.25,0.25 0,0 0,0.25 -0.25L21,9.5z"
-      android:fillType="evenOdd"/>
+      android:pathData="M5,4L19,4A2,2 0,0 1,21 6L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,6A2,2 0,0 1,5 4z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M16,2L16,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M8,2L8,6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M3,10L21,10"
+      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_check.xml b/app/src/main/res/drawable/ic_check.xml
index eb67f792..3895ab41 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -4,7 +4,10 @@
     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"/>
+      android:pathData="M20,6l-11,11l-5,-5"
+      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_color.xml b/app/src/main/res/drawable/ic_color.xml
deleted file mode 100644
index ace41e5f..00000000
--- a/app/src/main/res/drawable/ic_color.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,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml
index cbc8cb9d..cb87d675 100644
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -4,7 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M3.25,4a0.25,0.25 0,0 0,-0.25 0.25v12.5c0,0.138 0.112,0.25 0.25,0.25h2.5a0.75,0.75 0,0 1,0.75 0.75v3.19l3.72,-3.72a0.75,0.75 0,0 1,0.53 -0.22h10a0.25,0.25 0,0 0,0.25 -0.25L21,4.25a0.25,0.25 0,0 0,-0.25 -0.25L3.25,4zM1.5,4.25c0,-0.966 0.784,-1.75 1.75,-1.75h17.5c0.966,0 1.75,0.784 1.75,1.75v12.5a1.75,1.75 0,0 1,-1.75 1.75h-9.69l-3.573,3.573A1.457,1.457 0,0 1,5 21.043L5,18.5L3.25,18.5a1.75,1.75 0,0 1,-1.75 -1.75L1.5,4.25z"
-      android:fillType="evenOdd"/>
+      android:pathData="M21,15a2,2 0,0 1,-2 2H7l-4,4V5a2,2 0,0 1,2 -2h14a2,2 0,0 1,2 2z"
+      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_directory.xml b/app/src/main/res/drawable/ic_directory.xml
index 77134c41..b78ad9dd 100644
--- a/app/src/main/res/drawable/ic_directory.xml
+++ b/app/src/main/res/drawable/ic_directory.xml
@@ -4,7 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M2,4.75C2,3.784 2.784,3 3.75,3h4.971c0.58,0 1.12,0.286 1.447,0.765l1.404,2.063a0.25,0.25 0,0 0,0.207 0.11h8.471c0.966,0 1.75,0.783 1.75,1.75V19.25A1.75,1.75 0,0 1,20.25 21H3.75A1.75,1.75 0,0 1,2 19.25V4.75z"
-      android:fillType="evenOdd"/>
+      android:pathData="M22,19a2,2 0,0 1,-2 2H4a2,2 0,0 1,-2 -2V5a2,2 0,0 1,2 -2h5l2,3h9a2,2 0,0 1,2 2z"
+      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_download.xml b/app/src/main/res/drawable/ic_download.xml
index d5ac6a96..b3e56ea6 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -4,6 +4,24 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M4.97,11.03a0.75,0.75 0,1 1,1.06 -1.06L11,14.94L11,2.75a0.75,0.75 0,0 1,1.5 0v12.19l4.97,-4.97a0.75,0.75 0,1 1,1.06 1.06l-6.25,6.25a0.75,0.75 0,0 1,-1.06 0l-6.25,-6.25zM4.75,20.5a0.75,0.75 0,0 0,0 1.5h14.5a0.75,0.75 0,0 0,0 -1.5L4.75,20.5z"/>
+      android:pathData="M21,15v4a2,2 0,0 1,-2 2H5a2,2 0,0 1,-2 -2v-4"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M7,10l5,5l5,-5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,15L12,3"
+      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 8bf38e31..0577ff76 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -4,7 +4,17 @@
     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"/>
+      android:pathData="M4,4h16c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H4c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M22,6l-10,7l-10,-7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_file.xml b/app/src/main/res/drawable/ic_file.xml
index f1a8abca..09f190ec 100644
--- a/app/src/main/res/drawable/ic_file.xml
+++ b/app/src/main/res/drawable/ic_file.xml
@@ -4,7 +4,17 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M5,2.5a0.5,0.5 0,0 0,-0.5 0.5v18a0.5,0.5 0,0 0,0.5 0.5h14a0.5,0.5 0,0 0,0.5 -0.5L19.5,8.5h-4a2,2 0,0 1,-2 -2v-4L5,2.5zM15,2.5v4a0.5,0.5 0,0 0,0.5 0.5h4a0.5,0.5 0,0 0,-0.146 -0.336l-4.018,-4.018A0.5,0.5 0,0 0,15 2.5zM3,3a2,2 0,0 1,2 -2h9.982a2,2 0,0 1,1.414 0.586l4.018,4.018A2,2 0,0 1,21 7.018L21,21a2,2 0,0 1,-2 2L5,23a2,2 0,0 1,-2 -2L3,3z"
-      android:fillType="evenOdd"/>
+      android:pathData="M13,2H6a2,2 0,0 0,-2 2v16a2,2 0,0 0,2 2h12a2,2 0,0 0,2 -2V9z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M13,2l0,7l7,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_file_download_24dp.xml b/app/src/main/res/drawable/ic_file_download_24dp.xml
deleted file mode 100644
index ffc2a2ff..00000000
--- a/app/src/main/res/drawable/ic_file_download_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="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index 156b4dbf..ee204906 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -4,6 +4,10 @@
     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"/>
+      android:pathData="M22,3l-20,0l8,9.46l0,6.54l4,2l0,-8.54l8,-9.46z"
+      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_filter_closed.xml b/app/src/main/res/drawable/ic_filter_closed.xml
index e1891b5b..de6ea523 100644
--- a/app/src/main/res/drawable/ic_filter_closed.xml
+++ b/app/src/main/res/drawable/ic_filter_closed.xml
@@ -4,6 +4,10 @@ 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"/>
+    android:pathData="M22,3l-20,0l8,9.46l0,6.54l4,2l0,-8.54l8,-9.46z"
+    android:strokeLineJoin="round"
+    android:strokeWidth="2"
+    android:fillColor="#00000000"
+    android:strokeColor="#AF4242"
+    android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_flag.xml b/app/src/main/res/drawable/ic_flag.xml
new file mode 100644
index 00000000..de00d90e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flag.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="M4,15s1,-1 4,-1 5,2 8,2 4,-1 4,-1V3s-1,1 -4,1 -5,-2 -8,-2 -4,1 -4,1z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M4,22L4,15"
+      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_flag_country.xml b/app/src/main/res/drawable/ic_flag_country.xml
deleted file mode 100644
index df3bd5fa..00000000
--- a/app/src/main/res/drawable/ic_flag_country.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="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 6d0434ae..0591f38a 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -4,10 +4,24 @@
     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"/>
+      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: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"/>
+      android:pathData="M12,16L12,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,8L12.01,8"
+      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_issue.xml b/app/src/main/res/drawable/ic_issue.xml
index e0079e94..8c379104 100644
--- a/app/src/main/res/drawable/ic_issue.xml
+++ b/app/src/main/res/drawable/ic_issue.xml
@@ -4,10 +4,24 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M12,7a0.75,0.75 0,0 1,0.75 0.75v4.5a0.75,0.75 0,0 1,-1.5 0v-4.5A0.75,0.75 0,0 1,12 7zM13,16a1,1 0,1 1,-2 0,1 1,0 0,1 2,0z"/>
+      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: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"/>
+      android:pathData="M12,8L12,12"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12,16L12.01,16"
+      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_issue_closed.xml b/app/src/main/res/drawable/ic_issue_closed.xml
index 36b53975..38013e41 100644
--- a/app/src/main/res/drawable/ic_issue_closed.xml
+++ b/app/src/main/res/drawable/ic_issue_closed.xml
@@ -4,9 +4,17 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M2.5,12c0,-5.24 4.288,-9.5 9.593,-9.5a9.608,9.608 0,0 1,7.197 3.219,0.75 0.75,0 0,0 1.12,-0.998A11.108,11.108 0,0 0,12.093 1C5.973,1 1,5.919 1,12s4.973,11 11.093,11c5.403,0 9.91,-3.832 10.893,-8.915a0.75,0.75 0,1 0,-1.472 -0.285c-0.848,4.381 -4.74,7.7 -9.421,7.7C6.788,21.5 2.5,17.24 2.5,12z"/>
+      android:pathData="M22,11.08V12a10,10 0,1 1,-5.93 -9.14"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
   <path
-      android:fillColor="#368f73"
-      android:pathData="M12,17a1,1 0,1 0,0 -2,1 1,0 0,0 0,2zM12,7a0.75,0.75 0,0 1,0.75 0.75v4.5a0.75,0.75 0,0 1,-1.5 0v-4.5A0.75,0.75 0,0 1,12 7zM23.28,7.78a0.75,0.75 0,0 0,-1.06 -1.06l-3.47,3.47 -1.47,-1.47a0.75,0.75 0,1 0,-1.06 1.06l2,2a0.75,0.75 0,0 0,1.06 0l4,-4z"/>
+      android:pathData="M22,4l-10,10.01l-3,-3"
+      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_label.xml b/app/src/main/res/drawable/ic_label.xml
index e5d33e5c..2904637e 100644
--- a/app/src/main/res/drawable/ic_label.xml
+++ b/app/src/main/res/drawable/ic_label.xml
@@ -4,10 +4,17 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M7.75,6.5a1.25,1.25 0,1 0,0 2.5,1.25 1.25,0 0,0 0,-2.5z"/>
+      android:pathData="M20.59,13.41l-7.17,7.17a2,2 0,0 1,-2.83 0L2,12V2h10l8.59,8.59a2,2 0,0 1,0 2.82z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
   <path
-      android:fillColor="#368f73"
-      android:pathData="M2.5,1A1.5,1.5 0,0 0,1 2.5v8.44c0,0.397 0.158,0.779 0.44,1.06l10.25,10.25a1.5,1.5 0,0 0,2.12 0l8.44,-8.44a1.5,1.5 0,0 0,0 -2.12L12,1.44A1.5,1.5 0,0 0,10.94 1L2.5,1zM2.5,2.5h8.44l10.25,10.25 -8.44,8.44L2.5,10.94L2.5,2.5z"
-      android:fillType="evenOdd"/>
+      android:pathData="M7,7L7.01,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_like.xml b/app/src/main/res/drawable/ic_like.xml
index 40a638c9..bf554fd0 100644
--- a/app/src/main/res/drawable/ic_like.xml
+++ b/app/src/main/res/drawable/ic_like.xml
@@ -1,12 +1,13 @@
 <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" />
+      android:pathData="M14,9V5a3,3 0,0 0,-3 -3l-4,9v11h11.28a2,2 0,0 0,2 -1.7l1.38,-9a2,2 0,0 0,-2 -2.3zM7,22H4a2,2 0,0 1,-2 -2v-7a2,2 0,0 1,2 -2h3"
+      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_link.xml b/app/src/main/res/drawable/ic_link.xml
index 2373a76d..5e04c607 100644
--- a/app/src/main/res/drawable/ic_link.xml
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -4,9 +4,17 @@
     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"/>
+      android:pathData="M10,13a5,5 0,0 0,7.54 0.54l3,-3a5,5 0,0 0,-7.07 -7.07l-1.72,1.71"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
   <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"/>
+      android:pathData="M14,11a5,5 0,0 0,-7.54 -0.54l-3,3a5,5 0,0 0,7.07 7.07l1.71,-1.71"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
index 78b223ee..92b1b30e 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -4,10 +4,17 @@
     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"/>
+      android:pathData="M21,10c0,7 -9,13 -9,13s-9,-6 -9,-13a9,9 0,0 1,18 0z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
   <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"/>
+      android:pathData="M12,10m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index aa0bfc23..84dfbfda 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -4,7 +4,17 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#368f73"
-      android:pathData="M6,9L6,7.25C6,3.845 8.503,1 12,1s6,2.845 6,6.25L18,9h0.5a2.5,2.5 0,0 1,2.5 2.5v8a2.5,2.5 0,0 1,-2.5 2.5h-13A2.5,2.5 0,0 1,3 19.5v-8A2.5,2.5 0,0 1,5.5 9L6,9zM7.5,7.25C7.5,4.58 9.422,2.5 12,2.5c2.578,0 4.5,2.08 4.5,4.75L16.5,9h-9L7.5,7.25zM4.5,11.5a1,1 0,0 1,1 -1h13a1,1 0,0 1,1 1v8a1,1 0,0 1,-1 1h-13a1,1 0,0 1,-1 -1v-8z"
-      android:fillType="evenOdd"/>
+      android:pathData="M5,11L19,11A2,2 0,0 1,21 13L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,13A2,2 0,0 1,5 11z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M7,11V7a5,5 0,0 1,10 0v4"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml
index 34e0c4a8..9af0500d 100644
--- a/app/src/main/res/drawable/ic_logout.xml
+++ b/app/src/main/res/drawable/ic_logout.xml
@@ -8,20 +8,20 @@
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="#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:strokeColor="#368F73"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M21,12L9,12"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
       android:fillColor="#00000000"
-      android:strokeColor="#368f73"
+      android:strokeColor="#368F73"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_reopen.xml b/app/src/main/res/drawable/ic_reopen.xml
index 09f758f0..aa8b34d1 100644
--- a/app/src/main/res/drawable/ic_reopen.xml
+++ b/app/src/main/res/drawable/ic_reopen.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="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+<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="M23,4l0,6l-6,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M20.49,15a9,9 0,1 1,-2.12 -9.36L23,10"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index df8b2134..f4028471 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -4,7 +4,17 @@
     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"/>
+      android:pathData="M11,11m-8,0a8,8 0,1 1,16 0a8,8 0,1 1,-16 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M21,21L16.65,16.65"
+      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_security.xml b/app/src/main/res/drawable/ic_security.xml
new file mode 100644
index 00000000..27910cb9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_security.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="M12,22s8,-4 8,-10V5l-8,-3 -8,3v7c0,6 8,10 8,10z"
+      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_security_24dp.xml b/app/src/main/res/drawable/ic_security_24dp.xml
deleted file mode 100644
index 6ffc522d..00000000
--- a/app/src/main/res/drawable/ic_security_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="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index 3c439ab4..03d2ce36 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -4,7 +4,38 @@
     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"/>
+      android:pathData="M18,5m-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="M6,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M18,19m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M8.59,13.51L15.42,17.49"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M15.41,6.51L8.59,10.49"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
index b47a7cb0..d332c8ec 100644
--- a/app/src/main/res/drawable/ic_star.xml
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -1,5 +1,14 @@
-<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,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
+<vector 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,2l3.09,6.26l6.91,1.01l-5,4.87l1.18,6.88l-6.18,-3.25l-6.18,3.25l1.18,-6.88l-5,-4.87l6.91,-1.01l3.09,-6.26z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#368F73"
+        android:strokeColor="#368F73"
+        android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_border_24dp.xml b/app/src/main/res/drawable/ic_star_border_24dp.xml
deleted file mode 100644
index 3706f71c..00000000
--- a/app/src/main/res/drawable/ic_star_border_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="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_star_unfilled.xml b/app/src/main/res/drawable/ic_star_unfilled.xml
new file mode 100644
index 00000000..0e338c4c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_unfilled.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2l3.09,6.26l6.91,1.01l-5,4.87l1.18,6.88l-6.18,-3.25l-6.18,3.25l1.18,-6.88l-5,-4.87l6.91,-1.01l3.09,-6.26z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#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
index a99a4c3a..a06f66b2 100644
--- a/app/src/main/res/drawable/ic_unlock.xml
+++ b/app/src/main/res/drawable/ic_unlock.xml
@@ -4,7 +4,17 @@
     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"/>
+      android:pathData="M5,11L19,11A2,2 0,0 1,21 13L21,20A2,2 0,0 1,19 22L5,22A2,2 0,0 1,3 20L3,13A2,2 0,0 1,5 11z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M7,11V7a5,5 0,0 1,9.9 -1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#368F73"
+      android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_unwatch.xml b/app/src/main/res/drawable/ic_unwatch.xml
index 3d694e13..051d0208 100644
--- a/app/src/main/res/drawable/ic_unwatch.xml
+++ b/app/src/main/res/drawable/ic_unwatch.xml
@@ -1,6 +1,20 @@
-<vector android:autoMirrored="true" android:height="24dp"
-    android:viewportHeight="511.999" android:viewportWidth="511.999"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#368f73" android:pathData="M508.745,246.041c-4.574,-6.257 -113.557,-153.206 -252.748,-153.206S7.818,239.784 3.249,246.035c-4.332,5.936 -4.332,13.987 0,19.923c4.569,6.257 113.557,153.206 252.748,153.206s248.174,-146.95 252.748,-153.201C513.083,260.028 513.083,251.971 508.745,246.041zM255.997,385.406c-102.529,0 -191.33,-97.533 -217.617,-129.418c26.253,-31.913 114.868,-129.395 217.617,-129.395c102.524,0 191.319,97.516 217.617,129.418C447.361,287.923 358.746,385.406 255.997,385.406z"/>
-    <path android:fillColor="#368f73" android:pathData="M255.997,154.725c-55.842,0 -101.275,45.433 -101.275,101.275s45.433,101.275 101.275,101.275s101.275,-45.433 101.275,-101.275S311.839,154.725 255.997,154.725zM255.997,323.516c-37.23,0 -67.516,-30.287 -67.516,-67.516s30.287,-67.516 67.516,-67.516s67.516,30.287 67.516,67.516S293.227,323.516 255.997,323.516z"/>
+<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="M1,12s4,-8 11,-8 11,8 11,8 -4,8 -11,8 -11,-8 -11,-8z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#368F73"
+        android:strokeLineCap="round"/>
+    <path
+        android:pathData="M12,12m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
+        android:strokeLineJoin="round"
+        android:strokeWidth="2"
+        android:fillColor="#00000000"
+        android:strokeColor="#368F73"
+        android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0124938f..2f22cc27 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -55,4 +55,4 @@
         app:itemTextAppearance="@style/DrawerIcon"
         app:itemTextColor="?attr/primaryTextColor" />
 
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_repo.xml b/app/src/main/res/layout/bottom_sheet_repo.xml
index dfc77c33..3af12b0c 100644
--- a/app/src/main/res/layout/bottom_sheet_repo.xml
+++ b/app/src/main/res/layout/bottom_sheet_repo.xml
@@ -103,7 +103,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/starRepository"
-                android:drawableStart="@drawable/ic_star_border_24dp"
+                android:drawableStart="@drawable/ic_star_unfilled"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
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 364ac4c6..ef64ee52 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
@@ -53,7 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoStargazersInMenu"
-                android:drawableStart="@drawable/ic_star_border_24dp"
+                android:drawableStart="@drawable/ic_star_unfilled"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index e6896f88..327b9ad8 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -97,7 +97,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:contentDescription="@string/repoStargazersInMenu"
-                            app:srcCompat="@drawable/ic_star_border_24dp" />
+                            app:srcCompat="@drawable/ic_star_unfilled" />
 
                         <TextView
                             android:id="@+id/repoMetaStars"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 9bf0e565..399f1ce8 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -27,7 +27,7 @@
                     android:id="@+id/tvAppearance"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawableStart="@drawable/ic_color"
+                    android:drawableStart="@drawable/ic_appearance"
                     android:drawablePadding="24dp"
                     android:paddingStart="12dp"
                     android:paddingEnd="12dp"
@@ -123,7 +123,7 @@
                     android:id="@+id/tvSecurity"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawableStart="@drawable/ic_security_24dp"
+                    android:drawableStart="@drawable/ic_security"
                     android:drawablePadding="24dp"
                     android:paddingStart="12dp"
                     android:paddingEnd="12dp"
@@ -155,7 +155,7 @@
                     android:id="@+id/tvLanguages"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:drawableStart="@drawable/ic_flag_country"
+                    android:drawableStart="@drawable/ic_flag"
                     android:drawablePadding="24dp"
                     android:paddingStart="12dp"
                     android:paddingEnd="12dp"
diff --git a/app/src/main/res/layout/list_repositories.xml b/app/src/main/res/layout/list_repositories.xml
index bde204b6..6b6d7dcd 100644
--- a/app/src/main/res/layout/list_repositories.xml
+++ b/app/src/main/res/layout/list_repositories.xml
@@ -150,7 +150,7 @@
                     android:layout_height="24dp"
                     android:layout_gravity="center_vertical"
                     android:layout_weight=".25"
-                    android:drawableStart="@drawable/ic_star_border_24dp"
+                    android:drawableStart="@drawable/ic_star_unfilled"
                     android:drawablePadding="6dp"
                     android:gravity="center_vertical"
                     android:text="@string/repoStars"
diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml
index 5d440e17..5b233e61 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_border_24dp"
+            android:icon="@drawable/ic_star_unfilled"
             android:title="@string/navStarredRepos" />
         <item android:id="@+id/nav_organizations"
             android:icon="@drawable/ic_organization"
diff --git a/app/src/main/res/menu/search_menu.xml b/app/src/main/res/menu/search_menu.xml
index 442ad8de..445c1147 100644
--- a/app/src/main/res/menu/search_menu.xml
+++ b/app/src/main/res/menu/search_menu.xml
@@ -10,4 +10,4 @@
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index 1d3bb808..d7dd3f68 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -25,6 +25,7 @@
         <item name="colorControlActivated">@color/darkGreen</item>
         <item name="dividerColor">@color/lightThemeDividerColor</item>
         <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
+        <item name="searchViewStyle">@style/AppSearchViewStyle</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b86f300f..a35a7e4e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -25,6 +25,7 @@
         <item name="colorControlActivated">@color/darkGreen</item>
         <item name="dividerColor">@color/dividerColorDark</item>
         <item name="bottomSheetDialogTheme">@style/AppThemeDarkBottomSheetDialog</item>
+        <item name="searchViewStyle">@style/AppSearchViewStyle</item>
     </style>
     <!-- Dark theme - default -->
 
@@ -52,9 +53,16 @@
         <item name="colorControlActivated">@color/darkGreen</item>
         <item name="dividerColor">@color/lightThemeDividerColor</item>
         <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
+        <item name="searchViewStyle">@style/AppSearchViewStyle</item>
     </style>
     <!-- Light theme -->
 
+    <style name="AppSearchViewStyle" parent="Widget.AppCompat.SearchView">
+        <item name="searchHintIcon">@drawable/ic_search</item>
+        <item name="searchIcon">@null</item>
+        <item name="closeIcon">@drawable/ic_close</item>
+    </style>
+
     <style name="AppThemeDarkBottomSheetDialog" parent="Theme.Design.Light.BottomSheetDialog">
         <item name="bottomSheetStyle">@style/AppBottomSheetModalStyle</item>
     </style>