diff --git a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
index 208cde8c..1940fb73 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddNewAccountActivity.java
@@ -7,7 +7,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import org.gitnex.tea4j.v2.models.GeneralAPISettings;
 import org.gitnex.tea4j.v2.models.ServerVersion;
 import org.gitnex.tea4j.v2.models.User;
@@ -152,22 +152,17 @@ public class AddNewAccountActivity extends BaseActivity {
 
 					if(giteaVersion.less(getString(R.string.versionLow))) {
 
-						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning)
-							.setCancelable(true);
+						MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
+							.setTitle(getString(R.string.versionAlertDialogHeader))
+							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
+							.setNeutralButton(getString(R.string.cancelButton), null)
+							.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
 
-						alertDialogBuilder.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
+								dialog.dismiss();
+								login(instanceUrl, loginToken);
+							});
 
-							dialog.dismiss();
-						});
-
-						alertDialogBuilder.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
-
-							dialog.dismiss();
-							login(instanceUrl, loginToken);
-						});
-
-						alertDialogBuilder.create().show();
+						materialAlertDialogBuilder.create().show();
 					}
 					else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
index 7ed4fbb5..cc9d499c 100644
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
@@ -9,7 +9,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.RadioGroup;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import org.gitnex.tea4j.v2.models.AccessToken;
 import org.gitnex.tea4j.v2.models.CreateAccessTokenOption;
 import org.gitnex.tea4j.v2.models.GeneralAPISettings;
@@ -277,24 +277,21 @@ public class LoginActivity extends BaseActivity {
 
 					if(giteaVersion.less(getString(R.string.versionLow))) {
 
-						AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx).setTitle(getString(R.string.versionAlertDialogHeader))
-							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setIcon(R.drawable.ic_warning)
-							.setCancelable(true);
+						MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
+							.setTitle(getString(R.string.versionAlertDialogHeader))
+							.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
+							.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
 
-						alertDialogBuilder.setNeutralButton(getString(R.string.cancelButton), (dialog, which) -> {
+								dialog.dismiss();
+								enableProcessButton();
+							})
+							.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
 
-							dialog.dismiss();
-							enableProcessButton();
-						});
-
-						alertDialogBuilder.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
-
-							dialog.dismiss();
-							login(loginType, loginUid, loginPass, loginOTP, loginToken);
-						});
-
-						alertDialogBuilder.create().show();
+								dialog.dismiss();
+								login(loginType, loginUid, loginPass, loginOTP, loginToken);
+							});
 
+						materialAlertDialogBuilder.create().show();
 					}
 					else if(giteaVersion.lessOrEqual(getString(R.string.versionHigh))) {
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index f9930a85..bbda8be3 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -12,7 +12,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
@@ -21,6 +20,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.navigation.NavigationView;
 import org.gitnex.tea4j.v2.models.GeneralAPISettings;
 import org.gitnex.tea4j.v2.models.NotificationCount;
@@ -406,6 +406,11 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MyIssuesFragment()).commit();
 					navigationView.setCheckedItem(R.id.nav_my_issues);
 					break;
+				case 9:
+					toolbarTitle.setText(getResources().getString(R.string.navMostVisited));
+					getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container, new MostVisitedReposFragment()).commit();
+					navigationView.setCheckedItem(R.id.nav_most_visited);
+					break;
 
 				default:
 					toolbarTitle.setText(getResources().getString(R.string.navMyRepos));
@@ -475,9 +480,8 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
 					if(frag != null) {
 
-						new AlertDialog.Builder(ctx)
+						new MaterialAlertDialogBuilder(ctx)
 							.setTitle(R.string.deleteAllDrafts)
-							.setIcon(R.drawable.ic_delete)
 							.setCancelable(false)
 							.setMessage(R.string.deleteAllDraftsDialogMessage)
 							.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
diff --git a/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java b/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
index 496dba49..1e162652 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SettingsGeneralActivity.java
@@ -93,6 +93,10 @@ public class SettingsGeneralActivity extends BaseActivity {
 
 			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navMyIssues));
 		}
+		else if(homeScreenSelectedChoice == 9) {
+
+			viewBinding.homeScreenSelected.setText(getResources().getString(R.string.navMostVisited));
+		}
 
 		viewBinding.homeScreenFrame.setOnClickListener(setDefaultHomeScreen -> {
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java b/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java
index 36ebf8ac..4352ba4a 100644
--- a/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/WikiActivity.java
@@ -8,7 +8,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.vdurmont.emoji.EmojiParser;
 import org.gitnex.tea4j.v2.models.CreateWikiPageOptions;
 import org.gitnex.tea4j.v2.models.WikiPage;
@@ -269,10 +269,10 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 
 	private void deleteWiki(final String owner, final String repo, final String pageName) {
 
-		new AlertDialog.Builder(ctx)
+		MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(ctx)
 			.setTitle(String.format(ctx.getString(R.string.deleteGenericTitle), pageName))
 			.setMessage(ctx.getString(R.string.deleteWikiPageMessage, pageName))
-			.setIcon(R.drawable.ic_delete)
+			.setNeutralButton(R.string.cancelButton, null)
 			.setPositiveButton(R.string.menuDeleteText, (dialog, whichButton) -> RetrofitClient
 				.getApiInterface(ctx).repoDeleteWikiPage(owner, repo, pageName).enqueue(new Callback<>() {
 
@@ -297,8 +297,9 @@ public class WikiActivity extends BaseActivity implements BottomSheetListener {
 
 						Toasty.error(ctx, ctx.getString(R.string.genericError));
 					}
-				}))
-			.setNeutralButton(R.string.cancelButton, null).show();
+				}));
+
+		materialAlertDialogBuilder.create().show();
 	}
 
 	@Override
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java
index 388de758..07ea45a0 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileEmailsFragment.java
@@ -11,7 +11,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
@@ -48,11 +47,8 @@ public class MyProfileEmailsFragment extends Fragment {
         noDataEmails = fragmentProfileEmailsBinding.noDataEmails;
         mRecyclerView = fragmentProfileEmailsBinding.recyclerView;
 
-	    DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(mRecyclerView.getContext(), DividerItemDecoration.VERTICAL);
-
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        mRecyclerView.addItemDecoration(dividerItemDecoration);
 
         mProgressBar = fragmentProfileEmailsBinding.progressBar;
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java
index 0f5a8a8a..6fe9f7af 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowersFragment.java
@@ -10,7 +10,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
@@ -64,9 +63,7 @@ public class MyProfileFollowersFragment extends Fragment {
 		    }
 	    }));
 
