diff --git a/app/src/main/res/layout/fragment_administration.xml b/app/src/main/res/layout/fragment_administration.xml
index d74afcaf..d7f651aa 100644
--- a/app/src/main/res/layout/fragment_administration.xml
+++ b/app/src/main/res/layout/fragment_administration.xml
@@ -24,6 +24,7 @@
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp"
+                android:background="?android:attr/selectableItemBackground"
                 app:drawableStartCompat="@drawable/ic_people" />
 
             <View
@@ -43,6 +44,7 @@
                 android:textSize="16sp"
                 android:padding="16dp"
                 android:visibility="gone"
+                android:background="?android:attr/selectableItemBackground"
                 app:drawableStartCompat="@drawable/ic_tasks" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index fab39968..6d527999 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -18,6 +18,18 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <TextView
+                android:id="@+id/repoIsArchived"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:layout_gravity="center"
+                android:text="@string/archivedRepositoryMessage"
+                android:background="@drawable/shape_archived"
+                android:padding="6dp"
+                android:layout_marginBottom="8dp"
+                android:textColor="@color/colorWhite" />
+
             <LinearLayout
                 android:id="@+id/repoMetaFrameHeader"
                 android:layout_width="match_parent"
@@ -46,6 +58,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0.1"
                     android:layout_gravity="center_vertical|end"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/issueDescriptionEmpty"
                     app:srcCompat="@drawable/ic_chevron_down"/>
 
@@ -57,18 +70,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/repoIsArchived"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:layout_gravity="center"
-                    android:text="@string/archivedRepositoryMessage"
-                    android:background="@drawable/shape_archived"
-                    android:padding="5dp"
-                    android:layout_marginBottom="8dp"
-                    android:textColor="@color/colorWhite" />
-
                 <TextView
                     android:id="@+id/repoMetaName"
                     android:layout_width="match_parent"
@@ -369,6 +370,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="0.1"
                     android:layout_gravity="center_vertical|end"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/issueDescriptionEmpty"
                     app:srcCompat="@drawable/ic_chevron_up"/>
 
diff --git a/app/src/main/res/layout/list_issue_comments.xml b/app/src/main/res/layout/list_issue_comments.xml
index 425eaed0..9fa24294 100644
--- a/app/src/main/res/layout/list_issue_comments.xml
+++ b/app/src/main/res/layout/list_issue_comments.xml
@@ -57,7 +57,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="top"
             android:layout_weight="0"
-            android:contentDescription="@string/generalImgContentText"
+            android:contentDescription="@string/menuContentDesc"
+            android:background="?android:attr/selectableItemBackgroundBorderless"
             app:srcCompat="@drawable/ic_dotted_menu_horizontal" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/list_labels.xml b/app/src/main/res/layout/list_labels.xml
index 496e342f..2f4a35a1 100644
--- a/app/src/main/res/layout/list_labels.xml
+++ b/app/src/main/res/layout/list_labels.xml
@@ -58,8 +58,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|end"
         android:contentDescription="@string/labelMenuContentDesc"
-        android:paddingStart="10dp"
-        android:paddingEnd="0dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:src="@drawable/ic_dotted_menu_horizontal" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_milestones.xml b/app/src/main/res/layout/list_milestones.xml
index ec2ff429..a4bb13ec 100644
--- a/app/src/main/res/layout/list_milestones.xml
+++ b/app/src/main/res/layout/list_milestones.xml
@@ -156,11 +156,11 @@
 
             <ImageView
                 android:id="@+id/milestonesMenu"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|bottom"
-                android:layout_weight=".10"
                 android:contentDescription="@string/menuContentDesc"
+                android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:scaleType="fitEnd"
                 android:src="@drawable/ic_dotted_menu_horizontal" />
 
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
index d132589a..d3843167 100644
--- a/app/src/main/res/layout/nav_header.xml
+++ b/app/src/main/res/layout/nav_header.xml
@@ -49,8 +49,8 @@
                     app:cardBackgroundColor="?attr/primaryBackgroundColor"
                     app:cardCornerRadius="20dp"
                     app:cardElevation="0dp"
-                    app:contentPaddingLeft="5dp"
-                    app:contentPaddingRight="5dp"
+                    app:contentPaddingLeft="8dp"
+                    app:contentPaddingRight="8dp"
                     tools:visibility="visible">
 
                     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 16639cc6..d9ce558f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -101,7 +101,6 @@
     <string name="protocolEmptyError">Protocol is required</string>
 
     <string name="checkNetConnection">Cannot access network, please check your Internet connection</string>
