diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index 4ddf036b..4fb677d0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -50,36 +50,47 @@ public abstract class BaseActivity extends AppCompatActivity {
 		switch(tinyDB.getInt("themeId")) {
 
 			case 1:
+
 				tinyDB.putString("currentTheme", "light");
 				setTheme(R.style.AppThemeLight);
 				break;
-
 			case 2:
+
 				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
+
 					tinyDB.putString("currentTheme", "dark");
 					setTheme(R.style.AppTheme);
-				} else {
+				}
+				else {
+
 					tinyDB.putString("currentTheme", "light");
 					setTheme(R.style.AppThemeLight);
 				}
 				break;
-
 			case 3:
+
 				tinyDB.putString("currentTheme", "light");
 				setTheme(R.style.AppThemeRetro);
 				break;
-
 			case 4:
 				if(TimeHelper.timeBetweenHours(18, 6)) { // 6pm to 6am
+
 					tinyDB.putString("currentTheme", "dark");
 					setTheme(R.style.AppTheme);
-				} else {
+				}
+				else {
+
 					tinyDB.putString("currentTheme", "light");
 					setTheme(R.style.AppThemeRetro);
 				}
 				break;
+			case 5:
 
+				tinyDB.putString("currentTheme", "dark");
+				setTheme(R.style.AppThemePitchBlack);
+				break;
 			default:
+
 				tinyDB.putString("currentTheme", "dark");
 				setTheme(R.style.AppTheme);
 
@@ -95,25 +106,25 @@ public abstract class BaseActivity extends AppCompatActivity {
 		switch(tinyDB.getInt("customFontId", -1)) {
 
 			case 0:
+
 				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
 				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/roboto.ttf");
 				FontsOverride.setDefaultFont(this, "SERIF", "fonts/roboto.ttf");
 				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/roboto.ttf");
 				break;
-
 			case 2:
+
 				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/sourcecodeproregular.ttf");
 				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/sourcecodeproregular.ttf");
 				FontsOverride.setDefaultFont(this, "SERIF", "fonts/sourcecodeproregular.ttf");
 				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/sourcecodeproregular.ttf");
 				break;
-
 			default:
+
 				FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/manroperegular.ttf");
 				FontsOverride.setDefaultFont(this, "MONOSPACE", "fonts/manroperegular.ttf");
 				FontsOverride.setDefaultFont(this, "SERIF", "fonts/manroperegular.ttf");
 				FontsOverride.setDefaultFont(this, "SANS_SERIF", "fonts/manroperegular.ttf");
-
 		}
 
 		if(tinyDB.getInt("pollingDelayMinutes", 0) <= 0) {
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
index a55108ac..95b54ec1 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsAppearanceActivity.java
@@ -24,7 +24,7 @@ public class SettingsAppearanceActivity extends BaseActivity {
 	private static final String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
 	private static int customFontSelectedChoice = 0;
 
-	private static final String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)"};
+	private static final String[] themeList = {"Dark", "Light", "Auto (Light / Dark)", "Retro", "Auto (Retro / Dark)", "Pitch Black"};
 	private static int themeSelectedChoice = 0;
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
index 2941f4c8..1655d101 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java
@@ -17,6 +17,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -105,7 +106,9 @@ public class IssuesFragment extends Fragment {
 
 		}));
 
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(recyclerView.getContext(), DividerItemDecoration.VERTICAL);
 		recyclerView.setHasFixedSize(true);
+		recyclerView.addItemDecoration(dividerItemDecoration);
 		recyclerView.setLayoutManager(new LinearLayoutManager(context));
 		recyclerView.setAdapter(adapter);
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
index 2e76d471..b1a0d9d2 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MilestonesFragment.java
@@ -14,6 +14,7 @@ import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.RepoDetailActivity;
@@ -88,6 +89,8 @@ public class MilestonesFragment extends Fragment {
 
 	    }
 
+	    DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.recyclerView.getContext(), DividerItemDecoration.VERTICAL);
+	    viewBinding.recyclerView.addItemDecoration(dividerItemDecoration);
         viewBinding.recyclerView.setHasFixedSize(true);
         viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
         viewBinding.recyclerView.setAdapter(adapter);
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SearchIssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SearchIssuesFragment.java
index ace7a0b3..e31c977e 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SearchIssuesFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SearchIssuesFragment.java
@@ -10,6 +10,7 @@ import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import org.mian.gitnex.adapters.SearchIssuesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -57,6 +58,8 @@ public class SearchIssuesFragment extends Fragment {
 
 		LinearLayoutManager linearLayoutManager = new LinearLayoutManager(ctx);
 
+		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(viewBinding.recyclerViewSearchIssues.getContext(), DividerItemDecoration.VERTICAL);
+		viewBinding.recyclerViewSearchIssues.addItemDecoration(dividerItemDecoration);
 		viewBinding.recyclerViewSearchIssues.setHasFixedSize(true);
 		viewBinding.recyclerViewSearchIssues.setLayoutManager(linearLayoutManager);
 		viewBinding.recyclerViewSearchIssues.setAdapter(adapter);
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 03c45404..18d79744 100644
--- a/app/src/main/res/layout/bottom_sheet_admin_users.xml
+++ b/app/src/main/res/layout/bottom_sheet_admin_users.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/adminCreateNewUser"
-                android:drawableStart="@drawable/ic_person_add"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_person_add" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_drafts.xml b/app/src/main/res/layout/bottom_sheet_drafts.xml
index 3ba8e465..4d76f557 100644
--- a/app/src/main/res/layout/bottom_sheet_drafts.xml
+++ b/app/src/main/res/layout/bottom_sheet_drafts.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/deleteAllDrafts"
-                android:drawableStart="@drawable/ic_delete"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_delete" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_file_viewer.xml b/app/src/main/res/layout/bottom_sheet_file_viewer.xml
index 71352dea..30cbcd48 100644
--- a/app/src/main/res/layout/bottom_sheet_file_viewer.xml
+++ b/app/src/main/res/layout/bottom_sheet_file_viewer.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/editFile"
-                android:drawableStart="@drawable/ic_edit"
                 android:drawablePadding="24dp"
                 android:padding="12dp"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                app:drawableStartCompat="@drawable/ic_edit" />
 
             <TextView
                 android:id="@+id/deleteFile"
@@ -35,11 +36,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/deleteFile"
-                android:drawableStart="@drawable/ic_delete"
                 android:drawablePadding="24dp"
                 android:padding="12dp"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                app:drawableStartCompat="@drawable/ic_delete" />
 
             <TextView
                 android:id="@+id/downloadFile"
@@ -47,11 +48,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/downloadFile"
-                android:drawableStart="@drawable/ic_download"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_download" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_issues_filter.xml b/app/src/main/res/layout/bottom_sheet_issues_filter.xml
index 4ae9e66e..a89de021 100644
--- a/app/src/main/res/layout/bottom_sheet_issues_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_issues_filter.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isOpen"
-                android:drawableStart="@drawable/ic_issue"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_issue" />
 
             <TextView
                 android:id="@+id/closedIssues"
@@ -35,11 +36,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isClosed"
-                android:drawableStart="@drawable/ic_done"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_done" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_labels_in_list.xml b/app/src/main/res/layout/bottom_sheet_labels_in_list.xml
index b94193ee..e9e78677 100644
--- a/app/src/main/res/layout/bottom_sheet_labels_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_labels_in_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -41,11 +42,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/labelMenuEdit"
-                android:drawableStart="@drawable/ic_edit"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_edit" />
 
             <TextView
                 android:id="@+id/labelMenuDelete"
@@ -53,11 +54,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/labelMenuDelete"
-                android:drawableStart="@drawable/ic_delete"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_delete" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_milestones_filter.xml b/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
index 3bbc112a..d876482f 100644
--- a/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isOpen"
-                android:drawableStart="@drawable/ic_milestone"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_milestone" />
 
             <TextView
                 android:id="@+id/closedMilestone"
@@ -35,11 +36,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isClosed"
-                android:drawableStart="@drawable/ic_done"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_done" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_milestones_in_list.xml b/app/src/main/res/layout/bottom_sheet_milestones_in_list.xml
index 8ca9d814..8acacdfb 100644
--- a/app/src/main/res/layout/bottom_sheet_milestones_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_milestones_in_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/closeMilestone"
-                android:drawableStart="@drawable/ic_close"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/openMilestone"
@@ -35,11 +36,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/openMilestone"
-                android:drawableStart="@drawable/ic_check"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_check" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_notifications.xml b/app/src/main/res/layout/bottom_sheet_notifications.xml
index 18f38130..f22ab13f 100644
--- a/app/src/main/res/layout/bottom_sheet_notifications.xml
+++ b/app/src/main/res/layout/bottom_sheet_notifications.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 xmlns:android="http://schemas.android.com/apk/res/android"
-android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
 android:layout_height="wrap_content"
 android:orientation="vertical"
 android:paddingTop="6dp"
@@ -23,11 +24,11 @@ android:background="?attr/primaryBackgroundColor">
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/pinNotification"
-            android:drawableStart="@drawable/ic_pin"
             android:drawablePadding="24dp"
             android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
-            android:padding="12dp" />
+            android:padding="12dp"
+            app:drawableStartCompat="@drawable/ic_pin" />
 
         <TextView
             android:id="@+id/markRead"
@@ -35,11 +36,11 @@ android:background="?attr/primaryBackgroundColor">
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/markAsRead"
-            android:drawableStart="@drawable/ic_unwatch"
             android:drawablePadding="24dp"
             android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
-            android:padding="12dp" />
+            android:padding="12dp"
+            app:drawableStartCompat="@drawable/ic_unwatch" />
 
         <TextView
             android:id="@+id/markUnread"
@@ -47,11 +48,11 @@ android:background="?attr/primaryBackgroundColor">
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:text="@string/markAsUnread"
-            android:drawableStart="@drawable/ic_watchers"
             android:drawablePadding="24dp"
             android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
-            android:padding="12dp" />
+            android:padding="12dp"
+            app:drawableStartCompat="@drawable/ic_watchers" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_notifications_filter.xml b/app/src/main/res/layout/bottom_sheet_notifications_filter.xml
index 54969a3e..2ac0a503 100644
--- a/app/src/main/res/layout/bottom_sheet_notifications_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_notifications_filter.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isUnread"
-                android:drawableStart="@drawable/ic_watchers"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_watchers" />
 
             <TextView
                 android:id="@+id/readNotifications"
@@ -35,11 +36,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isRead"
-                android:drawableStart="@drawable/ic_unwatch"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_unwatch" />
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/bottom_sheet_organization.xml b/app/src/main/res/layout/bottom_sheet_organization.xml
index e6d6d46a..2d6841b3 100644
--- a/app/src/main/res/layout/bottom_sheet_organization.xml
+++ b/app/src/main/res/layout/bottom_sheet_organization.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/createRepository"
-                android:drawableStart="@drawable/ic_repo"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_repo" />
 
             <TextView
                 android:id="@+id/createTeam"
@@ -35,11 +36,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/orgCreateTeam"
-                android:drawableStart="@drawable/ic_people"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_people" />
 
             <TextView
                 android:id="@+id/copyOrgUrl"
@@ -47,11 +48,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/genericCopyUrl"
-                android:drawableStart="@drawable/ic_copy"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_copy" />
 
         </LinearLayout>
 
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 a4accfa8..003f7f2e 100644
--- a/app/src/main/res/layout/bottom_sheet_organization_teams.xml
+++ b/app/src/main/res/layout/bottom_sheet_organization_teams.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/addNewMember"
-                android:drawableStart="@drawable/ic_person_add"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_person_add" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_profile.xml b/app/src/main/res/layout/bottom_sheet_profile.xml
index 92f6d504..27d7ba80 100644
--- a/app/src/main/res/layout/bottom_sheet_profile.xml
+++ b/app/src/main/res/layout/bottom_sheet_profile.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/profileCreateNewEmailAddress"
-                android:drawableStart="@drawable/ic_email"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_email" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml b/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
index 6f1d7f07..10c06915 100644
--- a/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_pull_request_filter.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -23,11 +24,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isOpen"
-                android:drawableStart="@drawable/ic_pull_request"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_pull_request" />
 
             <TextView
                 android:id="@+id/closedPr"
@@ -35,11 +36,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/isClosed"
-                android:drawableStart="@drawable/ic_done"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_done" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/bottom_sheet_repo.xml b/app/src/main/res/layout/bottom_sheet_repo.xml
index b0767268..0b50ed57 100644
--- a/app/src/main/res/layout/bottom_sheet_repo.xml
+++ b/app/src/main/res/layout/bottom_sheet_repo.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -22,36 +23,36 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_file"
                 android:drawablePadding="24dp"
                 android:padding="12dp"
                 android:text="@string/pageTitleNewFile"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                app:drawableStartCompat="@drawable/ic_file" />
 
             <TextView
                 android:id="@+id/createNewIssue"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_issue"
                 android:drawablePadding="24dp"
                 android:padding="12dp"
                 android:text="@string/pageTitleCreateNewIssue"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                app:drawableStartCompat="@drawable/ic_issue" />
 
             <TextView
                 android:id="@+id/createPullRequest"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_pull_request"
                 android:drawablePadding="24dp"
                 android:padding="12dp"
                 android:text="@string/pageTitleNewPullRequest"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp" />
+                android:textSize="16sp"
+                app:drawableStartCompat="@drawable/ic_pull_request" />
 
             <TextView
                 android:id="@+id/createNewMilestone"
@@ -59,11 +60,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleCreateMilestone"
-                android:drawableStart="@drawable/ic_milestone"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_milestone" />
 
             <TextView
                 android:id="@+id/createLabel"
@@ -71,11 +72,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/createLabel"
-                android:drawableStart="@drawable/ic_label"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_label" />
 
             <TextView
                 android:id="@+id/createRelease"
@@ -83,11 +84,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/createRelease"
-                android:drawableStart="@drawable/ic_release"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_release" />
 
             <View
                 android:layout_width="match_parent"
@@ -103,11 +104,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/addCollaboratorTitle"
-                android:drawableStart="@drawable/ic_person_add"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_person_add" />
 
             <TextView
                 android:id="@+id/starRepository"
@@ -115,11 +116,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/starRepository"
-                android:drawableStart="@drawable/ic_star_unfilled"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_star_unfilled" />
 
             <TextView
                 android:id="@+id/unStarRepository"
@@ -127,11 +128,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/unStarRepository"
-                android:drawableStart="@drawable/ic_star"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_star" />
 
             <TextView
                 android:id="@+id/watchRepository"
@@ -139,11 +140,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/watchRepository"
-                android:drawableStart="@drawable/ic_unwatch"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_unwatch" />
 
             <TextView
                 android:id="@+id/unWatchRepository"
@@ -151,11 +152,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/unWatchRepository"
-                android:drawableStart="@drawable/ic_watchers"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_watchers" />
 
             <View
                 android:layout_width="match_parent"
@@ -170,36 +171,36 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_copy"
                 android:drawablePadding="24dp"
                 android:text="@string/genericCopyUrl"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_copy" />
 
             <TextView
                 android:id="@+id/shareRepository"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_share"
                 android:drawablePadding="24dp"
                 android:text="@string/shareRepository"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_share" />
 
             <TextView
                 android:id="@+id/openWebRepo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_browser"
                 android:drawablePadding="24dp"
                 android:text="@string/openWebRepo"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_browser" />
 
             <View
                 android:id="@+id/repoSettingsDivider"
@@ -215,12 +216,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_settings"
                 android:drawablePadding="24dp"
                 android:text="@string/navSettings"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_settings" />
 
         </LinearLayout>
 
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 30fbc702..bd3ddd38 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
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -41,11 +42,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoStargazersInMenu"
-                android:drawableStart="@drawable/ic_star_unfilled"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_star_unfilled" />
 
             <TextView
                 android:id="@+id/repoWatchers"
@@ -53,11 +54,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoWatchersInMenu"
-                android:drawableStart="@drawable/ic_unwatch"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_unwatch" />
 
             <TextView
                 android:id="@+id/repoForksList"
@@ -65,11 +66,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/infoTabRepoForksCount"
-                android:drawableStart="@drawable/ic_fork"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_fork" />
 
             <TextView
                 android:id="@+id/repoCopyUrl"
@@ -77,11 +78,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/genericCopyUrl"
-                android:drawableStart="@drawable/ic_copy"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_copy" />
 
             <TextView
                 android:id="@+id/repoOpenInBrowser"
@@ -89,11 +90,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/openWebRepo"
-                android:drawableStart="@drawable/ic_browser"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_browser" />
 
         </LinearLayout>
 
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 7d414109..be79900d 100644
--- a/app/src/main/res/layout/bottom_sheet_single_issue.xml
+++ b/app/src/main/res/layout/bottom_sheet_single_issue.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -30,12 +31,12 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/openFileDiffText"
-                android:drawableStart="@drawable/ic_file"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_file" />
 
             <TextView
                 android:id="@+id/mergePullRequest"
@@ -43,11 +44,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/mergePullRequestText"
-                android:drawableStart="@drawable/ic_pull_request"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_pull_request" />
 
             <TextView
                 android:id="@+id/editIssue"
@@ -55,11 +56,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/editIssue"
-                android:drawableStart="@drawable/ic_edit"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_edit" />
 
             <TextView
                 android:id="@+id/addRemoveAssignees"
@@ -67,11 +68,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/addRemoveAssignees"
-                android:drawableStart="@drawable/ic_person_add"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_person_add" />
 
             <TextView
                 android:id="@+id/editLabels"
@@ -79,11 +80,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/singleIssueEditLabels"
-                android:drawableStart="@drawable/ic_label"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_label" />
 
             <TextView
                 android:id="@+id/subscribeIssue"
@@ -91,24 +92,24 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/singleIssueSubscribe"
-                android:drawableStart="@drawable/ic_unwatch"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_unwatch" />
 
             <TextView
                 android:id="@+id/unsubscribeIssue"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_watchers"
                 android:drawablePadding="24dp"
                 android:text="@string/singleIssueUnSubscribe"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_watchers" />
 
             <View
                 android:layout_width="match_parent"
@@ -123,24 +124,24 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_share"
                 android:drawablePadding="24dp"
                 android:text="@string/shareIssue"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_share" />
 
             <TextView
                 android:id="@+id/copyIssueUrl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:drawableStart="@drawable/ic_copy"
                 android:drawablePadding="24dp"
                 android:text="@string/copyIssueUrl"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_copy" />
 
             <View
                 android:layout_width="match_parent"
@@ -156,11 +157,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/closeIssue"
-                android:drawableStart="@drawable/ic_issue_closed"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_issue_closed" />
 
             <TextView
                 android:id="@+id/reOpenIssue"
@@ -168,12 +169,12 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/reOpenIssue"
-                android:drawableStart="@drawable/ic_reopen"
                 android:drawablePadding="24dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone"
-                android:padding="12dp" />
+                android:padding="12dp"
+                app:drawableStartCompat="@drawable/ic_reopen" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_administration.xml b/app/src/main/res/layout/fragment_administration.xml
index fa497b2b..9c810f13 100644
--- a/app/src/main/res/layout/fragment_administration.xml
+++ b/app/src/main/res/layout/fragment_administration.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/primaryBackgroundColor">
@@ -19,16 +20,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/adminUsers"
-                android:drawableStart="@drawable/ic_people"
                 android:drawablePadding="32dp"
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
-                android:padding="16dp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="?attr/dividerColor" />
+                android:padding="16dp"
+                app:drawableStartCompat="@drawable/ic_people" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_issues.xml b/app/src/main/res/layout/list_issues.xml
index 2aba3e50..8d4faff7 100644
--- a/app/src/main/res/layout/list_issues.xml
+++ b/app/src/main/res/layout/list_issues.xml
@@ -102,11 +102,4 @@
 
     </RelativeLayout>
 
-    <View
-        android:layout_below="@id/mainFrame"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:id="@+id/divider"
-        android:background="?attr/dividerColor" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index dea28142..313e59e3 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -178,11 +178,4 @@
 
     </LinearLayout>
 
-    <View
-        android:layout_below="@id/mainFrame"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:id="@+id/divider"
-        android:background="?attr/dividerColor" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/list_pr.xml b/app/src/main/res/layout/list_pr.xml
index 5e049754..a62e94a6 100644
--- a/app/src/main/res/layout/list_pr.xml
+++ b/app/src/main/res/layout/list_pr.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/relativeLayoutFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -97,10 +98,10 @@
                         android:layout_height="wrap_content"
                         android:gravity="start"
                         android:drawablePadding="5dp"
-                        android:drawableStart="@drawable/ic_comment"
                         android:layout_gravity="center_horizontal"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
+                        android:textSize="14sp"
+                        app:drawableStartCompat="@drawable/ic_comment" />
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b024bc12..3a85e05f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <color name="colorPrimary">#212121</color>
     <color name="colorPrimaryDark">#212121</color>
     <color name="colorAccent">#7f7e7b</color>
@@ -56,4 +55,7 @@
     <color name="iconPrMergedColor">#a333c8</color>
     <color name="iconIssuePrClosedColor">#db2828</color>
 
+    <color name="pitchBlackThemeBackground">#050505</color>
+    <color name="pitchBlackThemeTextColor">#d2d2d2</color>
+    <color name="pitchBlackThemeGeneralBackgroundColor">#151515</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0ae51044..a2af303a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -121,6 +121,46 @@
     </style>
     <!-- Retro theme -->
 
+    <!-- Pitch black theme -->
+    <style name="AppThemePitchBlack" parent="Theme.MaterialComponents.NoActionBar">
+        <item name="android:statusBarColor">@color/pitchBlackThemeBackground</item>
+        <item name="android:typeface">monospace</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:textColorSecondary">@color/pitchBlackThemeTextColor</item>
+        <item name="android:textColorPrimary">@color/pitchBlackThemeTextColor</item>
+        <item name="colorPrimary">@color/darkGreen</item>
+        <item name="colorSecondary">@color/pitchBlackThemeTextColor</item>
+
+        <item name="diffAddedColor">@color/diffAddedColor</item>
+        <item name="diffRemovedColor">@color/diffRemovedColor</item>
+        <item name="diffSelectedColor">@color/diffSelectedColor</item>
+        <item name="primaryTextColor">@color/pitchBlackThemeTextColor</item>
+        <item name="primaryBackgroundColor">@color/pitchBlackThemeBackground</item>
+        <item name="inputBackgroundColor">@color/inputBackground</item>
+        <item name="inputSelectedColor">@color/inputSelected</item>
+        <item name="inputTextColor">@color/pitchBlackThemeTextColor</item>
+        <item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
+        <item name="selectedTextColor">@color/darkGreen</item>
+        <item name="alertDialogTheme">@style/AppThemePitchBlackConfirmDialog</item>
+        <item name="popupMenuStyle">@style/AppThemePitchBlackPopupMenuStyle</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>
+        <item name="dividerColor">@color/hintColor</item>
+        <item name="bottomSheetDialogTheme">@style/AppThemeDarkBottomSheetDialog</item>
+        <item name="searchViewStyle">@style/AppSearchViewStyle</item>
+        <item name="progressIndicatorColor">@color/darkGreen</item>
+        <item name="fabColor">@color/darkGreen</item>
+        <item name="iconsColor">@color/darkGreen</item>
+        <item name="pagerTabIndicatorColor">@color/darkGreen</item>
+        <item name="android:actionOverflowButtonStyle">@style/customOverflowButtonStyle</item>
+        <item name="actionOverflowMenuStyle">@style/customOverflowMenuStyle</item>
+        <item name="colorSurface">@color/inputBackground</item>
+        <item name="shapeAppearanceSmallComponent">@style/inputsMaterialComponentCorner</item>
+    </style>
+    <!-- Pitch black theme -->
+
     <style name="inputsMaterialComponentCorner" parent="ShapeAppearance.MaterialComponents.SmallComponent">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSize">6dp</item>
@@ -274,4 +314,26 @@
     </style>
     <!-- Retro theme styles -->
 
+    <!-- Pitch black theme styles -->
+    <style name="AppThemePitchBlackConfirmDialog" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="android:background">@color/pitchBlackThemeGeneralBackgroundColor</item>
+        <item name="android:textColorPrimary">@color/pitchBlackThemeTextColor</item>
+        <item name="android:textColor">@color/pitchBlackThemeTextColor</item>
+        <item name="colorControlNormal">@color/pitchBlackThemeTextColor</item>
+        <item name="colorControlActivated">@color/darkGreen</item>
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
+        <item name="android:windowBackground">@drawable/shape_round_corners</item>
+    </style>
+
+    <style name="AppThemePitchBlackPopupMenuStyle" parent="Widget.MaterialComponents.PopupMenu">
+        <item name="android:popupBackground">@color/pitchBlackThemeGeneralBackgroundColor</item>
+        <item name="android:itemBackground">@color/pitchBlackThemeGeneralBackgroundColor</item>
+        <item name="android:textColor">@color/pitchBlackThemeTextColor</item>
+        <item name="android:layout_marginStart">3dp</item>
+        <item name="android:layout_marginEnd">3dp</item>
+    </style>
+    <!-- Pitch black theme styles -->
+
 </resources>