-	    DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, DividerItemDecoration.VERTICAL);
 	    viewBinding.recyclerView.setHasFixedSize(true);
-	    viewBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 	    viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
 	    viewBinding.recyclerView.setAdapter(adapter);
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java
index ca7a3383..4a160af2 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFollowingFragment.java
@@ -10,7 +10,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import org.gitnex.tea4j.v2.models.User;
 import org.mian.gitnex.R;
@@ -63,9 +62,7 @@ public class MyProfileFollowingFragment extends Fragment {
 			}
 		}));
 
-		DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(context, DividerItemDecoration.VERTICAL);
 		viewBinding.recyclerView.setHasFixedSize(true);
-		viewBinding.recyclerView.addItemDecoration(dividerItemDecoration);
 		viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(context));
 		viewBinding.recyclerView.setAdapter(adapter);
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java
index 642f6d9c..5ff6811f 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/MyProfileFragment.java
@@ -156,7 +156,7 @@ public class MyProfileFragment extends Fragment {
 	    userFullName.setText(Html.fromHtml(account.getFullName()));
 	    userLogin.setText(getString(R.string.usernameWithAt, account.getAccount().getUserName()));
 
-	    int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 3);
+	    int avatarRadius = AppUtil.getPixelsFromDensity(ctx, 60);
 
 	    PicassoService.getInstance(ctx).get().load(account.getUserInfo().getAvatarUrl()).transform(new RoundedTransformation(avatarRadius, 0)).placeholder(R.drawable.loader_animated).resize(120, 120).centerCrop().into(userAvatar);
 
diff --git a/app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java b/app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java
index ff8c3ce4..ebecff2d 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/ChangeLog.java
@@ -5,8 +5,8 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 import android.util.Log;
-import androidx.appcompat.app.AlertDialog;
 import androidx.core.text.HtmlCompat;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import org.mian.gitnex.R;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -90,15 +90,13 @@ public class ChangeLog {
 
 		String changelogMessage = getChangelog(resId, res);
 
-		AlertDialog.Builder builder = new AlertDialog.Builder(changelogActivity);
-
-		builder.setTitle(R.string.changelogTitle);
-		builder.setMessage(HtmlCompat.fromHtml("<small>" + changelogMessage + "</small>", HtmlCompat.FROM_HTML_MODE_LEGACY));
-		builder.setNeutralButton(R.string.close, null);
-		builder.setCancelable(false);
-
-		builder.create().show();
+		MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(changelogActivity)
+			.setTitle(R.string.changelogTitle)
+			.setMessage(HtmlCompat.fromHtml("<small>" + changelogMessage + "</small>", HtmlCompat.FROM_HTML_MODE_LEGACY))
+			.setCancelable(false)
+			.setNeutralButton(R.string.close, null);
 
+		materialAlertDialogBuilder.create().show();
 	}
 
 }
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 64205504..4fb96245 100644
--- a/app/src/main/res/layout/activity_add_new_account.xml
+++ b/app/src/main/res/layout/activity_add_new_account.xml
@@ -139,10 +139,10 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/addNewAccount"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dimen54dp"
             android:layout_marginTop="@dimen/dimen8dp"
             android:textStyle="bold"
             android:text="@string/addNewAccountText"
diff --git a/app/src/main/res/layout/activity_create_file.xml b/app/src/main/res/layout/activity_create_file.xml
index 7a5eb49f..dc05c3d4 100644
--- a/app/src/main/res/layout/activity_create_file.xml
+++ b/app/src/main/res/layout/activity_create_file.xml
@@ -176,10 +176,10 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/newFileCreate"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/newFileButtonCopy"
diff --git a/app/src/main/res/layout/activity_create_issue.xml b/app/src/main/res/layout/activity_create_issue.xml
index ed5e7f6c..e44f4b3b 100644
--- a/app/src/main/res/layout/activity_create_issue.xml
+++ b/app/src/main/res/layout/activity_create_issue.xml
@@ -222,10 +222,10 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/createNewIssueButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/newCreateButtonCopy"
diff --git a/app/src/main/res/layout/activity_create_label.xml b/app/src/main/res/layout/activity_create_label.xml
index bc5f97ba..fd2cda60 100644
--- a/app/src/main/res/layout/activity_create_label.xml
+++ b/app/src/main/res/layout/activity_create_label.xml
@@ -111,10 +111,10 @@
 
         </LinearLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/createLabelButton"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dimen54dp"
             android:layout_marginTop="@dimen/dimen8dp"
             android:textStyle="bold"
             android:text="@string/newCreateButtonCopy"
