diff --git a/web/plugin.head.html b/web/plugin.head.html
index efb04f8..6ec24c0 100644
--- a/web/plugin.head.html
+++ b/web/plugin.head.html
@@ -2315,6 +2315,12 @@
                 return localMetadata;
             }
 
+            var rowMetadata = getPoliticTalkRoleMetadataFromElement(row);
+
+            if (rowMetadata) {
+                return rowMetadata;
+            }
+
             var matchingTile = null;
 
             if (videospace && endpointId) {
@@ -2336,7 +2342,7 @@
                     || getPoliticTalkGuestRoleMetadata();
             }
 
-            return getPoliticTalkRoleMetadataFromElement(row) || getPoliticTalkGuestRoleMetadata();
+            return getPoliticTalkGuestRoleMetadata();
         }
 
         function isPoliticTalkParticipantPaneAvatar(element) {
@@ -2499,6 +2505,16 @@
             var matchesName = function(value) {
                 return normalizedNames.indexOf(normalizePoliticTalkText(normalizePoliticTalkDisplayName(value))) !== -1;
             };
+            var matchingRow = getPoliticTalkParticipantPaneRows().find(function(row) {
+                return matchesName(getPoliticTalkParticipantPaneDisplayName(row));
+            });
+
+            if (matchingRow) {
+                return getPoliticTalkRoleMetadataFromElement(matchingRow)
+                    || getPoliticTalkParticipantPaneRoleMetadata(matchingRow, videospace, tiles, thumbnails)
+                    || null;
+            }
+
             var candidates = (tiles || []).concat(thumbnails || []);
             var matchingTile = candidates.find(function(tile) {
                 return matchesName(getPoliticTalkVisibleDisplayName(tile));
@@ -2510,16 +2526,6 @@
                     || null;
             }
 
-            var matchingRow = getPoliticTalkParticipantPaneRows().find(function(row) {
-                return matchesName(getPoliticTalkParticipantPaneDisplayName(row));
-            });
-
-            if (matchingRow) {
-                return getPoliticTalkParticipantPaneRoleMetadata(matchingRow, videospace, tiles, thumbnails)
-                    || getPoliticTalkRoleMetadataFromElement(matchingRow)
-                    || null;
-            }
-
             return null;
         }
 
@@ -2771,6 +2777,9 @@
             var dominantName = getPoliticTalkVisibleDisplayName(
                 videospace.querySelector('[data-testid="stage-display-name"]')
             );
+
+            applyPoliticTalkParticipantPaneAvatarTheme(videospace, tiles, thumbnails);
+
             var dominantMetadata = getPoliticTalkDominantSpeakerRoleMetadata(videospace, tiles, thumbnails);
 
             applyPoliticTalkLargeVideoLayout(videospace, tiles);