diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index f1dfdcbe48..40d9f9efdc 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -3674,21 +3674,19 @@ void netplay_refresh_rooms_menu(file_list_t *list)
                netplay_room_list[i].timestamp);
 #endif
          j+=8;
-         snprintf(s, sizeof(s),
-            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME),
+         snprintf(s, sizeof(s), "%s: %s",
+            netplay_room_list[i].lan ? "Local" : 
+            (netplay_room_list[i].host_method == NETPLAY_HOST_METHOD_MITM ? 
+            "Internet (relay)" : "Internet (direct)"),
             netplay_room_list[i].nickname);
 
-         /*
-         netplay_room_list[i - 3].lan ? "LAN game" : 
-         (netplay_room_list[i - 3].host_method == NETPLAY_HOST_METHOD_MITM ? 
-         "MITM game" : "Lobby game"), netplay_room_list[i - 3].address);*/
-
-         int room_type = netplay_room_list[i].lan ? MENU_ROOM_LAN : (netplay_room_list[i].host_method == NETPLAY_HOST_METHOD_MITM ? MENU_ROOM_MITM : MENU_ROOM);
+         /*int room_type = netplay_room_list[i].lan ? MENU_ROOM_LAN : 
+            (netplay_room_list[i].host_method == NETPLAY_HOST_METHOD_MITM ? MENU_ROOM_MITM : MENU_ROOM); */
          menu_entries_append_enum(list,
                s,
                msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM),
                MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM,
-               room_type, 0, 0);
+               MENU_ROOM, 0, 0);
       }
 
       netplay_rooms_free();
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 5e4e50ab45..3198c7c4a9 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -97,8 +97,9 @@ enum
 #ifdef HAVE_NETWORKING
    XMB_TEXTURE_NETPLAY,
    XMB_TEXTURE_ROOM,
+/* stub these out until we have the icons
    XMB_TEXTURE_ROOM_LAN,
-   XMB_TEXTURE_ROOM_MITM,
+   XMB_TEXTURE_ROOM_MITM,*/
 #endif
 #ifdef HAVE_IMAGEVIEWER
    XMB_TEXTURE_IMAGES,
@@ -2150,10 +2151,11 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
 #ifdef HAVE_NETWORKING
       case MENU_ROOM:
          return xmb->textures.list[XMB_TEXTURE_ROOM];
+      /* stub these out until we have the icons
       case MENU_ROOM_LAN:
          return xmb->textures.list[XMB_TEXTURE_ROOM_LAN];
       case MENU_ROOM_MITM:
-         return xmb->textures.list[XMB_TEXTURE_ROOM_MITM];
+         return xmb->textures.list[XMB_TEXTURE_ROOM_MITM]; */
 #endif
    }
 
@@ -3534,10 +3536,12 @@ static const char *xmb_texture_path(unsigned id)
          return "netplay.png";
       case XMB_TEXTURE_ROOM:
          return "room.png";
+      /* stub these out until we have the icons
       case XMB_TEXTURE_ROOM_LAN:
          return "room_lan.png";
       case XMB_TEXTURE_ROOM_MITM:
          return "room_mitm.png";
+      */
 #endif
       case XMB_TEXTURE_KEY:
          return "key.png";
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 1e8af0af8b..a019ab891f 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -167,8 +167,10 @@ enum menu_settings_type
    MENU_SETTING_HORIZONTAL_MENU,
    MENU_WIFI,
    MENU_ROOM,
+/*
    MENU_ROOM_LAN,
    MENU_ROOM_MITM,
+*/
    MENU_NETPLAY_LAN_SCAN,
    MENU_INFO_MESSAGE,
    MENU_SETTINGS_SHADER_PARAMETER_0,