diff --git a/app/src/main/res/layout/activity_create_milestone.xml b/app/src/main/res/layout/activity_create_milestone.xml
index 146082bb..ca30f68a 100644
--- a/app/src/main/res/layout/activity_create_milestone.xml
+++ b/app/src/main/res/layout/activity_create_milestone.xml
@@ -143,10 +143,10 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/createNewMilestoneButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/newCreateButtonCopy"
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 b7f6838e..494653ec 100644
--- a/app/src/main/res/layout/activity_create_new_user.xml
+++ b/app/src/main/res/layout/activity_create_new_user.xml
@@ -165,10 +165,10 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/createUserButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/newCreateButtonCopy"
diff --git a/app/src/main/res/layout/activity_create_organization.xml b/app/src/main/res/layout/activity_create_organization.xml
index 5cbb0340..b87e3132 100644
--- a/app/src/main/res/layout/activity_create_organization.xml
+++ b/app/src/main/res/layout/activity_create_organization.xml
@@ -116,10 +116,10 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/createNewOrganizationButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/newCreateButtonCopy"
diff --git a/app/src/main/res/layout/activity_create_pr.xml b/app/src/main/res/layout/activity_create_pr.xml
index 3ea42293..e7231fbf 100644
--- a/app/src/main/res/layout/activity_create_pr.xml
+++ b/app/src/main/res/layout/activity_create_pr.xml
@@ -247,10 +247,10 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/createPr"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/newCreateButtonCopy"
diff --git a/app/src/main/res/layout/activity_create_release.xml b/app/src/main/res/layout/activity_create_release.xml
index 51a82612..e567b2ca 100644
--- a/app/src/main/res/layout/activity_create_release.xml
+++ b/app/src/main/res/layout/activity_create_release.xml
@@ -185,19 +185,19 @@
                 android:layout_marginTop="@dimen/dimen10dp"
                 android:textColor="?attr/primaryTextColor"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/createNewRelease"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/newCreateButtonCopy"
                 android:textColor="@color/btnTextColor" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/createNewTag"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/create_tag"
diff --git a/app/src/main/res/layout/activity_create_repo.xml b/app/src/main/res/layout/activity_create_repo.xml
index 97f3b17f..66f12ffa 100644
--- a/app/src/main/res/layout/activity_create_repo.xml
+++ b/app/src/main/res/layout/activity_create_repo.xml
@@ -147,10 +147,10 @@
                 android:layout_marginTop="@dimen/dimen10dp"
                 android:textColor="?attr/primaryTextColor"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/createNewRepoButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/newCreateButtonCopy"
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 8a045e62..f1959829 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
@@ -180,10 +180,10 @@
                 android:layout_height="wrap_content"
                 android:visibility="gone" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/createTeamButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/newCreateButtonCopy"
diff --git a/app/src/main/res/layout/activity_deeplinks.xml b/app/src/main/res/layout/activity_deeplinks.xml
index 508cdb97..0bd01a9f 100644
--- a/app/src/main/res/layout/activity_deeplinks.xml
+++ b/app/src/main/res/layout/activity_deeplinks.xml
@@ -43,16 +43,17 @@
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="@dimen/dimen16sp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/addNewAccount"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen60dp"
+                    android:layout_height="@dimen/dimen54dp"
                     android:text="@string/addNewAccountText"
                     android:textColor="@color/btnTextColor"
+                    android:textStyle="bold"
                     android:textSize="@dimen/dimen16sp"
                     android:layout_marginTop="@dimen/dimen24dp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/openInBrowser"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dimen60dp"
@@ -61,11 +62,12 @@
                     android:textSize="@dimen/dimen16sp"
                     android:layout_marginTop="@dimen/dimen8dp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/launchApp"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen60dp"
+                    android:layout_height="@dimen/dimen54dp"
                     android:text="@string/launchApp"
+                    android:textStyle="bold"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
                     android:layout_marginTop="@dimen/dimen8dp" />
@@ -91,47 +93,52 @@
                     android:textColor="?attr/primaryTextColor"
                     android:textSize="@dimen/dimen16sp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/repository"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen60dp"
+                    android:layout_height="@dimen/dimen54dp"
                     android:text="@string/navRepos"
+                    android:textStyle="bold"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
                     android:layout_marginTop="@dimen/dimen24dp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/organization"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen60dp"
+                    android:layout_height="@dimen/dimen54dp"
                     android:text="@string/navOrg"
+                    android:textStyle="bold"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
                     android:layout_marginTop="@dimen/dimen8dp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/notification"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen60dp"
+                    android:layout_height="@dimen/dimen54dp"
                     android:text="@string/pageTitleNotifications"
+                    android:textStyle="bold"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
                     android:layout_marginTop="@dimen/dimen8dp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/explore"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen60dp"
+                    android:layout_height="@dimen/dimen54dp"
                     android:text="@string/pageTitleExplore"
+                    android:textStyle="bold"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
                     android:layout_marginTop="@dimen/dimen8dp" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/launchApp2"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen60dp"
+                    android:layout_height="@dimen/dimen54dp"
                     android:text="@string/launchApp"
+                    android:textStyle="bold"
                     android:textColor="@color/btnTextColor"
                     android:textSize="@dimen/dimen16sp"
                     android:layout_marginTop="@dimen/dimen8dp" />
diff --git a/app/src/main/res/layout/activity_edit_issue.xml b/app/src/main/res/layout/activity_edit_issue.xml
index fe2a929a..baf99637 100644
--- a/app/src/main/res/layout/activity_edit_issue.xml
+++ b/app/src/main/res/layout/activity_edit_issue.xml
@@ -164,10 +164,10 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/editIssueButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/saveButton"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 0428902e..d1e839ac 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -229,12 +229,13 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/login_button"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dimen60dp"
+            android:layout_height="@dimen/dimen54dp"
             android:layout_marginTop="@dimen/dimen8dp"
             android:text="@string/btnLogin"
+            android:textStyle="bold"
             android:textColor="@color/btnTextColor" />
 
         <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 d2a9ad0f..f01b53b2 100644
--- a/app/src/main/res/layout/activity_merge_pull_request.xml
+++ b/app/src/main/res/layout/activity_merge_pull_request.xml
@@ -181,10 +181,10 @@
                 android:gravity="start"
                 android:layout_marginTop="@dimen/dimen16dp" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/mergeButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen8dp"
                 android:textStyle="bold"
                 android:text="@string/mergePullRequestButtonText"
diff --git a/app/src/main/res/layout/activity_profile_email.xml b/app/src/main/res/layout/activity_profile_email.xml
index f76a4f35..a4033ea4 100644
--- a/app/src/main/res/layout/activity_profile_email.xml
+++ b/app/src/main/res/layout/activity_profile_email.xml
@@ -79,10 +79,10 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/addEmailButton"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dimen54dp"
             android:layout_marginTop="@dimen/dimen8dp"
             android:textStyle="bold"
             android:text="@string/saveButton"
