diff --git a/zero.Core/Entities/Applications/Application.cs b/zero.Core/Entities/Applications/Application.cs
index 87bd341a..cf64d74d 100644
--- a/zero.Core/Entities/Applications/Application.cs
+++ b/zero.Core/Entities/Applications/Application.cs
@@ -19,10 +19,10 @@ namespace zero.Core.Entities
     public string Email { get; set; }
 
     /// <inheritdoc />
-    public MediaRef ImageId { get; set; }
+    public string ImageId { get; set; }
 
     /// <inheritdoc />
-    public MediaRef IconId { get; set; }
+    public string IconId { get; set; }
 
     /// <inheritdoc />
     public Uri[] Domains { get; set; } = new Uri[] { };
@@ -53,12 +53,12 @@ namespace zero.Core.Entities
     /// <summary>
     /// Image of the application
     /// </summary>
-    MediaRef ImageId { get; set; }
+    string ImageId { get; set; }
 
     /// <summary>
     /// Simple image of the application (can be used as favicon)
     /// </summary>
-    MediaRef IconId { get; set; }
+    string IconId { get; set; }
 
     /// <summary>
     /// All assigned domains for this application
diff --git a/zero.Core/Entities/User/BackofficeUser.cs b/zero.Core/Entities/User/BackofficeUser.cs
index 74f426dc..29d6d7d1 100644
--- a/zero.Core/Entities/User/BackofficeUser.cs
+++ b/zero.Core/Entities/User/BackofficeUser.cs
@@ -32,7 +32,7 @@ namespace zero.Core.Entities
     public string SecurityStamp { get; set; }
 
     /// <inheritdoc/>
-    public MediaRef AvatarId { get; set; }
+    public string AvatarId { get; set; }
 
     /// <inheritdoc/>
     public string LanguageId { get; set; }
@@ -99,7 +99,7 @@ namespace zero.Core.Entities
     /// <summary>
     /// Avatar image
     /// </summary>
-    MediaRef AvatarId { get; set; }
+    string AvatarId { get; set; }
 
     /// <summary>
     /// Backoffice display language