diff --git a/webapp/public/style_domjudge.css b/webapp/public/style_domjudge.css
index 2bc90accf4..a9c5f89168 100644
--- a/webapp/public/style_domjudge.css
+++ b/webapp/public/style_domjudge.css
@@ -280,9 +280,9 @@ img.affiliation-logo {
 .score_incorrect           { background: #e87272; }
 .score_pending             { background: #6666ff; }
 
-.gold-medal   { background-color: #eec710 }
-.silver-medal { background-color: #aaa }
-.bronze-medal { background-color: #c08e55 }
+.gold-medal   { color: #eec710 }
+.silver-medal { color: #aaa }
+.bronze-medal { color: #c08e55 }
 
 #scoresolv,#scoretotal,#scoresolvmobile,#scoretotalmobile { width: 2.5em; }
 .scorenc,.scorett,.scorepl { text-align: center; width: 2ex; }
diff --git a/webapp/templates/partials/scoreboard_table.html.twig b/webapp/templates/partials/scoreboard_table.html.twig
index 1931b1cb85..e3eaad7b22 100644
--- a/webapp/templates/partials/scoreboard_table.html.twig
+++ b/webapp/templates/partials/scoreboard_table.html.twig
@@ -135,7 +135,10 @@
         {% endif %}
         <tr class="{{ classes | join(' ') }}" data-team-id="{{ score.team.teamid }}">
             {% if enable_ranking %}
-                <td class="scorepl {{medalColor}}">
+                <td class="scorepl">
+                    {% if medalColor != '' %}
+                        <i class="fa fa-medal {{medalColor}}" style="font-size: 1.5rem;"></i>
+                    {% endif %}
                     {# Only print rank when score is different from the previous team #}
                     {% if not displayRank %}
                         ?
@@ -562,23 +565,6 @@
             </tbody>
         </table>
     {% endif %}
-
-    {% if medalsEnabled %}
-        <table class="d-none d-md-table scoreboard scorelegend {% if jury %}scoreboard_jury{% endif %}">
-            <thead>
-            <tr>
-                <th scope="col">Medals {% if not scoreboard.freezeData.showFinal %}(tentative){% endif %}</th>
-            </tr>
-            </thead>
-            <tbody>
-                {% for medalType in ['Gold', 'Silver', 'Bronze'] %}
-                    <tr class="{{ medalType | lower }}-medal">
-                        <td>{{ medalType }} Medal</td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    {% endif %}
 {% endif %}
 
 <script>