diff --git a/app/src/main/res/layout/custom_about_dialog.xml b/app/src/main/res/layout/custom_about_dialog.xml
index ba36e00f..f29949b1 100644
--- a/app/src/main/res/layout/custom_about_dialog.xml
+++ b/app/src/main/res/layout/custom_about_dialog.xml
@@ -166,10 +166,10 @@
 
             </LinearLayout>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/appWebsite"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_margin="@dimen/dimen24dp"
                 android:layout_gravity="center_horizontal"
                 android:textStyle="bold"
diff --git a/app/src/main/res/layout/custom_assignees_selection_dialog.xml b/app/src/main/res/layout/custom_assignees_selection_dialog.xml
index 62306653..84d9c8d6 100644
--- a/app/src/main/res/layout/custom_assignees_selection_dialog.xml
+++ b/app/src/main/res/layout/custom_assignees_selection_dialog.xml
@@ -18,7 +18,6 @@
         android:layout_marginBottom="@dimen/dimen8dp"
         android:text="@string/newIssueSelectAssigneesListTitle" />
 
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/assigneesRecyclerView"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/custom_pr_update_strategy_dialog.xml b/app/src/main/res/layout/custom_pr_update_strategy_dialog.xml
index 4c54711e..597758f8 100644
--- a/app/src/main/res/layout/custom_pr_update_strategy_dialog.xml
+++ b/app/src/main/res/layout/custom_pr_update_strategy_dialog.xml
@@ -15,10 +15,10 @@
         android:textColor="?attr/primaryTextColor"
         android:padding="16dp" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/updatePullMerge"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dimen54dp"
         android:layout_marginStart="@dimen/dimen16dp"
         android:layout_marginEnd="@dimen/dimen16dp"
         android:layout_marginTop="@dimen/dimen8dp"
@@ -27,14 +27,14 @@
         android:textStyle="bold"
         android:text="@string/updateStrategyMerge" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/updatePullRebase"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dimen54dp"
         android:textColor="@color/colorWhite"
         android:layout_marginStart="@dimen/dimen16dp"
         android:layout_marginEnd="@dimen/dimen16dp"
-        android:layout_marginTop="0dp"
+        android:layout_marginTop="@dimen/dimen8dp"
         android:layout_marginBottom="@dimen/dimen8dp"
         android:textStyle="bold"
         android:text="@string/updateStrategyRebase" />
diff --git a/app/src/main/res/layout/custom_repository_delete_dialog.xml b/app/src/main/res/layout/custom_repository_delete_dialog.xml
index ab728183..2b702e9d 100644
--- a/app/src/main/res/layout/custom_repository_delete_dialog.xml
+++ b/app/src/main/res/layout/custom_repository_delete_dialog.xml
@@ -57,10 +57,10 @@
         style="@style/Widget.Material3.LinearProgressIndicator"
         app:indicatorColor="?attr/progressIndicatorColor" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/delete"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dimen54dp"
         android:layout_marginTop="@dimen/dimen16dp"
         android:text="@string/menuDeleteText"
         android:backgroundTint="@color/darkRed"
diff --git a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
index 9fa2ad27..0db11fe9 100644
--- a/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
+++ b/app/src/main/res/layout/custom_repository_edit_properties_dialog.xml
@@ -190,10 +190,10 @@
                 style="@style/Widget.MaterialComponents.LinearProgressIndicator"
                 app:indicatorColor="?attr/progressIndicatorColor" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/save"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen16dp"
                 android:text="@string/saveButton"
                 android:textStyle="bold"
diff --git a/app/src/main/res/layout/custom_repository_transfer_dialog.xml b/app/src/main/res/layout/custom_repository_transfer_dialog.xml
index 0aaf196c..3dcb6dd0 100644
--- a/app/src/main/res/layout/custom_repository_transfer_dialog.xml
+++ b/app/src/main/res/layout/custom_repository_transfer_dialog.xml
@@ -98,10 +98,10 @@
                 style="@style/Widget.Material3.LinearProgressIndicator"
                 app:indicatorColor="?attr/progressIndicatorColor" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/transfer"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/dimen54dp"
                 android:layout_marginTop="@dimen/dimen16dp"
                 android:text="@string/repoTransferText"
                 android:backgroundTint="@color/darkRed"
diff --git a/app/src/main/res/layout/custom_user_accounts_dialog.xml b/app/src/main/res/layout/custom_user_accounts_dialog.xml
index 426dc238..311ec30c 100644
--- a/app/src/main/res/layout/custom_user_accounts_dialog.xml
+++ b/app/src/main/res/layout/custom_user_accounts_dialog.xml
@@ -27,10 +27,10 @@
         android:id="@+id/divider"
         android:background="?attr/dividerColor" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/newAccount"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dimen54dp"
         android:layout_margin="16dp"
         android:paddingStart="4dp"
         android:paddingEnd="4dp"
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 31416d5e..f7f82aea 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -5,26 +5,24 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
         android:id="@+id/loadingIndicator"
         android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:indeterminate="true"
-        android:visibility="gone"
-        android:layout_height="wrap_content"/>
+        android:visibility="gone" />
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay"
-        app:elevation="0dp">
+        app:elevation="@dimen/dimen0dp">
 
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="200dp"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed">
+            android:layout_height="@dimen/dimen320dp">
 
             <ImageView
                 android:id="@+id/userAvatarBackground"
@@ -36,10 +34,11 @@
             <LinearLayout
                 android:id="@+id/layoutFrameAccount"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:padding="16dp">
+                android:layout_marginTop="@dimen/dimen8dp"
+                android:padding="@dimen/dimen16dp">
 
                 <com.google.android.material.card.MaterialCardView
                     android:layout_width="@dimen/dimen60dp"
@@ -64,22 +63,22 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/colorWhite"
                     android:textIsSelectable="true"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/dimen18sp" />
 
                 <TextView
                     android:id="@+id/userLogin"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
+                    android:layout_marginBottom="@dimen/dimen10dp"
                     android:textColor="@color/colorWhite"
                     android:textIsSelectable="true"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/dimen14sp" />
 
                 <View
                     android:id="@+id/divider"
