diff --git a/assets/css/sportspress.css b/assets/css/sportspress.css
index 45a9efaf..969022b9 100644
--- a/assets/css/sportspress.css
+++ b/assets/css/sportspress.css
@@ -78,10 +78,21 @@
 }
 
 /* League Table */
-.sp-league-table .team-logo {
-	vertical-align: middle;
-	height: 2.5em;
+.sp-league-table td {
+	line-height: 2em;
+}
+.sp-league-table .data-name.has-logo {
+	padding-left: 2.5em;
+	position: relative;
+}
+
+.sp-league-table .data-name.has-logo .team-logo {
 	width: auto;
+	height: auto;
+	max-width: 2em;
+	max-height: 2em;
+	position: absolute;
+	left: 0.25em;
 }
 
 /* Event Performance */
diff --git a/templates/league-table.php b/templates/league-table.php
index 8989319f..24eae608 100644
--- a/templates/league-table.php
+++ b/templates/league-table.php
@@ -72,9 +72,14 @@ foreach( $data as $team_id => $row ):
 	// Rank
 	$output .= '<td class="data-rank">' . ( $i + 1 ) . '</td>';
 
+	$name_class = '';
+
 	if ( $show_team_logo ):
-		$logo = get_the_post_thumbnail( $team_id, 'sportspress-fit-icon', array( 'class' => 'team-logo' ) );
-		$name = $logo . ' ' . $name;
+		if ( has_post_thumbnail( $team_id ) ):
+			$logo = get_the_post_thumbnail( $team_id, 'sportspress-fit-icon', array( 'class' => 'team-logo' ) );
+			$name = $logo . ' ' . $name;
+			$name_class .= ' has-logo';
+		endif;
 	endif;
 
 	if ( $link_posts ):
@@ -82,7 +87,7 @@ foreach( $data as $team_id => $row ):
 		$name = '<a href="' . $permalink . '">' . $name . '</a>';
 	endif;
 
-	$output .= '<td class="data-name">' . $name . '</td>';
+	$output .= '<td class="data-name' . $name_class . '">' . $name . '</td>';
 
 	foreach( $labels as $key => $value ):
 		if ( $key == 'name' )