diff --git a/components/match2/wikis/clashroyale/match_summary.lua b/components/match2/wikis/clashroyale/match_summary.lua
index 4a40b3ea42a..33990d1157b 100644
--- a/components/match2/wikis/clashroyale/match_summary.lua
+++ b/components/match2/wikis/clashroyale/match_summary.lua
@@ -449,7 +449,7 @@ function CustomMatchSummary._opponentCardsDisplay(args)
 				wrapperCards:node(display)
 				display = mw.html.create('div')
 					:addClass('brkts-popup-body-element-thumbs')
-					:addClass('brkts-popup-body-element-thumbs-' .. (flip and 'left' or 'right'))
+					:addClass(flip and 'brkts-popup-body-element-thumbs-right' or nil)
 			end
 
 			display:node(card)
diff --git a/components/match2/wikis/splatoon/match_summary.lua b/components/match2/wikis/splatoon/match_summary.lua
index 6f886a3e451..4a717bd82e7 100644
--- a/components/match2/wikis/splatoon/match_summary.lua
+++ b/components/match2/wikis/splatoon/match_summary.lua
@@ -208,7 +208,7 @@ function CustomMatchSummary._opponentWeaponsDisplay(props)
 
 	local display = mw.html.create('div')
 		:addClass('brkts-popup-body-element-thumbs')
-		:addClass('brkts-popup-body-element-thumbs-' .. (flip and 'right' or 'left'))
+		:addClass(flip and 'brkts-popup-body-element-thumbs-right' or nil)
 
 	for _, item in ipairs(displayElements) do
 		display:node(item)
diff --git a/components/widget/match/summary/widget_match_summary_characters.lua b/components/widget/match/summary/widget_match_summary_characters.lua
index eb78ca4bc7e..9953c0388d5 100644
--- a/components/widget/match/summary/widget_match_summary_characters.lua
+++ b/components/widget/match/summary/widget_match_summary_characters.lua
@@ -32,8 +32,8 @@ function MatchSummaryCharacters:render()
 	return Div{
 		classes = {
 			'brkts-popup-body-element-thumbs',
-			'brkts-popup-body-element-thumbs-' .. (flipped and 'right' or 'left'),
-			'brkts-champion-icon'
+			'brkts-champion-icon',
+			flipped and 'brkts-popup-body-element-thumbs-right' or nil,
 		},
 		children = Array.map(self.props.characters, function(character)
 			return Character{
diff --git a/stylesheets/commons/Brackets.less b/stylesheets/commons/Brackets.less
index 4d5244fef6b..be6336690a5 100644
--- a/stylesheets/commons/Brackets.less
+++ b/stylesheets/commons/Brackets.less
@@ -555,19 +555,13 @@
 }
 
 .brkts-popup-body-element-thumbs {
+	display: inline-flex;
 	flex: 1;
 	min-width: 0.01%;
 }
 
-.brkts-popup-body-element-thumbs.brkts-popup-body-element-thumbs-left {
-	display: inline-flex;
-	flex-direction: row;
-	justify-content: left;
-}
-
+/* TODO: Remove when able, but is currently needed for hero picks no to lack of wrapper */
 .brkts-popup-body-element-thumbs.brkts-popup-body-element-thumbs-right {
-	display: inline-flex;
-	flex-direction: row-reverse;
 	justify-content: right;
 }