-                    android:layout_width="50dp"
-                    android:layout_height="1dp"
-                    android:layout_marginBottom="10dp"
+                    android:layout_width="@dimen/dimen50dp"
+                    android:layout_height="@dimen/dimen1dp"
+                    android:layout_marginBottom="@dimen/dimen10dp"
                     android:background="@color/colorWhite" />
 
                 <LinearLayout
@@ -91,8 +90,8 @@
                     <ImageView
                         android:id="@+id/userLanguageIcon"
                         android:layout_width="wrap_content"
-                        android:layout_height="18dp"
-                        android:layout_marginEnd="2dp"
+                        android:layout_height="@dimen/dimen18dp"
+                        android:layout_marginEnd="@dimen/dimen2dp"
                         android:contentDescription="@string/generalImgContentText"
                         android:src="@drawable/ic_language"
                         app:tint="@color/colorWhite" />
@@ -103,7 +102,7 @@
                         android:layout_height="wrap_content"
                         android:textColor="@color/colorWhite"
                         android:textIsSelectable="true"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/dimen14sp" />
 
                 </LinearLayout>
 
@@ -111,42 +110,80 @@
 
         </FrameLayout>
 
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tabs"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/primaryBackgroundColor"
-            app:tabIndicatorColor="?attr/pagerTabIndicatorColor"
-            app:tabMode="auto"
-            app:tabTextAppearance="@style/customTabLayout"
-            app:tabTextColor="?attr/primaryTextColor">
-
-            <com.google.android.material.tabs.TabItem
-                android:id="@+id/profileTabFollowers"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/profileTabFollowers" />
-
-            <com.google.android.material.tabs.TabItem
-                android:id="@+id/profileTabFollowing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/profileTabFollowing" />
-
-            <com.google.android.material.tabs.TabItem
-                android:id="@+id/profileTabEmails"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/profileTabEmails" />
-
-        </com.google.android.material.tabs.TabLayout>
-
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/container"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+        android:layout_marginTop="@dimen/dimen200dp">
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/CustomMaterCardViewStyle"
+            app:strokeWidth="@dimen/dimen0dp"
+            app:strokeColor="?attr/colorPrimary">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/fragmentProfileCard"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/dimen12dp"
+                    app:strokeWidth="@dimen/dimen2dp"
+                    app:cardCornerRadius="@dimen/dimen32dp"
+                    app:strokeColor="?attr/colorPrimary"
+                    style="?attr/materialCardViewFilledStyle">
+
+                    <com.google.android.material.tabs.TabLayout
+                        android:id="@+id/tabs"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:tabTextAppearance="@android:style/TextAppearance.Material.Widget.TabWidget"
+                        app:tabIndicatorGravity="stretch"
+                        app:tabMode="fixed"
+                        app:tabIndicatorColor="?attr/colorPrimary"
+                        app:tabIndicatorFullWidth="true"
+                        app:tabSelectedTextColor="@android:color/white"
+                        app:tabTextColor="?attr/colorPrimary">
+
+                        <com.google.android.material.tabs.TabItem
+                            android:id="@+id/profileTabFollowers"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/profileTabFollowers" />
+
+                        <com.google.android.material.tabs.TabItem
+                            android:id="@+id/profileTabFollowing"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/profileTabFollowing" />
+
+                        <com.google.android.material.tabs.TabItem
+                            android:id="@+id/profileTabEmails"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/profileTabEmails" />
+
+                    </com.google.android.material.tabs.TabLayout>
+
+                </com.google.android.material.card.MaterialCardView>
+
+            </LinearLayout>
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dimen72dp"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+    </FrameLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_profile_detail.xml b/app/src/main/res/layout/fragment_profile_detail.xml
index 7c89b15e..b8f82cb9 100644
--- a/app/src/main/res/layout/fragment_profile_detail.xml
+++ b/app/src/main/res/layout/fragment_profile_detail.xml
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:background="?attr/primaryBackgroundColor"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+<LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/userInfoLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:id="@+id/userInfoLayout"
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/progressBar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:visibility="gone"
+        style="@style/Widget.Material3.LinearProgressIndicator"
+        app:indicatorColor="?attr/progressIndicatorColor" />
 
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/progressBar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:indeterminate="true"
-            style="@style/Widget.MaterialComponents.LinearProgressIndicator"
-            app:indicatorColor="?attr/progressIndicatorColor" />
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <RelativeLayout
             android:id="@+id/profileFrame"
             android:layout_width="match_parent"
-            android:layout_height="200dp"
+            android:layout_height="@dimen/dimen320dp"
             android:gravity="top"
             android:orientation="vertical">
 
@@ -38,10 +38,10 @@
             <LinearLayout
                 android:id="@+id/layoutFrameAccount"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:padding="16dp"
+                android:padding="@dimen/dimen16dp"
                 tools:ignore="UseCompoundDrawables">
 
                 <com.google.android.material.card.MaterialCardView
@@ -49,6 +49,7 @@
                     android:layout_height="@dimen/dimen60dp"
                     style="?attr/materialCardViewFilledStyle"
                     android:layout_marginBottom="@dimen/dimen8dp"
+                    android:layout_marginTop="@dimen/dimen16dp"
                     app:cardElevation="@dimen/dimen0dp"
                     app:cardCornerRadius="@dimen/dimen32dp">
 
@@ -65,10 +66,10 @@
                     android:id="@+id/userFullName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginTop="@dimen/dimen8dp"
                     android:textColor="@color/colorWhite"
                     android:textIsSelectable="true"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/dimen18sp" />
 
                 <TextView
                     android:id="@+id/userLogin"
@@ -76,65 +77,74 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/colorWhite"
                     android:textIsSelectable="true"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/dimen14sp" />
 
             </LinearLayout>
 
         </RelativeLayout>
 
