diff --git a/themes/wporg-5ftf/css/components/_pledge-contributors.scss b/themes/wporg-5ftf/css/components/_pledge-contributors.scss
index 7319000..c84e4c6 100644
--- a/themes/wporg-5ftf/css/components/_pledge-contributors.scss
+++ b/themes/wporg-5ftf/css/components/_pledge-contributors.scss
@@ -18,31 +18,29 @@
 	}
 
 	&.has-contrib-names {
-		display: flex;
-		flex-wrap: wrap;
 		margin: ms(2) 0;
 		list-style: none;
-		justify-content: space-between;
-
-		&.has-2-contribs {
-			justify-content: flex-start;
-
-			li {
-				margin-right: 20px;
-
-				@include breakpoint( $breakpoint-small ) {
-					margin-right: 48px;
-				}
-			}
-		}
 
 		li {
-			margin: 0 0 40px;
-			width: calc( 50% - 20px );
+			display: inline-block;
+			margin: 0 20px 40px 0;
+			width: calc( 50% - 15px );
+
+			&:nth-of-type(2n) {
+				margin-right: 0;
+			}
 
 			@include breakpoint( $breakpoint-small ) {
-				width: calc( 33% - 48px );
-				min-width: 170px;
+				margin-right: 48px;
+				width: calc( 33% - 33px );
+
+				&:nth-of-type(2n) {
+					margin-right: 48px;
+				}
+
+				&:nth-of-type(3n) {
+					margin-right: 0;
+				}
 			}
 		}
 
diff --git a/themes/wporg-5ftf/single-5ftf_pledge.php b/themes/wporg-5ftf/single-5ftf_pledge.php
index 43b7cf6..6b22f4c 100644
--- a/themes/wporg-5ftf/single-5ftf_pledge.php
+++ b/themes/wporg-5ftf/single-5ftf_pledge.php
@@ -91,7 +91,7 @@ get_header(); ?>
 				<h2><?php esc_html_e( 'Contributors', 'wporg' ); ?></h2>
 
 				<?php if ( ! empty( $contributors ) ) : ?>
-					<ul class="pledge-contributors has-contrib-names <?php echo ( 2 === count( $contributors ) ) ? 'has-2-contribs' : ''; ?>">
+					<ul class="pledge-contributors has-contrib-names">
 						<?php foreach ( $contributors as $contributor ) : ?>
 							<li class="pledge-contributor">
 								<span class="pledge-contributor__avatar">