diff --git a/bin/data/cmclient-5.grf b/bin/data/cmclient-5.grf
index 8ee4f24b97..0232d36916 100644
Binary files a/bin/data/cmclient-5.grf and b/bin/data/cmclient-5.grf differ
diff --git a/grf/cmclient/gencmclientgrf.py b/grf/cmclient/gencmclientgrf.py
index d527e177cb..cc37d83792 100644
--- a/grf/cmclient/gencmclientgrf.py
+++ b/grf/cmclient/gencmclientgrf.py
@@ -13,13 +13,17 @@ gen.add_sprite(grf.FileSprite(toolbar_png, 0, 0, 20, 14, yofs=4),
 
 sprite = lambda *args, **kw: gen.add_sprite(grf.FileSprite(toolbar_png, *args, **kw))
 sprite2 = lambda x, y, w, h, x2, y2: gen.add_sprite(grf.FileSprite(toolbar_png, x, y, w, h), grf.FileSprite(toolbar_png, x2, y2, w * 2, h * 2, zoom=grf.ZOOM_2X))
-sprite( 0, 44, 12, 10) # hq button icon
-for i in range(3):
-    for j in range(4):
-        sprite(66 + 20 * j, 44 + 11 * i, 10, 10)
-sprite2( 0, 82, 11, 11,  0, 94)
-sprite2(12, 82, 11, 11, 23, 94)
-sprite2(24, 82, 11, 11, 47, 94)
+sprite( 0, 44, 12, 10)  # hq button icon
+
+sprite( 45, 67, 10, 10)  # host black
+sprite( 45, 44, 10, 10)  # player black
+
+sprite2(85, 67, 11, 11, 97, 67)  # host white
+sprite2(85, 44, 11, 11, 97, 44)  # player white
+
+sprite2( 0, 82, 11, 11,  0, 94)  # competitor coloured
+sprite2(12, 82, 11, 11, 23, 94)  # host coloured
+sprite2(24, 82, 11, 11, 46, 94)  # player coloured
 
 innerhl_png = grf.ImageFile('sprites/innerhighlight00.png')
 sprite = lambda *args, **kw: gen.add_sprite(grf.FileSprite(innerhl_png, *args, **kw))
diff --git a/grf/cmclient/sprites/toolbar.png b/grf/cmclient/sprites/toolbar.png
index 08fb9cee49..4df996e7c0 100644
Binary files a/grf/cmclient/sprites/toolbar.png and b/grf/cmclient/sprites/toolbar.png differ
diff --git a/src/citymania/cm_client_list_gui.cpp b/src/citymania/cm_client_list_gui.cpp
index f953ef7f28..85bdd69d96 100644
--- a/src/citymania/cm_client_list_gui.cpp
+++ b/src/citymania/cm_client_list_gui.cpp
@@ -164,8 +164,8 @@ public:
 
         const std::pair<TextColour, SpriteID> STYLES[] = {
             {TC_SILVER, PAL_NONE},
-            {TC_ORANGE, CM_SPR_HOST2},
-            {TC_WHITE , CM_SPR_PLAYER_W2},
+            {TC_ORANGE, CM_SPR_HOST_WHITE},
+            {TC_WHITE , CM_SPR_PLAYER_WHITE},
             {TC_SILVER, CM_SPR_COMPANY_ICON},
             {TC_ORANGE, CM_SPR_COMPANY_ICON_HOST},
             {TC_WHITE , CM_SPR_COMPANY_ICON_PLAYER},
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index e962dfa1dd..ac1d404041 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -2142,9 +2142,9 @@ public:
 
 				SpriteID player_icon = 0;
 				if (ci->client_id == _network_own_client_id) {
-					player_icon = CM_SPR_PLAYER1 /* SPR_PLAYER_SELF */;
+					player_icon = CM_SPR_PLAYER /* SPR_PLAYER_SELF */;
 				} else if (ci->client_id == CLIENT_ID_SERVER) {
-					player_icon = CM_SPR_HOST1 /* SPR_PLAYER_HOST */;
+					player_icon = CM_SPR_HOST /* SPR_PLAYER_HOST */;
 				}
 
 				if (player_icon != 0) {
diff --git a/src/table/sprites.h b/src/table/sprites.h
index c23776df8e..954a9c6957 100644
--- a/src/table/sprites.h
+++ b/src/table/sprites.h
@@ -312,21 +312,15 @@ static const uint16 PALETTE_SPRITE_COUNT = 1;
 /* CityMania extra sprites */
 static const SpriteID CM_SPR_CITYMANIA_BASE            = SPR_PALETTE_BASE + PALETTE_SPRITE_COUNT;
 static const SpriteID CM_SPR_RAIL_COPY_PASTE           = CM_SPR_CITYMANIA_BASE + 2;
-static const SpriteID CM_SPR_HQ                        = CM_SPR_CITYMANIA_BASE + 4;
-static const SpriteID CM_SPR_PLAYER1                   = CM_SPR_CITYMANIA_BASE + 5;
-static const SpriteID CM_SPR_PLAYER2                   = CM_SPR_PLAYER1 + 1;
-static const SpriteID CM_SPR_PLAYER3                   = CM_SPR_PLAYER1 + 2;
-static const SpriteID CM_SPR_PLAYER4                   = CM_SPR_PLAYER1 + 3;
-static const SpriteID CM_SPR_PLAYER_W1                 = CM_SPR_PLAYER1 + 4;
-static const SpriteID CM_SPR_PLAYER_W2                 = CM_SPR_PLAYER1 + 5;
-static const SpriteID CM_SPR_HOST1                     = CM_SPR_PLAYER1 + 8;
-static const SpriteID CM_SPR_HOST2                     = CM_SPR_PLAYER1 + 9;
-static const SpriteID CM_SPR_HOST3                     = CM_SPR_PLAYER1 + 10;
-static const SpriteID CM_SPR_HOST4                     = CM_SPR_PLAYER1 + 11;
-static const SpriteID CM_SPR_COMPANY_ICON              = CM_SPR_PLAYER1 + 12;
-static const SpriteID CM_SPR_COMPANY_ICON_HOST         = CM_SPR_PLAYER1 + 13;
-static const SpriteID CM_SPR_COMPANY_ICON_PLAYER       = CM_SPR_PLAYER1 + 14;
-static const SpriteID CM_SPR_INNER_HIGHLIGHT_BASE      = CM_SPR_CITYMANIA_BASE + 20;
+static const SpriteID CM_SPR_HQ                        = CM_SPR_CITYMANIA_BASE + 3;
+static const SpriteID CM_SPR_HOST                      = CM_SPR_CITYMANIA_BASE + 4;
+static const SpriteID CM_SPR_PLAYER                    = CM_SPR_HOST + 1;
+static const SpriteID CM_SPR_HOST_WHITE                = CM_SPR_HOST + 2;
+static const SpriteID CM_SPR_PLAYER_WHITE              = CM_SPR_HOST + 3;
+static const SpriteID CM_SPR_COMPANY_ICON              = CM_SPR_HOST + 4;
+static const SpriteID CM_SPR_COMPANY_ICON_HOST         = CM_SPR_HOST + 5;
+static const SpriteID CM_SPR_COMPANY_ICON_PLAYER       = CM_SPR_HOST + 6;
+static const SpriteID CM_SPR_INNER_HIGHLIGHT_BASE      = CM_SPR_COMPANY_ICON_PLAYER + 1;
 static const SpriteID CM_SPR_IMG_COMPANY_CARGO         = CM_SPR_INNER_HIGHLIGHT_BASE + 19;
 static const SpriteID CM_SPR_IMG_COMPANY_GOAL          = CM_SPR_INNER_HIGHLIGHT_BASE + 20;
 static const SpriteID CM_SPR_IMG_HOUSE_NEW             = CM_SPR_INNER_HIGHLIGHT_BASE + 21;