-        <LinearLayout
-            android:orientation="vertical"
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="15dp">
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dimen200dp"
+            style="@style/CustomMaterCardViewStyle"
+            app:strokeWidth="@dimen/dimen0dp"
+            android:elevation="@dimen/dimen0dp"
+            app:strokeColor="?attr/colorPrimary">
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:orientation="horizontal"
-                android:paddingLeft="15dp"
-                android:paddingRight="15dp">
-
-                <ImageView
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:contentDescription="@string/generalImgContentText"
-                    app:srcCompat="@drawable/ic_email" />
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="@dimen/dimen16dp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:gravity="center_vertical"
-                    android:orientation="vertical">
+                    android:layout_marginTop="32dp"
+                    android:orientation="horizontal"
+                    android:paddingStart="@dimen/dimen16dp"
+                    android:paddingEnd="@dimen/dimen16dp">
 
-                    <TextView
+                    <ImageView
+                        android:layout_gravity="center"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/userEmail"
-                        android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:contentDescription="@string/generalImgContentText"
+                        app:srcCompat="@drawable/ic_email" />
 
-                    <TextView
-                        android:id="@+id/userEmail"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:alpha="0.9"
-                        android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
-                </LinearLayout>
+                        android:layout_marginStart="@dimen/dimen16dp"
+                        android:gravity="center_vertical"
+                        android:orientation="vertical">
 
-            </LinearLayout>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/userEmail"
+                            android:textColor="?attr/primaryTextColor"
+                            android:textSize="@dimen/dimen16sp" />
+
+                        <TextView
+                            android:id="@+id/userEmail"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:alpha="0.9"
+                            android:textColor="?attr/primaryTextColor"
+                            android:textSize="@dimen/dimen14sp" />
+                    </LinearLayout>
+
+                </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="@dimen/dimen32dp"
                 android:orientation="horizontal"
-                android:paddingLeft="15dp"
-                android:paddingRight="15dp">
+                android:paddingStart="@dimen/dimen16dp"
+                android:paddingEnd="@dimen/dimen16dp">
 
                 <ImageView
                     android:layout_gravity="center"
@@ -146,7 +156,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
+                    android:layout_marginStart="@dimen/dimen16dp"
                     android:gravity="center_vertical"
                     android:orientation="vertical">
 
@@ -155,7 +165,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/settingsLanguageSelectorHeader"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="@dimen/dimen16sp" />
 
                     <TextView
                         android:id="@+id/userLang"
@@ -163,7 +173,7 @@
                         android:layout_height="wrap_content"
                         android:alpha="0.9"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/dimen14sp" />
                 </LinearLayout>
 
             </LinearLayout>
@@ -171,10 +181,10 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="@dimen/dimen32dp"
                 android:orientation="horizontal"
-                android:paddingLeft="15dp"
-                android:paddingRight="15dp">
+                android:paddingStart="@dimen/dimen16dp"
+                android:paddingEnd="@dimen/dimen16dp">
 
                 <ImageView
                     android:layout_gravity="center"
@@ -195,7 +205,7 @@
                         android:layout_height="wrap_content"
                         android:text="@string/joined"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="16sp" />
+                        android:textSize="@dimen/dimen16sp" />
 
                     <TextView
                         android:id="@+id/userJoinedOn"
@@ -203,14 +213,15 @@
                         android:layout_height="wrap_content"
                         android:alpha="0.9"
                         android:textColor="?attr/primaryTextColor"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/dimen14sp" />
                 </LinearLayout>
 
             </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
 
-</ScrollView>
+    </FrameLayout>
 
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_profile_emails.xml b/app/src/main/res/layout/fragment_profile_emails.xml
index fc1693c9..ffe7d4a3 100644
--- a/app/src/main/res/layout/fragment_profile_emails.xml
+++ b/app/src/main/res/layout/fragment_profile_emails.xml
@@ -13,7 +13,6 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?attr/primaryBackgroundColor"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -23,18 +22,18 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:indeterminate="true"
-        style="@style/Widget.MaterialComponents.LinearProgressIndicator"
+        style="@style/Widget.Material3.LinearProgressIndicator"
         app:indicatorColor="?attr/progressIndicatorColor" />
 
     <TextView
         android:id="@+id/noDataEmails"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="15dp"
+        android:layout_margin="@dimen/dimen16dp"
         android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="20sp"
+        android:textSize="@dimen/dimen20sp"
         android:visibility="gone" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_profile_followers_following.xml b/app/src/main/res/layout/fragment_profile_followers_following.xml
index 70d63782..f4f4ada0 100644
--- a/app/src/main/res/layout/fragment_profile_followers_following.xml
+++ b/app/src/main/res/layout/fragment_profile_followers_following.xml
@@ -12,8 +12,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/primaryBackgroundColor"
+            android:layout_height="wrap_content"
             android:scrollbars="vertical" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -23,6 +22,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:indeterminate="true"
+        android:paddingStart="@dimen/dimen16dp"
+        android:paddingEnd="@dimen/dimen16dp"
         style="@style/Widget.Material3.LinearProgressIndicator"
         app:indicatorColor="?attr/progressIndicatorColor" />
 
@@ -30,11 +31,11 @@
         android:id="@+id/noData"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="15dp"
+        android:layout_margin="@dimen/dimen16dp"
         android:gravity="center"
         android:text="@string/noDataFound"
         android:textColor="?attr/primaryTextColor"
-        android:textSize="20sp"
+        android:textSize="@dimen/dimen20sp"
         android:visibility="gone" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index 42856e75..c86ea62b 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -118,12 +118,22 @@
                     android:textColorLink="@color/lightBlue"
                     android:textSize="16sp" />
 
-                <LinearLayout
+                <com.google.android.material.card.MaterialCardView
+                    android:id="@+id/fragmentProfileCard"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:baselineAligned="false"
-                    android:orientation="horizontal">
+                    app:strokeWidth="@dimen/dimen0dp"
+                    android:layout_marginTop="@dimen/dimen12dp"
+                    android:layout_marginBottom="@dimen/dimen12dp"
+                    style="@style/CustomMaterialCardStyle">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dimen12dp"
+                        android:layout_marginBottom="@dimen/dimen12dp"
+                        android:baselineAligned="false"
+                        android:orientation="horizontal">
 
                     <LinearLayout
                         android:id="@+id/repoMetaStarsFrame"
