diff --git a/data/gui/soccer_setup.stkgui b/data/gui/soccer_setup.stkgui
index a0d6683ca..9782f17b5 100644
--- a/data/gui/soccer_setup.stkgui
+++ b/data/gui/soccer_setup.stkgui
@@ -37,8 +37,8 @@
             <roundedbox y="5%" width="100%" layout="horizontal-row" height="95%">
                 <!-- Content is added programmatically -->
             </roundedbox>
-            <bright I18N="In soccer setup screen" id="red_team" text="Red Team"/>     <!-- Layout is done programmatically -->
-            <bright I18N="In soccer setup screen" id="blue_team" text="Blue Team"/>
+            <icon id="red_team" I18N="In soccer setup screen" text="Red Team" icon="gui/soccer_ball_red.png" width="font" height="font"/>  <!-- Layout is done programmatically -->
+            <icon id="blue_team" I18N="In soccer setup screen" text="Blue Team" icon="gui/soccer_ball_blue.png" width="font" height="font"/>
         </div>
 
         <button id="continue" I18N="In soccer setup screen" text="Continue" align="center" width="60%"/>
diff --git a/src/states_screens/soccer_setup_screen.cpp b/src/states_screens/soccer_setup_screen.cpp
index 6b6c38a60..63800867b 100644
--- a/src/states_screens/soccer_setup_screen.cpp
+++ b/src/states_screens/soccer_setup_screen.cpp
@@ -109,23 +109,14 @@ void SoccerSetupScreen::beforeAddingWidget()
 {
     Widget* central_div = getWidget<Widget>("central_div");
 
-    // Compute some dimensions
-    const core::dimension2d<u32>    text_size = GUIEngine::getFont()->getDimension( L"X" );
-    const int text_width = (int)text_size.Width;
-    const int text_height = (int)text_size.Height;
+    // Add red/blue team icon above the karts
+    IconButtonWidget*    red = getWidget<IconButtonWidget>("red_team");
+    IconButtonWidget*    blue = getWidget<IconButtonWidget>("blue_team");
+    red->m_x = central_div->m_x + central_div->m_w/4;
+    red->m_y = central_div->m_y + red->m_h;
 
-    // Add team name label above the karts
-    LabelWidget*    label_red = getWidget<LabelWidget>("red_team");
-    LabelWidget*    label_blue = getWidget<LabelWidget>("blue_team");
-    label_red->m_x = central_div->m_x + central_div->m_w/4;
-    label_red->m_y = central_div->m_y + text_height;
-    label_red->m_w = text_width;
-    label_red->m_h = text_height;
-
-    label_blue->m_x = central_div->m_x + (central_div->m_w/4)*3;
-    label_blue->m_y = central_div->m_y + text_height;
-    label_blue->m_w = text_width;
-    label_blue->m_h = text_height;
+    blue->m_x = central_div->m_x + (central_div->m_w/4)*3;
+    blue->m_y = central_div->m_y + blue->m_h;
 
     // Add the 3D views for the karts
     int nb_players = race_manager->getNumPlayers();