diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java
index 083471d2b..d9b98e247 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java
@@ -80,7 +80,7 @@ public class BadgesList extends ScrollPane {
 
 	private class ListItem extends Component {
 		
-		private static final float HEIGHT	= 20;
+		private static final float HEIGHT	= 18;
 		
 		private Badges.Badge badge;
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
index 735b71335..c77c51f29 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
@@ -353,7 +353,7 @@ public class WndRanking extends WndTabbed {
 			camera = WndRanking.this.camera;
 
 			Component badges;
-			if (Badges.totalUnlocked(false) <= 7){
+			if (Badges.filterReplacedBadges(false).size() <= 8){
 				badges = new BadgesList(false);
 			} else {
 				badges = new BadgesGrid(false);