diff --git a/libnymea-core/jsonrpc/jsontypes.cpp b/libnymea-core/jsonrpc/jsontypes.cpp
index 88326016..72de8895 100644
--- a/libnymea-core/jsonrpc/jsontypes.cpp
+++ b/libnymea-core/jsonrpc/jsontypes.cpp
@@ -490,8 +490,8 @@ QVariantMap JsonTypes::allTypes()
     allTypes.insert("UserError", userError());
     allTypes.insert("TagError", tagError());
     allTypes.insert("CloudConnectionState", cloudConnectionState());
-    allTypes.insert("BrowserIcon", browserIconRef());
-    allTypes.insert("MediaBrowserIcon", mediaBrowserIconRef());
+    allTypes.insert("BrowserIcon", browserIcon());
+    allTypes.insert("MediaBrowserIcon", mediaBrowserIcon());
 
     allTypes.insert("StateType", stateTypeDescription());
     allTypes.insert("StateDescriptor", stateDescriptorDescription());
diff --git a/tests/auto/api.json b/tests/auto/api.json
index 35343857..7af31adc 100644
--- a/tests/auto/api.json
+++ b/tests/auto/api.json
@@ -1399,7 +1399,18 @@
             "Time",
             "Object"
         ],
-        "BrowserIcon": "$ref:BrowserIcon",
+        "BrowserIcon": [
+            "BrowserIconNone",
+            "BrowserIconFolder",
+            "BrowserIconFile",
+            "BrowserIconMusic",
+            "BrowserIconVideo",
+            "BrowserIconPictures",
+            "BrowserIconApplication",
+            "BrowserIconDocument",
+            "BrowserIconPackage",
+            "BrowserIconFavorites"
+        ],
         "BrowserItem": {
             "actionTypeIds": [
                 "Uuid"
@@ -1607,7 +1618,26 @@
             "LoggingSourceRules",
             "LoggingSourceBrowserActions"
         ],
-        "MediaBrowserIcon": "$ref:MediaBrowserIcon",
+        "MediaBrowserIcon": [
+            "MediaBrowserIconNone",
+            "MediaBrowserIconPlaylist",
+            "MediaBrowserIconRecentlyPlayed",
+            "MediaBrowserIconLibrary",
+            "MediaBrowserIconMusicLibrary",
+            "MediaBrowserIconVideoLibrary",
+            "MediaBrowserIconPictureLibrary",
+            "MediaBrowserIconDisk",
+            "MediaBrowserIconUSB",
+            "MediaBrowserIconNetwork",
+            "MediaBrowserIconAux",
+            "MediaBrowserIconSpotify",
+            "MediaBrowserIconAmazon",
+            "MediaBrowserIconTuneIn",
+            "MediaBrowserIconSiriusXM",
+            "MediaBrowserIconVTuner",
+            "MediaBrowserIconTidal",
+            "MediaBrowserIconAirable"
+        ],
         "MqttPolicy": {
             "allowedPublishTopicFilters": "StringList",
             "allowedSubscribeTopicFilters": "StringList",
diff --git a/tests/auto/jsonrpc/testjsonrpc.cpp b/tests/auto/jsonrpc/testjsonrpc.cpp
index 86dea687..48121703 100644
--- a/tests/auto/jsonrpc/testjsonrpc.cpp
+++ b/tests/auto/jsonrpc/testjsonrpc.cpp
@@ -616,6 +616,7 @@ void TestJSONRPC::introspect()
             QString typeId = ref;
             typeId.remove("$ref:");
             QVERIFY2(types.contains(typeId), QString("Undefined ref: %1. Did you forget to add it to JsonTypes::allTypes()?").arg(ref).toLatin1().data());
+            QVERIFY2(!types.value(typeId).toString().startsWith("$ref:"), QString("Definition for %1 must not be a reference itself").arg(ref).toLatin1().data());
         }
     }
 }