@@ -226,12 +236,7 @@
                     </LinearLayout>
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="25dp"
-                    android:layout_marginBottom="12dp"
-                    android:background="?attr/dividerColor" />
+                </com.google.android.material.card.MaterialCardView>
 
                 <LinearLayout
                     android:id="@+id/repo_fork_frame"
@@ -248,7 +253,8 @@
                         android:layout_gravity="center"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:srcCompat="@drawable/ic_fork" />
+                        app:srcCompat="@drawable/ic_fork"
+                        android:contentDescription="@string/generalImgContentText" />
 
                     <TextView
                         android:id="@+id/repo_fork"
@@ -386,13 +392,13 @@
 
                 </LinearLayout>
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/repoAdditionalButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="60dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dimen54dp"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="5dp"
-                    android:layout_marginBottom="20dp"
+                    android:layout_marginTop="@dimen/dimen6dp"
+                    android:layout_marginBottom="@dimen/dimen20dp"
                     android:text="@string/infoShowMoreInformation"
                     android:textColor="@color/btnTextColor" />
 
diff --git a/app/src/main/res/layout/list_profile_emails.xml b/app/src/main/res/layout/list_profile_emails.xml
index 107721df..3379aa0d 100644
--- a/app/src/main/res/layout/list_profile_emails.xml
+++ b/app/src/main/res/layout/list_profile_emails.xml
@@ -1,30 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="16dp"
+    android:paddingStart="@dimen/dimen12dp"
+    android:paddingEnd="@dimen/dimen12dp"
+    android:paddingBottom="@dimen/dimen4dp"
+    android:paddingTop="@dimen/dimen4dp"
     tools:ignore="UseCompoundDrawables">
 
-    <TextView
-        android:id="@+id/userEmail"
-        android:layout_width="wrap_content"
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/card"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/profileEmailTitle"
-        android:textColor="?attr/primaryTextColor"
-        android:textSize="16sp" />
+        app:cardBackgroundColor="?attr/primaryBackgroundColor"
+        style="?attr/materialCardViewFilledStyle">
 
-    <ImageView
-        android:id="@+id/emailPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="start"
-        android:layout_marginTop="2dp"
-        android:contentDescription="@string/emailTypeText"
-        android:paddingStart="20dp"
-        android:paddingEnd="2dp"
-        tools:src="@drawable/ic_verified_user" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/dimen12dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/userEmail"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/profileEmailTitle"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="@dimen/dimen16sp" />
+
+            <ImageView
+                android:id="@+id/emailPrimary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginTop="@dimen/dimen2dp"
+                android:contentDescription="@string/emailTypeText"
+                android:paddingStart="@dimen/dimen20dp"
+                android:paddingEnd="@dimen/dimen2dp"
+                tools:src="@drawable/ic_verified_user" />
+
+        </LinearLayout>
+
+    </com.google.android.material.card.MaterialCardView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/list_users.xml b/app/src/main/res/layout/list_users.xml
index f7657f4d..c2c302cb 100644
--- a/app/src/main/res/layout/list_users.xml
+++ b/app/src/main/res/layout/list_users.xml
@@ -4,49 +4,69 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:gravity="center_vertical"
-    android:background="?android:attr/selectableItemBackground"
-    android:padding="@dimen/dimen16dp">
+    android:paddingStart="@dimen/dimen12dp"
+    android:paddingEnd="@dimen/dimen12dp"
+    android:paddingBottom="@dimen/dimen4dp"
+    android:paddingTop="@dimen/dimen4dp">
 
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="@dimen/dimen24dp"
-        android:layout_height="@dimen/dimen24dp"
-        style="?attr/materialCardViewFilledStyle"
-        app:cardElevation="@dimen/dimen0dp"
-        android:layout_marginEnd="@dimen/dimen12dp"
-        app:cardCornerRadius="@dimen/dimen12dp">
+        android:id="@+id/card"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardBackgroundColor="?attr/primaryBackgroundColor"
+        style="?attr/materialCardViewFilledStyle">
 
-        <ImageView
-            android:id="@+id/userAvatar"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:contentDescription="@string/generalImgContentText"
-            android:src="@drawable/ic_android" />
+            android:layout_height="wrap_content"
+            android:foreground="?android:attr/selectableItemBackground"
+            android:padding="@dimen/dimen12dp"
+            android:orientation="horizontal">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="@dimen/dimen24dp"
+                android:layout_height="@dimen/dimen24dp"
+                style="?attr/materialCardViewFilledStyle"
+                app:cardElevation="@dimen/dimen0dp"
+                android:layout_marginEnd="@dimen/dimen12dp"
+                app:cardCornerRadius="@dimen/dimen12dp">
+
+                <ImageView
+                    android:id="@+id/userAvatar"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:contentDescription="@string/generalImgContentText"
+                    android:src="@drawable/ic_android" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+            <LinearLayout
+                android:id="@+id/userInfoSection"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/userFullName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/userName"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen16sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/userName"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/userName"
+                    android:textColor="?attr/primaryTextColor"
+                    android:textSize="@dimen/dimen14sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
 
-    <LinearLayout
-        android:id="@+id/userInfoSection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/userFullName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/userName"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen16sp"
-            android:textStyle="bold" />
-
-        <TextView
-            android:id="@+id/userName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/userName"
-            android:textColor="?attr/primaryTextColor"
-            android:textSize="@dimen/dimen14sp" />
-
-    </LinearLayout>
-
 </LinearLayout>
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
index 0a5dc06e..29706a0e 100644
--- a/app/src/main/res/values-v23/themes.xml
+++ b/app/src/main/res/values-v23/themes.xml
@@ -10,6 +10,8 @@
         <item name="android:textColorSecondary">@color/lightThemeTextColor</item>
         <item name="colorPrimary">@color/darkGreen</item>
         <item name="colorSecondary">@color/lightThemeTextColor</item>
