diff --git a/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java b/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java
index ef6a323b2..30b490c6b 100644
--- a/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.java
@@ -8,11 +8,21 @@ import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import android.widget.Toast        
 import androidx.annotation.Nullable;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import com.dinuscxj.progressbar.CircleProgressBar;
+import com.google.android.material.snackbar.Snackbar;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.auth.SessionManager;
@@ -20,10 +30,10 @@ import fr.free.nrw.commons.databinding.FragmentAchievementsBinding;
 import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
 import fr.free.nrw.commons.kvstore.BasicKvStore;
 import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
+import fr.free.nrw.commons.profile.ProfileActivity;
 import fr.free.nrw.commons.utils.ConfigUtils;
 import fr.free.nrw.commons.utils.DialogUtil;
 import fr.free.nrw.commons.utils.ViewUtil;
-import fr.free.nrw.commons.profile.ProfileActivity;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.schedulers.Schedulers;
@@ -160,9 +170,9 @@ public class AchievementsFragment extends CommonsDaggerSupportFragment {
                 ctx = getView().getContext();
             }
             if(ctx != null) {
-                Toast.makeText(ctx,
-                    R.string.achievements_unavailable_beta,
-                    Toast.LENGTH_LONG).show();
+                Snackbar snackbar = Snackbar.make(getActivity().findViewById(R.id.drawer_layout),R.string.achievements_unavailable_beta, Snackbar.LENGTH_LONG);
+                snackbar.setAction("OK", view -> snackbar.dismiss());
+                snackbar.show();
             }
         }
     }
diff --git a/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardFragment.java b/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardFragment.java
index a9cc222ea..f82769522 100644
--- a/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/profile/leaderboard/LeaderboardFragment.java
@@ -18,7 +18,11 @@ import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.MergeAdapter;
+import androidx.recyclerview.widget.MergeAdapte;     
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import com.google.android.material.snackbar.Snackbar;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.databinding.FragmentLeaderboardBinding;
@@ -180,9 +184,9 @@ public class LeaderboardFragment extends CommonsDaggerSupportFragment {
                 ctx = getView().getContext();
             }
             if(ctx != null) {
-                Toast.makeText(ctx,
-                    R.string.leaderboard_unavailable_beta,
-                    Toast.LENGTH_LONG).show();
+                Snackbar snackbar = Snackbar.make(getActivity().findViewById(R.id.drawer_layout),R.string.leaderboard_unavailable_beta, Snackbar.LENGTH_LONG);
+                snackbar.setAction("OK", view -> snackbar.dismiss());
+                snackbar.show();
             }
         }
     }
@@ -206,6 +210,10 @@ public class LeaderboardFragment extends CommonsDaggerSupportFragment {
     private void scrollToUserRank() {
 
         if(userRank==0){
+            Snackbar snackbar = Snackbar.make(getActivity().findViewById(R.id.drawer_layout),R.string.no_achievements_yet, Snackbar.LENGTH_LONG);
+            snackbar.setAction("OK", view -> snackbar.dismiss());
+            snackbar.show();        }else {
+            if (Objects.requireNonNull(leaderboardListRecyclerView.getAdapter()).getItemCount()
             Toast.makeText(getContext(),R.string.no_achievements_yet,Toast.LENGTH_SHORT).show();
         }else {
             if (binding == null) {