diff --git a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
index 86a82da8..18a12ffc 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/BottomSheetSingleIssueFragment.java
@@ -273,7 +273,6 @@ public class BottomSheetSingleIssueFragment extends BottomSheetDialogFragment {
 			binding.closeIssue.setVisibility(View.GONE);
 			binding.addRemoveAssignees.setVisibility(View.GONE);
 			binding.commentReactionButtons.setVisibility(View.GONE);
-			binding.reactionDivider.setVisibility(View.GONE);
 			binding.bottomSheetHeaderFrame.setVisibility(View.GONE);
 			binding.mergePullRequest.setVisibility(View.GONE);
 			binding.updatePullRequest.setVisibility(View.GONE);
diff --git a/app/src/main/res/drawable/shape_badge_background.xml b/app/src/main/res/drawable/shape_badge_background.xml
index 92a33527..cb4472f5 100644
--- a/app/src/main/res/drawable/shape_badge_background.xml
+++ b/app/src/main/res/drawable/shape_badge_background.xml
@@ -4,7 +4,7 @@
 
     <corners android:radius="8dp"/>
     <solid
-        android:color="?attr/iconsColor"/>
+        android:color="?attr/primaryTextColor"/>
     <padding
         android:bottom="2dp"
         android:left="5dp"
diff --git a/app/src/main/res/layout/activity_add_new_account.xml b/app/src/main/res/layout/activity_add_new_account.xml
index 3acbf855..a0445e35 100644
--- a/app/src/main/res/layout/activity_add_new_account.xml
+++ b/app/src/main/res/layout/activity_add_new_account.xml
@@ -145,7 +145,7 @@
             android:layout_height="@dimen/dimen54dp"
             android:layout_marginTop="@dimen/dimen8dp"
             android:text="@string/addNewAccountText"
-            android:textColor="@color/btnTextColor"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="@dimen/dimen16sp"
             android:textStyle="bold"/>
 
diff --git a/app/src/main/res/layout/activity_create_file.xml b/app/src/main/res/layout/activity_create_file.xml
index 36fd0f05..b30007a6 100644
--- a/app/src/main/res/layout/activity_create_file.xml
+++ b/app/src/main/res/layout/activity_create_file.xml
@@ -192,7 +192,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newFileButtonCopy"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_issue.xml b/app/src/main/res/layout/activity_create_issue.xml
index dd78459b..91f5a262 100644
--- a/app/src/main/res/layout/activity_create_issue.xml
+++ b/app/src/main/res/layout/activity_create_issue.xml
@@ -240,7 +240,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_label.xml b/app/src/main/res/layout/activity_create_label.xml
index a92fd183..4effd19e 100644
--- a/app/src/main/res/layout/activity_create_label.xml
+++ b/app/src/main/res/layout/activity_create_label.xml
@@ -117,7 +117,7 @@
             android:layout_height="@dimen/dimen54dp"
             android:layout_marginTop="@dimen/dimen8dp"
             android:text="@string/newCreateButtonCopy"
-            android:textColor="@color/btnTextColor"
+            android:textColor="?attr/primaryTextColor"
             android:textStyle="bold"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_milestone.xml b/app/src/main/res/layout/activity_create_milestone.xml
index 80b48fa1..47f72dd0 100644
--- a/app/src/main/res/layout/activity_create_milestone.xml
+++ b/app/src/main/res/layout/activity_create_milestone.xml
@@ -161,7 +161,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_new_user.xml b/app/src/main/res/layout/activity_create_new_user.xml
index fdd5f426..aab7578c 100644
--- a/app/src/main/res/layout/activity_create_new_user.xml
+++ b/app/src/main/res/layout/activity_create_new_user.xml
@@ -171,7 +171,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_organization.xml b/app/src/main/res/layout/activity_create_organization.xml
index 94697ead..e57923d2 100644
--- a/app/src/main/res/layout/activity_create_organization.xml
+++ b/app/src/main/res/layout/activity_create_organization.xml
@@ -122,7 +122,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_pr.xml b/app/src/main/res/layout/activity_create_pr.xml
index 98cb4293..a15366e7 100644
--- a/app/src/main/res/layout/activity_create_pr.xml
+++ b/app/src/main/res/layout/activity_create_pr.xml
@@ -265,7 +265,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_release.xml b/app/src/main/res/layout/activity_create_release.xml
index fd0f6477..345af695 100644
--- a/app/src/main/res/layout/activity_create_release.xml
+++ b/app/src/main/res/layout/activity_create_release.xml
@@ -203,7 +203,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
             <com.google.android.material.button.MaterialButton
@@ -212,7 +212,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/create_tag"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_repo.xml b/app/src/main/res/layout/activity_create_repo.xml
index 71d118de..be9350ed 100644
--- a/app/src/main/res/layout/activity_create_repo.xml
+++ b/app/src/main/res/layout/activity_create_repo.xml
@@ -153,7 +153,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_create_team_by_org.xml b/app/src/main/res/layout/activity_create_team_by_org.xml
index 0c8dccb4..7ac4bc78 100644
--- a/app/src/main/res/layout/activity_create_team_by_org.xml
+++ b/app/src/main/res/layout/activity_create_team_by_org.xml
@@ -186,7 +186,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/newCreateButtonCopy"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_edit_issue.xml b/app/src/main/res/layout/activity_edit_issue.xml
index eff136ed..115f9640 100644
--- a/app/src/main/res/layout/activity_edit_issue.xml
+++ b/app/src/main/res/layout/activity_edit_issue.xml
@@ -182,7 +182,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/saveButton"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index d2b3a8ad..c2edba36 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -235,7 +235,7 @@
             android:layout_height="@dimen/dimen54dp"
             android:layout_marginTop="@dimen/dimen8dp"
             android:text="@string/btnLogin"
-            android:textColor="@color/btnTextColor"
+            android:textColor="?attr/primaryTextColor"
             android:textStyle="bold"/>
 
         <TextView
diff --git a/app/src/main/res/layout/activity_merge_pull_request.xml b/app/src/main/res/layout/activity_merge_pull_request.xml
index 1cea34be..f16d2c38 100644
--- a/app/src/main/res/layout/activity_merge_pull_request.xml
+++ b/app/src/main/res/layout/activity_merge_pull_request.xml
@@ -187,7 +187,7 @@
                 android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:text="@string/mergePullRequestButtonText"
-                android:textColor="@color/btnTextColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textStyle="bold"/>
 
             <TextView
diff --git a/app/src/main/res/layout/bottom_sheet_drafts.xml b/app/src/main/res/layout/bottom_sheet_drafts.xml
index 33d9fc49..1080aa55 100644
--- a/app/src/main/res/layout/bottom_sheet_drafts.xml
+++ b/app/src/main/res/layout/bottom_sheet_drafts.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/draftsHeader"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/draftsSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,14 +65,14 @@
 
                 <TextView
                     android:id="@+id/deleteAllDrafts"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_delete"
                     app:layout_alignSelf="flex_start"/>
 
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 778a8eb8..3543438e 100644
--- a/app/src/main/res/layout/bottom_sheet_file_viewer.xml
+++ b/app/src/main/res/layout/bottom_sheet_file_viewer.xml
@@ -5,8 +5,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -22,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -31,7 +31,24 @@
                     android:gravity="center"
                     android:text="@string/file"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="@dimen/dimen16sp" />
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -39,7 +56,7 @@
                 android:id="@+id/filesSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -47,97 +64,79 @@
 
                 <TextView
                     android:id="@+id/editFile"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_edit"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/deleteFile"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_delete"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/downloadFile"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/download"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_download"
                     app:layout_alignSelf="flex_start" />
 
-            </com.google.android.flexbox.FlexboxLayout>
-
-            <View
-                android:id="@+id/file_viewer_divider"
-                android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_marginBottom="16dp"
-                android:background="?attr/dividerColor" />
-
-            <com.google.android.flexbox.FlexboxLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:padding="4dp"
-                app:alignContent="center"
-                app:alignItems="flex_start"
-                app:flexWrap="wrap"
-                app:justifyContent="center">
-
                 <TextView
                     android:id="@+id/copy_url"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="8dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/genericCopyUrl"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_copy"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/share"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="8dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/share"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_share"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/open"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="8dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/openInBrowser"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_browser"
                     app:layout_alignSelf="flex_start" />
 
diff --git a/app/src/main/res/layout/bottom_sheet_issue_comments.xml b/app/src/main/res/layout/bottom_sheet_issue_comments.xml
index 5b169301..446336f7 100644
--- a/app/src/main/res/layout/bottom_sheet_issue_comments.xml
+++ b/app/src/main/res/layout/bottom_sheet_issue_comments.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -22,23 +22,15 @@
                 android:id="@+id/commentReactionButtons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
+                android:layout_marginBottom="@dimen/dimen8dp"
                 android:orientation="horizontal"/>
 
-            <View
-                android:id="@+id/reactionDivider"
-                android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="16dp"
-                android:background="?attr/dividerColor"/>
-
             <LinearLayout
                 android:id="@+id/issueComments"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -47,7 +39,24 @@
                     android:gravity="center"
                     android:text="@string/commentButtonText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -55,7 +64,7 @@
                 android:id="@+id/issueCommentsSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -63,53 +72,53 @@
 
                 <TextView
                     android:id="@+id/commentMenuEdit"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_edit"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/commentMenuDelete"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_delete"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/commentMenuQuote"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuQuoteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_comment"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/commentMenuCopy"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuCopyText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_copy"
                     app:layout_alignSelf="flex_start"/>
 
@@ -118,15 +127,15 @@
             <View
                 android:id="@+id/commentDivider"
                 android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_marginBottom="16dp"
+                android:layout_height="@dimen/dimen4dp"
+                android:layout_marginBottom="@dimen/dimen16dp"
                 android:background="?attr/dividerColor"/>
 
             <com.google.android.flexbox.FlexboxLayout
                 android:id="@+id/issueOtherSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -134,40 +143,40 @@
 
                 <TextView
                     android:id="@+id/issueCommentCopyUrl"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/genericCopyUrl"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_link"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/issueCommentShare"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/share"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_share"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/open"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/openInBrowser"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_browser"
                     app:layout_alignSelf="flex_start"/>
 
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 32af5fc2..2d4bd6fd 100644
--- a/app/src/main/res/layout/bottom_sheet_issues_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_issues_filter.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/issuesFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,40 +65,40 @@
 
                 <TextView
                     android:id="@+id/filterByMilestone"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/newIssueMilestoneTitle"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_milestone"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/openIssues"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_issue"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/closedIssues"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isClosed"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_issue_closed"
                     app:layout_alignSelf="flex_start"/>
 
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 685263dd..27e9715f 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
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/labelName"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp" />
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/labelsListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,29 +65,29 @@
 
                 <TextView
                     android:id="@+id/labelMenuEdit"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_edit"
-                    app:layout_alignSelf="flex_start"/>
+                    app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/labelMenuDelete"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_delete"
-                    app:layout_alignSelf="flex_start"/>
+                    app:layout_alignSelf="flex_start" />
 
             </com.google.android.flexbox.FlexboxLayout>
 
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 644ecc10..19faf1b7 100644
--- a/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_milestones_filter.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/milestonesFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,27 +65,27 @@
 
                 <TextView
                     android:id="@+id/openMilestone"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_milestone"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/closedMilestone"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isClosed"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_done"
                     app:layout_alignSelf="flex_start"/>
 
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 299f4e69..9bb94706 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
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/newIssueMilestoneTitle"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/milestonesListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,27 +65,27 @@
 
                 <TextView
                     android:id="@+id/closeMilestone"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/close"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_close"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/openMilestone"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_check"
                     app:layout_alignSelf="flex_start"/>
 
diff --git a/app/src/main/res/layout/bottom_sheet_my_issues_filter.xml b/app/src/main/res/layout/bottom_sheet_my_issues_filter.xml
index d94f31f7..ec761e22 100644
--- a/app/src/main/res/layout/bottom_sheet_my_issues_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_my_issues_filter.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/myIssuesSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,40 +65,40 @@
 
                 <TextView
                     android:id="@+id/openMyIssues"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_issue"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/closedMyIssues"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isClosed"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_issue_closed"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/assignedToMe"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/assignedToMe"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_person"
                     app:layout_alignSelf="flex_start"/>
 
diff --git a/app/src/main/res/layout/bottom_sheet_notifications.xml b/app/src/main/res/layout/bottom_sheet_notifications.xml
index 355f8996..a6ced5b3 100644
--- a/app/src/main/res/layout/bottom_sheet_notifications.xml
+++ b/app/src/main/res/layout/bottom_sheet_notifications.xml
@@ -5,8 +5,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -22,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -31,7 +31,24 @@
                     android:gravity="center"
                     android:text="@string/pageTitleNotifications"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -39,7 +56,7 @@
                 android:id="@+id/notificationsListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -47,40 +64,40 @@
 
                 <TextView
                     android:id="@+id/markPinned"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/pinNotification"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_pin"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/markRead"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/markAsRead"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_unwatch"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/markUnread"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/markAsUnread"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_watchers"
                     app:layout_alignSelf="flex_start"/>
 
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 3e88e6b3..bf99b11c 100644
--- a/app/src/main/res/layout/bottom_sheet_notifications_filter.xml
+++ b/app/src/main/res/layout/bottom_sheet_notifications_filter.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/notificationsFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,27 +65,27 @@
 
                 <TextView
                     android:id="@+id/unreadNotifications"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isUnread"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_watchers"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/readNotifications"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isRead"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_unwatch"
                     app:layout_alignSelf="flex_start"/>
 
diff --git a/app/src/main/res/layout/bottom_sheet_organization.xml b/app/src/main/res/layout/bottom_sheet_organization.xml
index a5e890dc..25bd1b5a 100644
--- a/app/src/main/res/layout/bottom_sheet_organization.xml
+++ b/app/src/main/res/layout/bottom_sheet_organization.xml
@@ -36,7 +36,7 @@
 
                 <com.google.android.material.card.MaterialCardView
                     style="?attr/materialCardViewFilledStyle"
-                    android:layout_width="@dimen/dimen48dp"
+                    android:layout_width="@dimen/dimen28dp"
                     android:layout_height="@dimen/dimen4dp"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="@dimen/dimen8dp"
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 cba40cca..25f848a0 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
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/prFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,27 +65,27 @@
 
                 <TextView
                     android:id="@+id/openPr"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isOpen"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_pull_request"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/closedPr"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/isClosed"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_issue_closed"
                     app:layout_alignSelf="flex_start"/>
 
diff --git a/app/src/main/res/layout/bottom_sheet_release_in_list.xml b/app/src/main/res/layout/bottom_sheet_release_in_list.xml
index e187fef2..9e4659fd 100644
--- a/app/src/main/res/layout/bottom_sheet_release_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_release_in_list.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/release"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/releasesListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,14 +65,14 @@
 
                 <TextView
                     android:id="@+id/deleteRelease"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_delete"
                     app:layout_alignSelf="flex_start"/>
 
diff --git a/app/src/main/res/layout/bottom_sheet_releases_tags.xml b/app/src/main/res/layout/bottom_sheet_releases_tags.xml
index 9220f4ae..e4fdde47 100644
--- a/app/src/main/res/layout/bottom_sheet_releases_tags.xml
+++ b/app/src/main/res/layout/bottom_sheet_releases_tags.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/strFilter"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/releasesTagsFilterSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,27 +65,27 @@
 
                 <TextView
                     android:id="@+id/releases"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/tabTextReleases"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_release"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/tags"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/tags"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_tag"
                     app:layout_alignSelf="flex_start"/>
 
diff --git a/app/src/main/res/layout/bottom_sheet_repo.xml b/app/src/main/res/layout/bottom_sheet_repo.xml
index e8368dc7..f1367d7b 100644
--- a/app/src/main/res/layout/bottom_sheet_repo.xml
+++ b/app/src/main/res/layout/bottom_sheet_repo.xml
@@ -177,7 +177,7 @@
 
                 <com.google.android.material.card.MaterialCardView
                     style="?attr/materialCardViewFilledStyle"
-                    android:layout_width="@dimen/dimen48dp"
+                    android:layout_width="@dimen/dimen28dp"
                     android:layout_height="@dimen/dimen4dp"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="@dimen/dimen8dp"
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 a9280e45..18fc7410 100644
--- a/app/src/main/res/layout/bottom_sheet_single_issue.xml
+++ b/app/src/main/res/layout/bottom_sheet_single_issue.xml
@@ -5,8 +5,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -21,23 +21,15 @@
                 android:id="@+id/commentReactionButtons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp"
+                android:layout_marginBottom="@dimen/dimen8dp"
                 android:orientation="horizontal" />
 
-            <View
-                android:id="@+id/reactionDivider"
-                android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="16dp"
-                android:background="?attr/dividerColor" />
-
             <LinearLayout
                 android:id="@+id/bottomSheetHeaderFrame"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -46,7 +38,24 @@
                     android:gravity="center"
                     android:text="@string/issue"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp" />
+                    android:textSize="@dimen/dimen16sp" />
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -54,7 +63,7 @@
                 android:id="@+id/issuePrtSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -62,135 +71,135 @@
 
                 <TextView
                     android:id="@+id/openFilesDiff"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/tabTextFiles"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     android:visibility="gone"
                     app:drawableTopCompat="@drawable/ic_file"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/mergePullRequest"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/mergePullRequestButtonText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     android:visibility="gone"
                     app:drawableTopCompat="@drawable/ic_pull_request"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/updatePullRequest"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/newUpdateButtonCopy"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     android:visibility="gone"
                     app:drawableTopCompat="@drawable/ic_refresh"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/deletePrHeadBranch"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/deleteBranch"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_branch"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/editIssue"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_edit"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/addRemoveAssignees"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/newIssueAssigneesListTitle"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_person_add"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/editLabels"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/newIssueLabelsTitle"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_tag"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/subscribeIssue"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/singleIssueSubscribe"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_unwatch"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/unsubscribeIssue"
-                    android:layout_width="104dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/singleIssueUnSubscribe"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     android:visibility="gone"
                     app:drawableTopCompat="@drawable/ic_watchers"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/closeIssue"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/close"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_issue_closed"
                     app:layout_alignSelf="flex_start" />
 
@@ -199,15 +208,15 @@
             <View
                 android:id="@+id/issuePrDivider"
                 android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_marginBottom="16dp"
+                android:layout_height="@dimen/dimen4dp"
+                android:layout_marginBottom="@dimen/dimen16dp"
                 android:background="?attr/dividerColor" />
 
             <com.google.android.flexbox.FlexboxLayout
                 android:id="@+id/issuePrShareSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -215,40 +224,40 @@
 
                 <TextView
                     android:id="@+id/copyIssueUrl"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/genericCopyUrl"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_copy"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/shareIssue"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/share"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_share"
                     app:layout_alignSelf="flex_start" />
 
                 <TextView
                     android:id="@+id/open"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/openInBrowser"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_browser"
                     app:layout_alignSelf="flex_start" />
 
diff --git a/app/src/main/res/layout/bottom_sheet_tag_in_list.xml b/app/src/main/res/layout/bottom_sheet_tag_in_list.xml
index a7990b67..404214a9 100644
--- a/app/src/main/res/layout/bottom_sheet_tag_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_tag_in_list.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/tags"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/tagsListSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,14 +65,14 @@
 
                 <TextView
                     android:id="@+id/tagMenuDelete"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_delete"
                     app:layout_alignSelf="flex_start"/>
 
diff --git a/app/src/main/res/layout/bottom_sheet_user_profile.xml b/app/src/main/res/layout/bottom_sheet_user_profile.xml
index 4595c861..38fbb8ef 100644
--- a/app/src/main/res/layout/bottom_sheet_user_profile.xml
+++ b/app/src/main/res/layout/bottom_sheet_user_profile.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottomSheetHeader"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/pageTitleUsers"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/usersProfileSection"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,27 +65,27 @@
 
                 <TextView
                     android:id="@+id/followUser"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/userFollow"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_person_add"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/unfollowUser"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/unfollowUser"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     android:visibility="gone"
                     app:drawableTopCompat="@drawable/ic_person_remove"
                     app:layout_alignSelf="flex_start"/>
diff --git a/app/src/main/res/layout/bottom_sheet_wiki_in_list.xml b/app/src/main/res/layout/bottom_sheet_wiki_in_list.xml
index d5b2f2fd..f74d5c6b 100644
--- a/app/src/main/res/layout/bottom_sheet_wiki_in_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_wiki_in_list.xml
@@ -6,8 +6,8 @@
     android:layout_height="wrap_content"
     android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="6dp"
-    android:paddingBottom="12dp">
+    android:paddingTop="@dimen/dimen6dp"
+    android:paddingBottom="@dimen/dimen12dp">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -23,7 +23,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="8dp">
+                android:padding="@dimen/dimen8dp">
 
                 <TextView
                     android:id="@+id/bottom_sheet_header"
@@ -32,7 +32,24 @@
                     android:gravity="center"
                     android:text="@string/wiki"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"/>
+                    android:textSize="@dimen/dimen16sp"/>
+
+                <com.google.android.material.card.MaterialCardView
+                    style="?attr/materialCardViewFilledStyle"
+                    android:layout_width="@dimen/dimen28dp"
+                    android:layout_height="@dimen/dimen4dp"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dimen8dp"
+                    android:layout_marginBottom="@dimen/dimen16dp"
+                    app:cardCornerRadius="@dimen/dimen24dp"
+                    app:cardElevation="@dimen/dimen0dp">
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="?attr/dividerColor" />
+
+                </com.google.android.material.card.MaterialCardView>
 
             </LinearLayout>
 
@@ -40,7 +57,7 @@
                 android:id="@+id/wiki_list_section"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="4dp"
+                android:padding="@dimen/dimen4dp"
                 app:alignContent="center"
                 app:alignItems="flex_start"
                 app:flexWrap="wrap"
@@ -48,27 +65,27 @@
 
                 <TextView
                     android:id="@+id/edit_wiki"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuEditText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_edit"
                     app:layout_alignSelf="flex_start"/>
 
                 <TextView
                     android:id="@+id/delete_wiki"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="@dimen/dimen132dp"
+                    android:layout_height="@dimen/dimen100dp"
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:gravity="center"
-                    android:padding="4dp"
+                    android:padding="@dimen/dimen4dp"
                     android:text="@string/menuDeleteText"
                     android:textColor="?attr/primaryTextColor"
-                    android:textSize="16sp"
+                    android:textSize="@dimen/dimen14sp"
                     app:drawableTopCompat="@drawable/ic_delete"
                     app:layout_alignSelf="flex_start"/>
 
diff --git a/app/src/main/res/layout/fragment_files.xml b/app/src/main/res/layout/fragment_files.xml
index 63b60c8a..4cc569a9 100644
--- a/app/src/main/res/layout/fragment_files.xml
+++ b/app/src/main/res/layout/fragment_files.xml
@@ -95,9 +95,9 @@
         android:layout_margin="@dimen/dimen16dp"
         android:text="@string/pageTitleNewFile"
         android:contentDescription="@string/pageTitleNewFile"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_issues.xml b/app/src/main/res/layout/fragment_issues.xml
index f4272828..08fe2f9e 100644
--- a/app/src/main/res/layout/fragment_issues.xml
+++ b/app/src/main/res/layout/fragment_issues.xml
@@ -56,9 +56,9 @@
         android:layout_margin="@dimen/dimen16dp"
         android:text="@string/pageTitleCreateNewIssue"
         android:contentDescription="@string/pageTitleCreateNewIssue"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_labels.xml b/app/src/main/res/layout/fragment_labels.xml
index bc6054fc..801d0b40 100644
--- a/app/src/main/res/layout/fragment_labels.xml
+++ b/app/src/main/res/layout/fragment_labels.xml
@@ -56,9 +56,9 @@
         android:layout_margin="@dimen/dimen16dp"
         android:text="@string/createLabel"
         android:contentDescription="@string/createLabel"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_notes.xml b/app/src/main/res/layout/fragment_notes.xml
index 08a627e1..c1efd55c 100644
--- a/app/src/main/res/layout/fragment_notes.xml
+++ b/app/src/main/res/layout/fragment_notes.xml
@@ -54,9 +54,9 @@
         android:layout_margin="@dimen/dimen16dp"
         android:text="@string/newNote"
         android:contentDescription="@string/newNote"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
index d2a11a1c..94550ece 100644
--- a/app/src/main/res/layout/fragment_notifications.xml
+++ b/app/src/main/res/layout/fragment_notifications.xml
@@ -55,10 +55,10 @@
         android:layout_margin="16dp"
         android:text="@string/markAsRead"
         android:contentDescription="@string/markAsRead"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_done" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_organization_team_info_members.xml b/app/src/main/res/layout/fragment_organization_team_info_members.xml
index aa7b2f97..b82d8546 100644
--- a/app/src/main/res/layout/fragment_organization_team_info_members.xml
+++ b/app/src/main/res/layout/fragment_organization_team_info_members.xml
@@ -52,9 +52,9 @@
         android:layout_margin="@dimen/dimen16dp"
         android:text="@string/addRemoveMember"
         android:contentDescription="@string/addRemoveMember"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_organization_teams.xml b/app/src/main/res/layout/fragment_organization_teams.xml
index 52b802b3..813a8e16 100644
--- a/app/src/main/res/layout/fragment_organization_teams.xml
+++ b/app/src/main/res/layout/fragment_organization_teams.xml
@@ -56,9 +56,9 @@
         android:layout_margin="@dimen/dimen16dp"
         android:text="@string/pageTitleCreateTeam"
         android:contentDescription="@string/pageTitleCreateTeam"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_organizations.xml b/app/src/main/res/layout/fragment_organizations.xml
index 69b5886c..27cdfb7f 100644
--- a/app/src/main/res/layout/fragment_organizations.xml
+++ b/app/src/main/res/layout/fragment_organizations.xml
@@ -52,9 +52,9 @@
         android:layout_margin="16dp"
         android:text="@string/pageTitleCreateOrganization"
         android:contentDescription="@string/pageTitleCreateOrganization"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_profile_emails.xml b/app/src/main/res/layout/fragment_profile_emails.xml
index 9b83adce..53d30e29 100644
--- a/app/src/main/res/layout/fragment_profile_emails.xml
+++ b/app/src/main/res/layout/fragment_profile_emails.xml
@@ -52,9 +52,9 @@
         android:layout_margin="@dimen/dimen16dp"
         android:text="@string/pageTitleAddEmail"
         android:contentDescription="@string/pageTitleAddEmail"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index 87afc486..9c50c879 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -413,7 +413,7 @@
                             android:layout_marginTop="@dimen/dimen6dp"
                             android:layout_marginBottom="@dimen/dimen20dp"
                             android:text="@string/infoShowMoreInformation"
-                            android:textColor="@color/btnTextColor"/>
+                            android:textColor="?attr/primaryTextColor"/>
 
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_repositories.xml b/app/src/main/res/layout/fragment_repositories.xml
index 0a0692b9..bc57b06b 100644
--- a/app/src/main/res/layout/fragment_repositories.xml
+++ b/app/src/main/res/layout/fragment_repositories.xml
@@ -56,9 +56,9 @@
         android:layout_margin="@dimen/dimen16dp"
         android:text="@string/pageTitleNewRepo"
         android:contentDescription="@string/pageTitleNewRepo"
-        android:textColor="?attr/primaryBackgroundColor"
+        android:textColor="?attr/primaryTextColor"
         android:backgroundTint="?attr/fabColor"
-        app:iconTint="?attr/primaryBackgroundColor"
+        app:iconTint="?attr/primaryTextColor"
         app:icon="@drawable/ic_add" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>