-    <string name="netConnectionIsBack">Yay, We have Internet connection!</string>
 
     <string name="repoNameErrorEmpty">Repository name is empty</string>
     <string name="repoNameErrorInvalid">Repository name is not valid. [a&#8211;z A&#8211;Z 0&#8211;9 &#8211; _]</string>
@@ -177,7 +176,7 @@
     <string name="featureDeprecated">This function will be removed in the future</string>
     <string name="screamingInFearEmoticon" translatable="false">😱</string>
 
-    <string name="generalImgContentText">Avatar</string>
+    <string name="generalImgContentText">Image</string>
 
     <string name="noDataMilestonesTab">No milestones found</string>
 
@@ -236,7 +235,7 @@
     <string name="settingsDateTimeHeaderDefault">Pretty</string>
     <string name="settingsLanguageSelectorDialogTitle">Choose Language</string>
     <string name="settingsTimeSelectorDialogTitle">Choose Time Format</string>
-    <string name="settingsHelpTranslateText">Help us translate GitNex to your language</string>
+    <string name="settingsHelpTranslateText">Translate GitNex via Crodwin</string>
     <string name="codeBlockSelectedText" translatable="false">Green - Black</string>
     <string name="codeBlockHeaderText">Code Block Color</string>
     <string name="settingsCodeBlockSelectorDialogTitle">Code Block Color Selector</string>
@@ -249,12 +248,9 @@
     <string name="themeSelectorDialogTitle">Select App Theme</string>
     <string name="themeSelectionHeaderText">Theme</string>
     <string name="themeSelectionSelectedText" translatable="false">Dark</string>
-    <string name="settingsPdfModeHeaderText">PDF Night Mode</string>
-    <string name="fileViewerHeader">File Viewer</string>
     <string name="settingsCounterBadges">Counter Badges</string>
     <string name="settingsFileViewerSourceCodeHeaderText">Source Code Theme</string>
     <string name="settingsFileViewerSourceCodeSelectedText" translatable="false">Sublime</string>
-    <string name="fileViewerSourceCodeThemeSelectorDialogTitle">Select Source Code Theme</string>
     <string name="cacheSizeDataDialogHeader">Data Cache Size</string>
     <string name="cacheSizeDataSelectionHeaderText">Data Cache Size</string>
     <string name="cacheSizeDataSelectionSelectedText" translatable="false">50 MB</string>
@@ -480,7 +476,7 @@
 
     <string name="copyIssueUrl">Copy Issue URL</string>
     <string name="copyIssueUrlToastMsg">URL copied to clipboard</string>
-    <string name="copyIssueCommentToastMsg">Copied comment to clipboard</string>
+    <string name="copyIssueCommentToastMsg">Comment copied to clipboard</string>
 
     <string name="milestoneCompletion">%1$d\uFF05 completed</string>
 
@@ -638,7 +634,6 @@
     <string name="draftSaved">Draft was saved automatically.</string>
 
     <string name="appearanceHintText">Themes, fonts, badges</string>
-    <string name="fileViewerHintText">PDF mode, source code theme</string>
     <string name="securityHintText">Biometric authentication, SSL certificates, cache</string>
     <string name="languagesHintText">Languages</string>
     <string name="reportsHintText">Crash reports</string>
@@ -730,12 +725,6 @@
     <string name="launchApp">Go to App</string>
     <string name="noActionText">GitNex cannot handle the requested resource, you can open an issue at the project repository as an improvement with providing details of the work. Just launch a default screen for now from the buttons below, it can be changed from settings.</string>
 
-    <string name="codeBlockGreenOnBlack">Green on Black</string>
-    <string name="codeBlockWhiteOnBlack">White on Black</string>
-    <string name="codeBlockGreyOnBlack">Grey on Black</string>
-    <string name="codeBlockWhiteOnGrey">White on Grey</string>
-    <string name="codeBlockDarkOnWhite">Dark on White</string>
-
     <string name="biometricAuthTitle">Biometric Authentication</string>
     <string name="biometricAuthSubTitle">Unlock using your biometric credentials</string>
     <string name="biometricNotSupported">No biometric features available on this device</string>