+        <item name="colorOnSurfaceVariant">@color/lightThemeTextColor</item>
+        <item name="colorSecondaryContainer">@color/lightThemeColorSecondaryContainer</item>
 
         <item name="diffAddedColor">@color/lightThemeDiffAddedColor</item>
         <item name="diffRemovedColor">@color/lightThemeDiffRemovedColor</item>
@@ -54,6 +56,7 @@
         <item name="android:textColorPrimary">@color/retroThemeTextColor</item>
         <item name="colorPrimary">@color/retroThemeColorPrimary</item>
         <item name="colorSecondary">@color/retroThemeColorSecondary</item>
+        <item name="colorOnSurfaceVariant">@color/retroThemeTextColor</item>
 
         <item name="diffAddedColor">@color/retroThemeDiffAddedColor</item>
         <item name="diffRemovedColor">@color/retroThemeDiffRemovedColor</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ec1410f7..9e52a81e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -28,6 +28,7 @@
     <color name="dividerColorDark">#1d1d1d</color>
     <color name="lightYellow">#efd34a</color>
     <color name="warningColor">#dbb109</color>
+    <color name="colorSecondaryContainer">#1f2926</color>
 
     <color name="lightThemeDiffRemovedColor">#FCEDED</color>
     <color name="lightThemeDiffAddedColor">#EAF8ED</color>
@@ -38,6 +39,7 @@
     <color name="lightThemInputSelected">#C9CCCC</color>
     <color name="lightThemeInputTextColor">#212121</color>
     <color name="lightThemeDividerColor">#dbdbdb</color>
+    <color name="lightThemeColorSecondaryContainer">#dbe3e1</color>
 
     <color name="retroThemeDiffRemovedColor">#fad6d6</color>
     <color name="retroThemeDiffAddedColor">#d0f7d9</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4220048b..67d29a65 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -34,6 +34,8 @@
     <dimen name="dimen140dp">140dp</dimen>
     <dimen name="dimen150dp">150dp</dimen>
     <dimen name="dimen180dp">180dp</dimen>
+    <dimen name="dimen200dp">200dp</dimen>
+    <dimen name="dimen320dp">320dp</dimen>
     <dimen name="dimen480dp">480dp</dimen>
 
     <!--SP-->
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index bf7fc155..fe858ea7 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -62,6 +62,7 @@
         <item>@string/titleDrafts</item>
         <item>@string/pageTitleNotifications</item>
         <item>@string/navMyIssues</item>
+        <item>@string/navMostVisited</item>
     </string-array>
 
     <string-array name="linkHandlerDefaultScreen">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1929b0d9..8af90de6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -10,6 +10,8 @@
         <item name="android:textColorPrimary">@color/colorWhite</item>
         <item name="colorPrimary">@color/darkGreen</item>
         <item name="colorSecondary">@color/colorWhite</item>
+        <item name="colorOnSurfaceVariant">@color/colorWhite</item>
+        <item name="colorSecondaryContainer">@color/colorSecondaryContainer</item>
 
         <item name="diffAddedColor">@color/diffAddedColor</item>
         <item name="diffRemovedColor">@color/diffRemovedColor</item>
@@ -54,6 +56,8 @@
         <item name="android:textColorPrimary">@color/lightThemeTextColor</item>
         <item name="colorPrimary">@color/darkGreen</item>
         <item name="colorSecondary">@color/lightThemeTextColor</item>
+        <item name="colorOnSurfaceVariant">@color/lightThemeTextColor</item>
+        <item name="colorSecondaryContainer">@color/lightThemeColorSecondaryContainer</item>
 
         <item name="diffAddedColor">@color/lightThemeDiffAddedColor</item>
         <item name="diffRemovedColor">@color/lightThemeDiffRemovedColor</item>
@@ -97,6 +101,7 @@
         <item name="android:textColorPrimary">@color/retroThemeTextColor</item>
         <item name="colorPrimary">@color/retroThemeColorPrimary</item>
         <item name="colorSecondary">@color/retroThemeColorSecondary</item>
+        <item name="colorOnSurfaceVariant">@color/retroThemeTextColor</item>
 
         <item name="diffAddedColor">@color/retroThemeDiffAddedColor</item>
         <item name="diffRemovedColor">@color/retroThemeDiffRemovedColor</item>
@@ -140,6 +145,8 @@
         <item name="android:textColorPrimary">@color/pitchBlackThemeTextColor</item>
         <item name="colorPrimary">@color/darkGreen</item>
         <item name="colorSecondary">@color/pitchBlackThemeTextColor</item>
+        <item name="colorOnSurfaceVariant">@color/pitchBlackThemeTextColor</item>
+        <item name="colorSecondaryContainer">@color/colorSecondaryContainer</item>
 
         <item name="diffAddedColor">@color/diffAddedColor</item>
         <item name="diffRemovedColor">@color/diffRemovedColor</item>
@@ -174,8 +181,29 @@
     </style>
     <!-- Pitch black theme -->
 
+    <!-- Custom Material cards -->
+    <style name="CustomMaterCardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.card.custom.corners</item>
+    </style>
+
+    <style name="ShapeAppearanceOverlay.card.custom.corners" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopRight">@dimen/dimen32dp</item>
+        <item name="cornerSizeTopLeft">@dimen/dimen32dp</item>
+        <item name="cornerSizeBottomRight">0dp</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+    </style>
+
+    <style name="CustomMaterialCardStyle" parent="@style/Widget.MaterialComponents.CardView">
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.custom.card</item>
+    </style>
+
+    <style name="ShapeAppearanceOverlay.custom.card" parent="">
+        <item name="cornerFamily">rounded</item>
+    </style>
+
     <!-- Material switch style -->
-    <style name="MaterialSwitch" parent="Widget.Material3.CompoundButton.Switch">
+    <style name="MaterialSwitch" parent="Widget.MaterialComponents.CompoundButton.Switch">
         <item name="switchMinWidth">@dimen/dimen32dp</item>
         <item name="minHeight">@dimen/dimen24dp</item>
         <item name="track">@drawable/switch_track</item>