diff --git a/zero.Core/Api/MediaApi.cs b/zero.Core/Api/MediaApi.cs
index df132db5..b1a463e9 100644
--- a/zero.Core/Api/MediaApi.cs
+++ b/zero.Core/Api/MediaApi.cs
@@ -1,42 +1,108 @@
 using Raven.Client.Documents;
 using Raven.Client.Documents.Session;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using zero.Core.Database.Indexes;
 using zero.Core.Entities;
 using zero.Core.Extensions;
 using zero.Core.Validation;
 
 namespace zero.Core.Api
 {
-  public class MediaApi : ApiBase, IMediaApi
+  public class MediaApi : IMediaApi
   {
-    public MediaApi(IDocumentStore raven, IMediaUpload media) : base(raven, media) { }
+    protected IAppAwareBackofficeStore Backoffice { get; private set; }
+
+
+    public MediaApi(IAppAwareBackofficeStore backoffice)
+    {
+      Backoffice = backoffice;
+    }
+
+
+    /// <inheritdoc />
+    public async Task<Media> GetById(string id)
+    {
+      return await Backoffice.GetById<Media>(id);
+    }
+
+
+    /// <inheritdoc />
+    public async Task<ListResult<Media>> GetByQuery(MediaListQuery query)
+    {
+      query.SearchFor(entity => entity.Name);
+
+      using (IAsyncDocumentSession session = Backoffice.Raven.OpenAsyncSession())
+      {
+        return await session.Query<Media>()
+          .ForApp(Backoffice.AppId)
+          .WhereIf(x => x.FolderId == query.Filter.FolderId, query.Filter != null && !query.Filter.FolderId.IsNullOrEmpty())
+          .ToQueriedListAsync(query);
+      }
+    }
+
+
+    /// <inheritdoc />
+    public async Task<EntityResult<Media>> Save(Media model)
+    {
+      return await Backoffice.Save(model);
+    }
+
+
+    /// <inheritdoc />
+    public async Task<EntityResult<Media>> Delete(string id)
+    {
+      return await Backoffice.DeleteById<Media>(id);
+    }
 
 
     /// <inheritdoc />
     public async Task<IList<MediaFolder>> GetFolders(string parentId = null)
     {
-      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
+      using (IAsyncDocumentSession session = Backoffice.Raven.OpenAsyncSession())
       {
         return await session.Query<MediaFolder>()
+          .ForApp(Backoffice.AppId)
+          .WhereIf(x => x.ParentId == parentId, !parentId.IsNullOrEmpty(), x => x.ParentId == null)
           .OrderByDescending(x => x.Name)
-          .WhereIf(x => x.ParentId == parentId, !parentId.IsNullOrEmpty())
           .ToListAsync();
       }
     }
 
 
+    /// <inheritdoc />
+    public async Task<IList<MediaFolder>> GetFolderHierarchy(string id)
+    {
+      using (IAsyncDocumentSession session = Backoffice.Raven.OpenAsyncSession())
+      {
+        MediaFolder_ByHierarchy.Result result = await session.Query<MediaFolder_ByHierarchy.Result, MediaFolder_ByHierarchy>()
+          .ProjectInto<MediaFolder_ByHierarchy.Result>()
+          .Include<MediaFolder_ByHierarchy.Result, MediaFolder>(x => x.Path.Select(p => p.Id))
+          .ForApp(Backoffice.AppId)
+          .FirstOrDefaultAsync(x => x.Id == id);
+
+        if (result == null)
+        {
+          return new List<MediaFolder>();
+        }
+
+        return (await session.LoadAsync<MediaFolder>(result.Path.Select(x => x.Id))).Select(x => x.Value).ToList();
+      }
+    }
+
+
     /// <inheritdoc />
     public async Task<EntityResult<MediaFolder>> SaveFolder(MediaFolder model)
     {
-      return await Save(model, new MediaFolderValidator());
+      return await Backoffice.Save(model, new MediaFolderValidator());
     }
 
 
     /// <inheritdoc />
     public async Task<EntityResult<MediaFolder>> DeleteFolder(string id)
     {
-      return await DeleteById<MediaFolder>(id);
+      return await Backoffice.DeleteById<MediaFolder>(id);
     }
 
 
@@ -50,6 +116,31 @@ namespace zero.Core.Api
 
   public interface IMediaApi
   {
+    /// <summary>
+    /// Get application by Id
+    /// </summary>
+    Task<Media> GetById(string id);
+
+    /// <summary>
+    /// Get all available media items (with query)
+    /// </summary>
+    Task<ListResult<Media>> GetByQuery(MediaListQuery query);
+
+    /// <summary>
+    /// Creates or updates a application
+    /// </summary>
+    Task<EntityResult<Media>> Save(Media model);
+
+    /// <summary>
+    /// Deletes a application by Id
+    /// </summary>
+    Task<EntityResult<Media>> Delete(string id);
+
+    /// <summary>
+    /// Get hierarchy for a folder
+    /// </summary>
+    Task<IList<MediaFolder>> GetFolderHierarchy(string id);
+
     /// <summary>
     /// Get all folders with the specified parent or on root
     /// </summary>
diff --git a/zero.Core/Api/SetupApi.cs b/zero.Core/Api/SetupApi.cs
index f527e185..16f2712f 100644
--- a/zero.Core/Api/SetupApi.cs
+++ b/zero.Core/Api/SetupApi.cs
@@ -11,6 +11,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using zero.Core.Entities;
 using zero.Core.Entities.Setup;
+using zero.Core.Extensions;
 using zero.Core.Identity;
 using zero.Core.Options;
 using zero.Core.Validation;
@@ -55,12 +56,16 @@ namespace zero.Core.Api
           Database = model.Database.Name
         };
 
+        raven.Conventions.IdentityPartsSeparator = ".";
         raven.Conventions.FindCollectionName = type =>
         {
           return Constants.Database.CollectionPrefix + DocumentConventions.DefaultGetCollectionName(type);
         };
+        raven.Conventions.TransformTypeCollectionNameToDocumentIdPrefix = name =>
+        {
+          return name.Replace(Constants.Database.CollectionPrefix, Constants.Database.CollectionPrefix + raven.Conventions.IdentityPartsSeparator).ToCamelCaseId();
+        };
 
-        raven.Conventions.IdentityPartsSeparator = ".";
 
         raven.Initialize();
 
@@ -97,6 +102,7 @@ namespace zero.Core.Api
           IsDefault = true
         };
 
+        // TODO UserManager uses the DI resolved IDocumentStore instance which should not be available at this point??
         IdentityResult result = await UserManager.CreateAsync(user, model.User.Password);
 
         // user creation failed
diff --git a/zero.Core/Constants.cs b/zero.Core/Constants.cs
index 5063dc28..6e10304d 100644
--- a/zero.Core/Constants.cs
+++ b/zero.Core/Constants.cs
@@ -29,7 +29,7 @@
     public static class Database
     {
       public const string SharedAppId = "shared";
-      public const string CollectionPrefix = "zero.";
+      public const string CollectionPrefix = "zero"; // TODO initially we had a dot (zero.) suffix here, but that did not work out anymore when it comes to index creation
       public const string ReservationPrefix = "zero.";
       public const string Expires = Raven.Client.Constants.Documents.Metadata.Expires;
     }
diff --git a/zero.Core/Database/Indexes/MediaFolder_ByHierarchy.cs b/zero.Core/Database/Indexes/MediaFolder_ByHierarchy.cs
new file mode 100644
index 00000000..7dd67c27
--- /dev/null
+++ b/zero.Core/Database/Indexes/MediaFolder_ByHierarchy.cs
@@ -0,0 +1,53 @@
+using Raven.Client.Documents.Indexes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using zero.Core.Entities;
+
+namespace zero.Core.Database.Indexes
+{
+  public class MediaFolder_ByHierarchy : AbstractIndexCreationTask<MediaFolder, MediaFolder_ByHierarchy.Result>
+  {
+    public class Result : IZeroIdEntity, IAppAwareEntity, IZeroDbConventions
+    {
+      public string Id { get; set; }
+
+      public string AppId { get; set; }
+
+      public string Name { get; set; }
+
+      public List<PathResult> Path { get; set; } = new List<PathResult>();
+    }
+
+
+    public class PathResult
+    {
+      public string Id { get; set; }
+
+      public string Name { get; set; }
+    }
+
+
+    public MediaFolder_ByHierarchy()
+    {
+      Map = items => items.Select(item => new Result
+      {
+        Id = item.Id,
+        Name = item.Name,
+        AppId = item.AppId,
+        Path = Recurse(item, x => LoadDocument<MediaFolder>(x.ParentId))
+                .Where(x => x != null && x.Id != null && x.Id != item.Id)
+                .Reverse()
+                .Select(current => new PathResult()
+                {
+                  Id = current.Id,
+                  Name = current.Name
+                })
+                .ToList()
+      });
+
+      StoreAllFields(FieldStorage.Yes);
+      //Index(x => x.ChannelId, FieldIndexing.Exact);
+    }
+  }
+}
diff --git a/zero.Core/Entities/Applications/Application.cs b/zero.Core/Entities/Applications/Application.cs
index 6f6dd923..e3d433e3 100644
--- a/zero.Core/Entities/Applications/Application.cs
+++ b/zero.Core/Entities/Applications/Application.cs
@@ -20,12 +20,12 @@ namespace zero.Core.Entities
     /// <summary>
     /// Image of the application
     /// </summary>
-    public Media Image { get; set; }
+    public string ImageId { get; set; }
 
     /// <summary>
     /// Simple image of the application (used as favicon)
     /// </summary>
-    public Media Icon { get; set; }
+    public string IconId { get; set; }
 
     /// <summary>
     /// All assigned domains for this application
diff --git a/zero.Core/Entities/Media/MediaListQuery.cs b/zero.Core/Entities/Media/MediaListQuery.cs
new file mode 100644
index 00000000..1aed4be7
--- /dev/null
+++ b/zero.Core/Entities/Media/MediaListQuery.cs
@@ -0,0 +1,13 @@
+namespace zero.Core.Entities
+{
+  public class MediaListQuery : ListQuery<Media, MediaListFilter>
+  {
+
+  }
+
+
+  public class MediaListFilter : IListSpecificQuery
+  {
+    public string FolderId { get; set; }
+  }
+}
diff --git a/zero.Core/Entities/User/User.cs b/zero.Core/Entities/User/User.cs
index 938bce62..eea1b3c2 100644
--- a/zero.Core/Entities/User/User.cs
+++ b/zero.Core/Entities/User/User.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace zero.Core.Entities
 {
-  public class User : ZeroEntity, IUser
+  public class User : ZeroEntity, IUser, IZeroDbConventions
   {
     /// <inheritdoc />
     public string AppId { get; set; }
diff --git a/zero.Core/Entities/User/UserRole.cs b/zero.Core/Entities/User/UserRole.cs
index aab6e533..9032a70f 100644
--- a/zero.Core/Entities/User/UserRole.cs
+++ b/zero.Core/Entities/User/UserRole.cs
@@ -2,7 +2,7 @@
 
 namespace zero.Core.Entities
 {
-  public class UserRole : ZeroEntity, IUserRole
+  public class UserRole : ZeroEntity, IUserRole, IZeroDbConventions
   {
     /// <inheritdoc />
     public string AppId { get; set; }
diff --git a/zero.Core/Extensions/QueryableExtensions.cs b/zero.Core/Extensions/QueryableExtensions.cs
index 7b3725a7..f0ad947c 100644
--- a/zero.Core/Extensions/QueryableExtensions.cs
+++ b/zero.Core/Extensions/QueryableExtensions.cs
@@ -57,7 +57,7 @@ namespace zero.Core.Extensions
     }
 
 
-    public static IQueryable<T> WhereIf<T>(this IQueryable<T> source, Expression<Func<T, bool>> predicate, bool condition, Expression<Func<T, bool>> elsePredicate = null)
+    public static IRavenQueryable<T> WhereIf<T>(this IRavenQueryable<T> source, Expression<Func<T, bool>> predicate, bool condition, Expression<Func<T, bool>> elsePredicate = null)
     {
       if (!condition)
       {
diff --git a/zero.Core/Extensions/RavenQueryableExtensions.cs b/zero.Core/Extensions/RavenQueryableExtensions.cs
index f87960e0..cf449b96 100644
--- a/zero.Core/Extensions/RavenQueryableExtensions.cs
+++ b/zero.Core/Extensions/RavenQueryableExtensions.cs
@@ -68,5 +68,45 @@ namespace zero.Core.Extensions
 
       return new ListResult<T>(items, stats.TotalResults, query.Page, query.PageSize);
     }
+
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static async Task<ListResult<T>> ToQueriedListAsync<T, TFilter>(this IRavenQueryable<T> queryable, ListQuery<T, TFilter> query) where TFilter : IListSpecificQuery
+    {
+      queryable = queryable.Statistics(out QueryStatistics stats);
+
+      IQueryable<T> rawQuery = queryable;
+
+      if (query != null)
+      {
+        if (!query.Search.IsNullOrEmpty() && query.SearchSelector != null)
+        {
+          rawQuery = rawQuery.SearchIf(query.SearchSelector, query.Search, "*", "*");
+        }
+        if (!query.Search.IsNullOrEmpty() && query.SearchSelectors.Length > 0)
+        {
+          foreach (var selector in query.SearchSelectors)
+          {
+            rawQuery = rawQuery.SearchIf(selector, query.Search, "*", "*", Raven.Client.Documents.Queries.SearchOperator.Or);
+          }
+        }
+
+        if (!query.OrderBy.IsNullOrEmpty())
+        {
+          rawQuery = rawQuery.OrderBy(query.OrderBy, query.OrderIsDescending, query.OrderType == ListQueryOrderType.String ? OrderingType.String : OrderingType.Double);
+        }
+
+        if (query.PageSize > 0)
+        {
+          rawQuery = rawQuery.Paging(query.Page, query.PageSize);
+        }
+      }
+
+      List<T> items = await rawQuery.ToListAsync();
+
+      return new ListResult<T>(items, stats.TotalResults, query.Page, query.PageSize);
+    }
   }
 }
diff --git a/zero.Debug/Resources/Countries/countries.de-de.json b/zero.Debug/Resources/Countries/countries.de-de.json
new file mode 100644
index 00000000..78384674
--- /dev/null
+++ b/zero.Debug/Resources/Countries/countries.de-de.json
@@ -0,0 +1,257 @@
+{
+  "AF": "Afghanistan",
+  "EG": "\u00c4gypten",
+  "AX": "\u00c5landinseln",
+  "AL": "Albanien",
+  "DZ": "Algerien",
+  "AS": "Amerikanisch-Samoa",
+  "VI": "Amerikanische Jungferninseln",
+  "UM": "Amerikanische \u00dcberseeinseln",
+  "AD": "Andorra",
+  "AO": "Angola",
+  "AI": "Anguilla",
+  "AQ": "Antarktis",
+  "AG": "Antigua und Barbuda",
+  "GQ": "\u00c4quatorialguinea",
+  "AR": "Argentinien",
+  "AM": "Armenien",
+  "AW": "Aruba",
+  "AC": "Ascension",
+  "AZ": "Aserbaidschan",
+  "ET": "\u00c4thiopien",
+  "AU": "Australien",
+  "BS": "Bahamas",
+  "BH": "Bahrain",
+  "BD": "Bangladesch",
+  "BB": "Barbados",
+  "BY": "Belarus",
+  "BE": "Belgien",
+  "BZ": "Belize",
+  "BJ": "Benin",
+  "BM": "Bermuda",
+  "BT": "Bhutan",
+  "BO": "Bolivien",
+  "BQ": "Bonaire, Sint Eustatius und Saba",
+  "BA": "Bosnien und Herzegowina",
+  "BW": "Botsuana",
+  "BR": "Brasilien",
+  "VG": "Britische Jungferninseln",
+  "IO": "Britisches Territorium im Indischen Ozean",
+  "BN": "Brunei Darussalam",
+  "BG": "Bulgarien",
+  "BF": "Burkina Faso",
+  "BI": "Burundi",
+  "CV": "Cabo Verde",
+  "EA": "Ceuta und Melilla",
+  "CL": "Chile",
+  "CN": "China",
+  "CK": "Cookinseln",
+  "CR": "Costa Rica",
+  "CI": "C\u00f4te d\u2019Ivoire",
+  "CW": "Cura\u00e7ao",
+  "DK": "D\u00e4nemark",
+  "DE": "Deutschland",
+  "DG": "Diego Garcia",
+  "DM": "Dominica",
+  "DO": "Dominikanische Republik",
+  "DJ": "Dschibuti",
+  "EC": "Ecuador",
+  "SV": "El Salvador",
+  "ER": "Eritrea",
+  "EE": "Estland",
+  "FK": "Falklandinseln",
+  "FO": "F\u00e4r\u00f6er",
+  "FJ": "Fidschi",
+  "FI": "Finnland",
+  "FR": "Frankreich",
+  "GF": "Franz\u00f6sisch-Guayana",
+  "PF": "Franz\u00f6sisch-Polynesien",
+  "TF": "Franz\u00f6sische S\u00fcd- und Antarktisgebiete",
+  "GA": "Gabun",
+  "GM": "Gambia",
+  "GE": "Georgien",
+  "GH": "Ghana",
+  "GI": "Gibraltar",
+  "GD": "Grenada",
+  "GR": "Griechenland",
+  "GL": "Gr\u00f6nland",
+  "GP": "Guadeloupe",
+  "GU": "Guam",
+  "GT": "Guatemala",
+  "GG": "Guernsey",
+  "GN": "Guinea",
+  "GW": "Guinea-Bissau",
+  "GY": "Guyana",
+  "HT": "Haiti",
+  "HN": "Honduras",
+  "IN": "Indien",
+  "ID": "Indonesien",
+  "IQ": "Irak",
+  "IR": "Iran",
+  "IE": "Irland",
+  "IS": "Island",
+  "IM": "Isle of Man",
+  "IL": "Israel",
+  "IT": "Italien",
+  "JM": "Jamaika",
+  "JP": "Japan",
+  "YE": "Jemen",
+  "JE": "Jersey",
+  "JO": "Jordanien",
+  "KY": "Kaimaninseln",
+  "KH": "Kambodscha",
+  "CM": "Kamerun",
+  "CA": "Kanada",
+  "IC": "Kanarische Inseln",
+  "KZ": "Kasachstan",
+  "QA": "Katar",
+  "KE": "Kenia",
+  "KG": "Kirgisistan",
+  "KI": "Kiribati",
+  "CC": "Kokosinseln",
+  "CO": "Kolumbien",
+  "KM": "Komoren",
+  "CG": "Kongo-Brazzaville",
+  "CD": "Kongo-Kinshasa",
+  "XK": "Kosovo",
+  "HR": "Kroatien",
+  "CU": "Kuba",
+  "KW": "Kuwait",
+  "LA": "Laos",
+  "LS": "Lesotho",
+  "LV": "Lettland",
+  "LB": "Libanon",
+  "LR": "Liberia",
+  "LY": "Libyen",
+  "LI": "Liechtenstein",
+  "LT": "Litauen",
+  "LU": "Luxemburg",
+  "MG": "Madagaskar",
+  "MW": "Malawi",
+  "MY": "Malaysia",
+  "MV": "Malediven",
+  "ML": "Mali",
+  "MT": "Malta",
+  "MA": "Marokko",
+  "MH": "Marshallinseln",
+  "MQ": "Martinique",
+  "MR": "Mauretanien",
+  "MU": "Mauritius",
+  "YT": "Mayotte",
+  "MX": "Mexiko",
+  "FM": "Mikronesien",
+  "MC": "Monaco",
+  "MN": "Mongolei",
+  "ME": "Montenegro",
+  "MS": "Montserrat",
+  "MZ": "Mosambik",
+  "MM": "Myanmar",
+  "NA": "Namibia",
+  "NR": "Nauru",
+  "NP": "Nepal",
+  "NC": "Neukaledonien",
+  "NZ": "Neuseeland",
+  "NI": "Nicaragua",
+  "NL": "Niederlande",
+  "NE": "Niger",
+  "NG": "Nigeria",
+  "NU": "Niue",
+  "KP": "Nordkorea",
+  "MP": "N\u00f6rdliche Marianen",
+  "MK": "Nordmazedonien",
+  "NF": "Norfolkinsel",
+  "NO": "Norwegen",
+  "OM": "Oman",
+  "AT": "\u00d6sterreich",
+  "PK": "Pakistan",
+  "PS": "Pal\u00e4stinensische Autonomiegebiete",
+  "PW": "Palau",
+  "PA": "Panama",
+  "PG": "Papua-Neuguinea",
+  "PY": "Paraguay",
+  "PE": "Peru",
+  "PH": "Philippinen",
+  "PN": "Pitcairninseln",
+  "PL": "Polen",
+  "PT": "Portugal",
+  "XA": "Pseudo-Accents",
+  "XB": "Pseudo-Bidi",
+  "PR": "Puerto Rico",
+  "MD": "Republik Moldau",
+  "RE": "R\u00e9union",
+  "RW": "Ruanda",
+  "RO": "Rum\u00e4nien",
+  "RU": "Russland",
+  "SB": "Salomonen",
+  "ZM": "Sambia",
+  "WS": "Samoa",
+  "SM": "San Marino",
+  "ST": "S\u00e3o Tom\u00e9 und Pr\u00edncipe",
+  "SA": "Saudi-Arabien",
+  "SE": "Schweden",
+  "CH": "Schweiz",
+  "SN": "Senegal",
+  "RS": "Serbien",
+  "SC": "Seychellen",
+  "SL": "Sierra Leone",
+  "ZW": "Simbabwe",
+  "SG": "Singapur",
+  "SX": "Sint Maarten",
+  "SK": "Slowakei",
+  "SI": "Slowenien",
+  "SO": "Somalia",
+  "HK": "Sonderverwaltungsregion Hongkong",
+  "MO": "Sonderverwaltungsregion Macau",
+  "ES": "Spanien",
+  "SJ": "Spitzbergen und Jan Mayen",
+  "LK": "Sri Lanka",
+  "BL": "St. Barth\u00e9lemy",
+  "SH": "St. Helena",
+  "KN": "St. Kitts und Nevis",
+  "LC": "St. Lucia",
+  "MF": "St. Martin",
+  "PM": "St. Pierre und Miquelon",
+  "VC": "St. Vincent und die Grenadinen",
+  "ZA": "S\u00fcdafrika",
+  "SD": "Sudan",
+  "GS": "S\u00fcdgeorgien und die S\u00fcdlichen Sandwichinseln",
+  "KR": "S\u00fcdkorea",
+  "SS": "S\u00fcdsudan",
+  "SR": "Suriname",
+  "SZ": "Swasiland",
+  "SY": "Syrien",
+  "TJ": "Tadschikistan",
+  "TW": "Taiwan",
+  "TZ": "Tansania",
+  "TH": "Thailand",
+  "TL": "Timor-Leste",
+  "TG": "Togo",
+  "TK": "Tokelau",
+  "TO": "Tonga",
+  "TT": "Trinidad und Tobago",
+  "TA": "Tristan da Cunha",
+  "TD": "Tschad",
+  "CZ": "Tschechien",
+  "TN": "Tunesien",
+  "TR": "T\u00fcrkei",
+  "TM": "Turkmenistan",
+  "TC": "Turks- und Caicosinseln",
+  "TV": "Tuvalu",
+  "UG": "Uganda",
+  "UA": "Ukraine",
+  "HU": "Ungarn",
+  "UY": "Uruguay",
+  "UZ": "Usbekistan",
+  "VU": "Vanuatu",
+  "VA": "Vatikanstadt",
+  "VE": "Venezuela",
+  "AE": "Vereinigte Arabische Emirate",
+  "US": "Vereinigte Staaten",
+  "GB": "Vereinigtes K\u00f6nigreich",
+  "VN": "Vietnam",
+  "WF": "Wallis und Futuna",
+  "CX": "Weihnachtsinsel",
+  "EH": "Westsahara",
+  "CF": "Zentralafrikanische Republik",
+  "CY": "Zypern"
+}
\ No newline at end of file
diff --git a/zero.Debug/Resources/Countries/countries.en-us.json b/zero.Debug/Resources/Countries/countries.en-us.json
new file mode 100644
index 00000000..81dd1733
--- /dev/null
+++ b/zero.Debug/Resources/Countries/countries.en-us.json
@@ -0,0 +1,257 @@
+{
+  "AF": "Afghanistan",
+  "AX": "\u00c5land Islands",
+  "AL": "Albania",
+  "DZ": "Algeria",
+  "AS": "American Samoa",
+  "AD": "Andorra",
+  "AO": "Angola",
+  "AI": "Anguilla",
+  "AQ": "Antarctica",
+  "AG": "Antigua & Barbuda",
+  "AR": "Argentina",
+  "AM": "Armenia",
+  "AW": "Aruba",
+  "AC": "Ascension Island",
+  "AU": "Australia",
+  "AT": "Austria",
+  "AZ": "Azerbaijan",
+  "BS": "Bahamas",
+  "BH": "Bahrain",
+  "BD": "Bangladesh",
+  "BB": "Barbados",
+  "BY": "Belarus",
+  "BE": "Belgium",
+  "BZ": "Belize",
+  "BJ": "Benin",
+  "BM": "Bermuda",
+  "BT": "Bhutan",
+  "BO": "Bolivia",
+  "BA": "Bosnia & Herzegovina",
+  "BW": "Botswana",
+  "BR": "Brazil",
+  "IO": "British Indian Ocean Territory",
+  "VG": "British Virgin Islands",
+  "BN": "Brunei",
+  "BG": "Bulgaria",
+  "BF": "Burkina Faso",
+  "BI": "Burundi",
+  "KH": "Cambodia",
+  "CM": "Cameroon",
+  "CA": "Canada",
+  "IC": "Canary Islands",
+  "CV": "Cape Verde",
+  "BQ": "Caribbean Netherlands",
+  "KY": "Cayman Islands",
+  "CF": "Central African Republic",
+  "EA": "Ceuta & Melilla",
+  "TD": "Chad",
+  "CL": "Chile",
+  "CN": "China",
+  "CX": "Christmas Island",
+  "CC": "Cocos (Keeling) Islands",
+  "CO": "Colombia",
+  "KM": "Comoros",
+  "CG": "Congo - Brazzaville",
+  "CD": "Congo - Kinshasa",
+  "CK": "Cook Islands",
+  "CR": "Costa Rica",
+  "CI": "C\u00f4te d\u2019Ivoire",
+  "HR": "Croatia",
+  "CU": "Cuba",
+  "CW": "Cura\u00e7ao",
+  "CY": "Cyprus",
+  "CZ": "Czechia",
+  "DK": "Denmark",
+  "DG": "Diego Garcia",
+  "DJ": "Djibouti",
+  "DM": "Dominica",
+  "DO": "Dominican Republic",
+  "EC": "Ecuador",
+  "EG": "Egypt",
+  "SV": "El Salvador",
+  "GQ": "Equatorial Guinea",
+  "ER": "Eritrea",
+  "EE": "Estonia",
+  "SZ": "Eswatini",
+  "ET": "Ethiopia",
+  "FK": "Falkland Islands",
+  "FO": "Faroe Islands",
+  "FJ": "Fiji",
+  "FI": "Finland",
+  "FR": "France",
+  "GF": "French Guiana",
+  "PF": "French Polynesia",
+  "TF": "French Southern Territories",
+  "GA": "Gabon",
+  "GM": "Gambia",
+  "GE": "Georgia",
+  "DE": "Germany",
+  "GH": "Ghana",
+  "GI": "Gibraltar",
+  "GR": "Greece",
+  "GL": "Greenland",
+  "GD": "Grenada",
+  "GP": "Guadeloupe",
+  "GU": "Guam",
+  "GT": "Guatemala",
+  "GG": "Guernsey",
+  "GN": "Guinea",
+  "GW": "Guinea-Bissau",
+  "GY": "Guyana",
+  "HT": "Haiti",
+  "HN": "Honduras",
+  "HK": "Hong Kong SAR China",
+  "HU": "Hungary",
+  "IS": "Iceland",
+  "IN": "India",
+  "ID": "Indonesia",
+  "IR": "Iran",
+  "IQ": "Iraq",
+  "IE": "Ireland",
+  "IM": "Isle of Man",
+  "IL": "Israel",
+  "IT": "Italy",
+  "JM": "Jamaica",
+  "JP": "Japan",
+  "JE": "Jersey",
+  "JO": "Jordan",
+  "KZ": "Kazakhstan",
+  "KE": "Kenya",
+  "KI": "Kiribati",
+  "XK": "Kosovo",
+  "KW": "Kuwait",
+  "KG": "Kyrgyzstan",
+  "LA": "Laos",
+  "LV": "Latvia",
+  "LB": "Lebanon",
+  "LS": "Lesotho",
+  "LR": "Liberia",
+  "LY": "Libya",
+  "LI": "Liechtenstein",
+  "LT": "Lithuania",
+  "LU": "Luxembourg",
+  "MO": "Macao SAR China",
+  "MG": "Madagascar",
+  "MW": "Malawi",
+  "MY": "Malaysia",
+  "MV": "Maldives",
+  "ML": "Mali",
+  "MT": "Malta",
+  "MH": "Marshall Islands",
+  "MQ": "Martinique",
+  "MR": "Mauritania",
+  "MU": "Mauritius",
+  "YT": "Mayotte",
+  "MX": "Mexico",
+  "FM": "Micronesia",
+  "MD": "Moldova",
+  "MC": "Monaco",
+  "MN": "Mongolia",
+  "ME": "Montenegro",
+  "MS": "Montserrat",
+  "MA": "Morocco",
+  "MZ": "Mozambique",
+  "MM": "Myanmar (Burma)",
+  "NA": "Namibia",
+  "NR": "Nauru",
+  "NP": "Nepal",
+  "NL": "Netherlands",
+  "NC": "New Caledonia",
+  "NZ": "New Zealand",
+  "NI": "Nicaragua",
+  "NE": "Niger",
+  "NG": "Nigeria",
+  "NU": "Niue",
+  "NF": "Norfolk Island",
+  "KP": "North Korea",
+  "MK": "North Macedonia",
+  "MP": "Northern Mariana Islands",
+  "NO": "Norway",
+  "OM": "Oman",
+  "PK": "Pakistan",
+  "PW": "Palau",
+  "PS": "Palestinian Territories",
+  "PA": "Panama",
+  "PG": "Papua New Guinea",
+  "PY": "Paraguay",
+  "PE": "Peru",
+  "PH": "Philippines",
+  "PN": "Pitcairn Islands",
+  "PL": "Poland",
+  "PT": "Portugal",
+  "XA": "Pseudo-Accents",
+  "XB": "Pseudo-Bidi",
+  "PR": "Puerto Rico",
+  "QA": "Qatar",
+  "RE": "R\u00e9union",
+  "RO": "Romania",
+  "RU": "Russia",
+  "RW": "Rwanda",
+  "WS": "Samoa",
+  "SM": "San Marino",
+  "ST": "S\u00e3o Tom\u00e9 & Pr\u00edncipe",
+  "SA": "Saudi Arabia",
+  "SN": "Senegal",
+  "RS": "Serbia",
+  "SC": "Seychelles",
+  "SL": "Sierra Leone",
+  "SG": "Singapore",
+  "SX": "Sint Maarten",
+  "SK": "Slovakia",
+  "SI": "Slovenia",
+  "SB": "Solomon Islands",
+  "SO": "Somalia",
+  "ZA": "South Africa",
+  "GS": "South Georgia & South Sandwich Islands",
+  "KR": "South Korea",
+  "SS": "South Sudan",
+  "ES": "Spain",
+  "LK": "Sri Lanka",
+  "BL": "St. Barth\u00e9lemy",
+  "SH": "St. Helena",
+  "KN": "St. Kitts & Nevis",
+  "LC": "St. Lucia",
+  "MF": "St. Martin",
+  "PM": "St. Pierre & Miquelon",
+  "VC": "St. Vincent & Grenadines",
+  "SD": "Sudan",
+  "SR": "Suriname",
+  "SJ": "Svalbard & Jan Mayen",
+  "SE": "Sweden",
+  "CH": "Switzerland",
+  "SY": "Syria",
+  "TW": "Taiwan",
+  "TJ": "Tajikistan",
+  "TZ": "Tanzania",
+  "TH": "Thailand",
+  "TL": "Timor-Leste",
+  "TG": "Togo",
+  "TK": "Tokelau",
+  "TO": "Tonga",
+  "TT": "Trinidad & Tobago",
+  "TA": "Tristan da Cunha",
+  "TN": "Tunisia",
+  "TR": "Turkey",
+  "TM": "Turkmenistan",
+  "TC": "Turks & Caicos Islands",
+  "TV": "Tuvalu",
+  "UM": "U.S. Outlying Islands",
+  "VI": "U.S. Virgin Islands",
+  "UG": "Uganda",
+  "UA": "Ukraine",
+  "AE": "United Arab Emirates",
+  "GB": "United Kingdom",
+  "US": "United States",
+  "UY": "Uruguay",
+  "UZ": "Uzbekistan",
+  "VU": "Vanuatu",
+  "VA": "Vatican City",
+  "VE": "Venezuela",
+  "VN": "Vietnam",
+  "WF": "Wallis & Futuna",
+  "EH": "Western Sahara",
+  "YE": "Yemen",
+  "ZM": "Zambia",
+  "ZW": "Zimbabwe"
+}
\ No newline at end of file
diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue b/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
index fb78d5a8..2f027046 100644
--- a/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
+++ b/zero.Web.UI/App/components/pickers/mediaPicker/mediapicker.vue
@@ -70,6 +70,11 @@
       
     },
 
+    created()
+    {
+
+    },
+
     methods: {
 
       onChange(value)
@@ -92,6 +97,7 @@
           component: PickMediaOverlay,
           model: this.value,
           theme: 'dark',
+          width: 520
         }, typeof this.config === 'object' ? this.config : {});
 
         return Overlay.open(options).then(value =>
diff --git a/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue b/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
index 1069a1a4..57cdacc1 100644
--- a/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
+++ b/zero.Web.UI/App/components/pickers/mediaPicker/overlay.vue
@@ -1,6 +1,31 @@
 <template>
-  <ui-form v-if="!loading" ref="form" class="ui-mediapicker-overlay" v-slot="form">
-    <h2 class="ui-headline" v-localize="'@media.name'"></h2>
+  <ui-form ref="form" class="ui-mediapicker-overlay" v-slot="form">
+    <h2 class="ui-headline">Select or upload media</h2>
+
+    <ui-search class="ui-mediapicker-overlay-search" v-model="query" />
+
+    <nav class="ui-mediapicker-overlay-hierarchy">
+      <button type="button" v-for="item in hierarchy" class="ui-mediapicker-overlay-hierarchy-item" @click="selectFolder(item.id)">{{item.name}}</button>
+      <button type="button" class="ui-mediapicker-overlay-hierarchy-item" @click="addFolder"><i class="fth-plus"></i></button>
+    </nav>
+
+    <div class="ui-mediapicker-overlay-items">
+      <button type="button" class="ui-mediapicker-overlay-item is-upload" @click="upload">
+        <span class="-preview"><i class="fth-plus"></i></span>
+        <p class="ui-mediapicker-overlay-item-text">
+          Upload media
+        </p>
+      </button>
+
+      <button type="button" v-for="item in items" class="ui-mediapicker-overlay-item" @click="select(item)">
+        <img class="-preview" v-if="item.type === 'image'" :src="item.source" />
+        <span class="-preview" v-if="item.type !== 'image'"><i :class="item.type !== 'folder' ? 'fth-file' : 'fth-folder'"></i></span>
+        <p class="ui-mediapicker-overlay-item-text">
+          {{item.name}}
+          <span class="-minor" v-if="item.size"><br>{{item.size}}</span>
+        </p>
+      </button>
+    </div>
 
     <!--<div class="app-confirm-buttons">
       <ui-button v-if="!disabled" type="light" :submit="true" :state="form.state" label="@ui.save"></ui-button>
@@ -21,17 +46,20 @@
     },
 
     data: () => ({
-      colors: [ 'default', 'gray', 'blue-gray', 'blue', 'teal', 'green', 'lime', 'yellow', 'orange', 'red', 'purple', 'brown' ],
       icon: null,
-      color: null,
       query: '',
-      items: []
+      items: [],
+      hierarchy: [
+        { id: 0, name: 'Media' },
+        { id: 1, name: 'News' },
+        { id: 2, name: '2019' }
+      ]
     }),
 
     watch: {
       model()
       {
-        this.init();
+        //this.init();
       },
       query()
       {
@@ -42,70 +70,79 @@
     created()
     {
       this.debouncedSearch = _debounce(this.search, 100);
-      this.items = this.config.items;
-      this.init();
+      //this.items = this.config.items;
+      //this.init();
+
+      const sources = [
+        'http://nolbert.com/wp-content/uploads/2018/04/nolbert_logitech_thumb_s.jpg',
+        'http://nolbert.com/wp-content/uploads/2019/06/nolbert_orange_stack_01_thumb_sn.jpg',
+        'http://nolbert.com/wp-content/uploads/2019/04/nolbert_vyvyd_thumb_violet_n.jpg',
+        'http://nolbert.com/wp-content/uploads/2018/08/nolbert_oppo_r15_thumb_s.jpg'
+      ];
+
+      this.items.push({
+        name: 'Unfinished',
+        type: 'folder'
+      });
+
+      sources.forEach(source =>
+      {
+        this.items.push({
+          source: source,
+          name: source.split('/')[7],
+          size: '100 kB',
+          type: 'image'
+        });
+      });
+
+      this.items.push({
+        source: 'zeromagic-loop.webm',
+        name: 'zeromagic-loop-zeromagic-loop-zeromagic-loop-zeromagic-loop-zeromagic-loop.webm',
+        size: '2.3 MB',
+        type: 'video',
+        extension: '.webm'
+      });
+
+      this.items.push({
+        source: 'documentation.docx',
+        name: 'documentation.docx',
+        size: '723 kB',
+        type: 'file',
+        extension: '.docx'
+      });
     },
 
     mounted()
     {
-      let $selected = this.$el.querySelector('.ui-iconpicker-overlay-item.is-active');
-
-      if ($selected)
-      {
-        let $scrollable = this.$el.querySelector('content');
-        const offset = $selected.offsetTop - $scrollable.clientHeight * 0.5 - 30;
-        $scrollable.scrollTop = offset < 0 ? 0 : offset;
-      }
+      
     },
 
     methods: {
 
-      confirm()
+      // switches view to the selected folder
+      selectFolder(id)
       {
-        const result = (this.icon || '') + ' ' + (this.color || '').trim();
-        this.config.confirm(result);
+
       },
 
+      // adds a new folder within the current parent
+      addFolder()
+      {
+
+      },
+
+      // uploads a new media item within the current parent
+      upload()
+      {
+
+      },
+
+      // select an item, this can either be a folder or a media item
       select(item)
       {
-        this.icon = item;
-        this.confirm();
-      },
-
-      selectColor(color)
-      {
-        this.color = color === 'default' ? null : 'color-' + color;
-      },
-
-      init()
-      {
-        if (!this.model)
+        if (item.type === 'folder')
         {
-          this.icon = null;
-          this.color = null;
-        }
-        else
-        {
-          const parts = this.model.split(' ');
-          this.icon = parts[0];
-          this.color = parts.length > 1 ? parts[1] : null;
-        }
-      },
-
-      search()
-      {
-        const query = this.query;
-
-        if (!query)
-        {
-          this.items = this.config.items;
-        }
-        else
-        {
-          this.items = _filter(this.config.items, function (item)
-          {
-            return item.toLowerCase().indexOf(query) > -1;
-          })
+          return this.selectFolder(item.id);
         }
       }
     }
@@ -113,71 +150,98 @@
 </script>
 
 <style lang="scss">
-  .ui-iconpicker-overlay content
+  .ui-mediapicker-overlay
   {
-    padding-top: 0;
+    text-align: left;
   }
 
-  .ui-iconpicker-overlay-items
+  .ui-mediapicker-overlay-search.ui-searchinput .ui-input
   {
+    background: var(--color-bg-mid);
+    margin-top: 25px;
+  }
+
+  .ui-mediapicker-overlay-hierarchy
+  {
+    text-align: left;
+    margin-top: 20px;
+  }
+
+  .ui-mediapicker-overlay-hierarchy-item
+  {
+    line-height: 1.4;
+
+    & + .ui-mediapicker-overlay-hierarchy-item:before
+    {
+      content: '/';
+      margin: 0 0.5em;
+      color: var(--color-fg-light);
+    }
+  }
+
+  .ui-mediapicker-overlay-items
+  {
+    margin-top: 25px;
+    max-height: 495px;
+    overflow-y: auto;
+  }
+
+  .ui-mediapicker-overlay-item
+  {
+    width: 100%;
+    height: 70px;
     display: grid;
-    grid-gap: 0;
-    grid-template-columns: repeat(auto-fill, 61px);
-    align-items: stretch;
-  }
-
-  .ui-iconpicker-overlay-item
-  {
-    display: block;
-    text-align: center;
-    font-size: 20px;
-    height: 60px;
-    border-radius: var(--radius);
-    /*border: 2px solid transparent;*/
-
-    &:hover, &.is-active
-    {
-      background: var(--color-box);
-      box-shadow: 0 0 20px var(--color-shadow);
-    }
-
-    &.is-active
-    {
-      //color: var(--color-primary);
-    }
-  }
-
-  .ui-iconpicker-overlay-search
-  {
-    margin-bottom: 20px;
-  }
-
-  .ui-iconpicker-overlay-colors
-  {
-    text-align: center;
-    display: flex;
-    justify-content: space-between;
+    grid-template-columns: 70px 1fr;
+    grid-gap: 15px;
     align-items: center;
-    margin: 0 20px;
+    line-height: 1.4;
 
-    i
+    & + .ui-mediapicker-overlay-item
     {
-      display: inline-block;
-      width: 16px;
-      height: 16px;
-      border-radius: 20px;
-      cursor: pointer;
-      transition: transform 0.2s ease;
+      margin-top: 15px;
+    }
 
-      &.is-active
-      {
-        transform: scale(1.4);
-      }
+    .-preview
+    {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      height: 70px;
+      width: 70px;
+      object-fit: cover;
+      background: var(--color-bg-mid);
+      border-radius: var(--radius);
+      position: relative;
+      text-align: center;
+      font-size: 22px;
+    }
+
+    /*&.is-upload .-preview
+    {
+      background: var(--color-primary);
+      color: var(--color-primary-fg);
+    }*/
+
+    .-extension
+    {
+      font-size: 12px;
+      font-style: normal;
+      margin-top: 8px;
+    }
+
+    .-minor
+    {
+      color: var(--color-fg-light);
+      font-size: var(--font-size-s);
     }
   }
 
-  .ui-iconpicker-overlay-line
+  .ui-mediapicker-overlay-item-text
   {
-
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin: 0;
   }
 </style>
\ No newline at end of file
diff --git a/zero.Web.UI/App/pages/media/media.vue b/zero.Web.UI/App/pages/media/media.vue
index 70b3da8b..bd39c618 100644
--- a/zero.Web.UI/App/pages/media/media.vue
+++ b/zero.Web.UI/App/pages/media/media.vue
@@ -57,40 +57,40 @@
 
     created()
     {
-      const sources = [
-        'http://nolbert.com/wp-content/uploads/2018/04/nolbert_logitech_thumb_s.jpg',
-        'http://nolbert.com/wp-content/uploads/2019/06/nolbert_orange_stack_01_thumb_sn.jpg',
-        'http://nolbert.com/wp-content/uploads/2019/04/nolbert_vyvyd_thumb_violet_n.jpg',
-        'http://nolbert.com/wp-content/uploads/2018/08/nolbert_oppo_r15_thumb_s.jpg',
-        'http://nolbert.com/wp-content/uploads/2018/04/nolbert_asus_thumb_yellow_sq_n.jpg',
-        'http://nolbert.com/wp-content/uploads/2017/06/nolbert_yas_darkbg_n.jpg',
-        'http://nolbert.com/wp-content/uploads/2018/04/nolbert_atypical_thumb_s.jpg',
-        'http://nolbert.com/wp-content/uploads/2018/01/nolbert_npci_book_shot_01_n.jpg',
-        'http://nolbert.com/wp-content/uploads/2018/05/nolbert_fortune500_thumb_s.jpg',
-        'http://nolbert.com/wp-content/uploads/2018/04/wired_thumb_s.jpg',
-        'http://nolbert.com/wp-content/uploads/2018/04/nolbert_new_republic_thumb_s.jpg',
-        'http://nolbert.com/wp-content/uploads/2018/05/nolbert_mm_smiley_thumb_n.jpg'
-      ];
+      //const sources = [
+      //  'http://nolbert.com/wp-content/uploads/2018/04/nolbert_logitech_thumb_s.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2019/06/nolbert_orange_stack_01_thumb_sn.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2019/04/nolbert_vyvyd_thumb_violet_n.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2018/08/nolbert_oppo_r15_thumb_s.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2018/04/nolbert_asus_thumb_yellow_sq_n.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2017/06/nolbert_yas_darkbg_n.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2018/04/nolbert_atypical_thumb_s.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2018/01/nolbert_npci_book_shot_01_n.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2018/05/nolbert_fortune500_thumb_s.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2018/04/wired_thumb_s.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2018/04/nolbert_new_republic_thumb_s.jpg',
+      //  'http://nolbert.com/wp-content/uploads/2018/05/nolbert_mm_smiley_thumb_n.jpg'
+      //];
 
-      sources.forEach(source =>
-      {
-        this.items.push({
-          source: source,
-          type: 'image'
-        });
-      });
+      //sources.forEach(source =>
+      //{
+      //  this.items.push({
+      //    source: source,
+      //    type: 'image'
+      //  });
+      //});
 
-      this.items.push({
-        source: 'zeromagic-loop.webm',
-        type: 'video',
-        extension: '.webm'
-      });
+      //this.items.push({
+      //  source: 'zeromagic-loop.webm',
+      //  type: 'video',
+      //  extension: '.webm'
+      //});
 
-      this.items.push({
-        source: 'documentation.docx',
-        type: 'file',
-        extension: '.docx'
-      });
+      //this.items.push({
+      //  source: 'documentation.docx',
+      //  type: 'file',
+      //  extension: '.docx'
+      //});
     },
 
 
diff --git a/zero.Web.UI/Sass/Core/_settings.scss b/zero.Web.UI/Sass/Core/_settings.scss
index 5349cc72..56dfb870 100644
--- a/zero.Web.UI/Sass/Core/_settings.scss
+++ b/zero.Web.UI/Sass/Core/_settings.scss
@@ -62,8 +62,8 @@
 .theme-dark
 {
   // accent colors
-  //--color-primary: #fff;
-  //--color-primary-fg: #222;
+  --color-primary: #fff;
+  --color-primary-fg: #222;
   --color-secondary: #292b2c;
   --color-negative: #d82853; 
 
diff --git a/zero.Web/Controllers/MediaController.cs b/zero.Web/Controllers/MediaController.cs
new file mode 100644
index 00000000..b795e1a9
--- /dev/null
+++ b/zero.Web/Controllers/MediaController.cs
@@ -0,0 +1,62 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using zero.Core.Api;
+using zero.Core.Entities;
+using zero.Core.Identity;
+using zero.Core.Options;
+using zero.Web.Models;
+
+namespace zero.Web.Controllers
+{
+  [ZeroAuthorize(Permissions.Sections.Media, PermissionsValue.True)]
+  public class MediaController : BackofficeController
+  {
+    IMediaApi Api;
+
+    public MediaController(IMediaApi api)
+    {
+      Api = api;
+    }
+
+
+    /// <summary>
+    /// Get media item by id
+    /// </summary>  
+    public async Task<IActionResult> GetById([FromQuery] string id)
+    {
+      return await As<Media, MediaEditModel>(await Api.GetById(id));
+    }
+
+
+    /// <summary>
+    /// Get all media items + folders
+    /// </summary>    
+    public async Task<IActionResult> GetAll([FromQuery] MediaListQuery query)
+    {
+      ListResult<MediaListModel> items = await Mapper.Map<Media, MediaListModel>(await Api.GetByQuery(query));
+      IEnumerable<MediaListModel> folders = await Mapper.Map<MediaFolder, MediaListModel>(await Api.GetFolders(query.Filter.FolderId));
+
+      return Json(new MediaListResultModel(items, folders));
+    }
+
+
+    /// <summary>
+    /// Save a media item
+    /// </summary>
+    public async Task<IActionResult> Save([FromBody] MediaEditModel model)
+    {
+      Media entity = await Mapper.Map(model, await Api.GetById(model.Id));
+      return await As<Media, MediaEditModel>(await Api.Save(entity));
+    }
+
+
+    /// <summary>
+    /// Deletes a media item
+    /// </summary>
+    public async Task<IActionResult> Delete([FromQuery] string id)
+    {
+      return await As<Media, MediaEditModel>(await Api.Delete(id));
+    }
+  }
+}
diff --git a/zero.Web/Mapper/ApplicationMapperConfig.cs b/zero.Web/Mapper/ApplicationMapperConfig.cs
index a6758351..63fd6fa3 100644
--- a/zero.Web/Mapper/ApplicationMapperConfig.cs
+++ b/zero.Web/Mapper/ApplicationMapperConfig.cs
@@ -18,8 +18,8 @@ namespace zero.Web.Mapper
         target.IsActive = source.IsActive;
         target.CreatedDate = source.CreatedDate;
         target.Domains = source.Domains;
-        target.Image = source.Image;
-        target.Icon = source.Icon;
+        target.ImageId = source.ImageId;
+        target.IconId = source.IconId;
         target.Features = source.Features;
       });
 
@@ -30,8 +30,8 @@ namespace zero.Web.Mapper
         target.Email = source.Email;
         target.IsActive = source.IsActive;
         target.Domains = source.Domains;
-        target.Image = source.Image;
-        target.Icon = source.Icon;
+        target.ImageId = source.ImageId;
+        target.IconId = source.IconId;
         target.Features = source.Features;
       });
 
@@ -42,7 +42,7 @@ namespace zero.Web.Mapper
         target.FullName = source.FullName;
         target.IsActive = source.IsActive;
         target.Domains = source.Domains;
-        target.Image = source.Image?.Source;
+        target.ImageId = source.ImageId;
       });
     }
   }
diff --git a/zero.Web/Mapper/MediaMapperConfig.cs b/zero.Web/Mapper/MediaMapperConfig.cs
new file mode 100644
index 00000000..b426032f
--- /dev/null
+++ b/zero.Web/Mapper/MediaMapperConfig.cs
@@ -0,0 +1,56 @@
+using zero.Core.Entities;
+using zero.Core.Mapper;
+using zero.Web.Models;
+
+namespace zero.Web.Mapper
+{
+  public class MediaMapperConfig : IMapperConfig
+  {
+    /// <inheritdoc />
+    public void Configure(IMapper config)
+    {
+      config.CreateMap<Media, MediaEditModel>((source, target) =>
+      {
+        target.Id = source.Id;
+        //target.Name = source.Name;
+        //target.FullName = source.FullName;
+        //target.Email = source.Email;
+        target.IsActive = source.IsActive;
+        target.CreatedDate = source.CreatedDate;
+        //target.Domains = source.Domains;
+        //target.ImageId = source.ImageId;
+        //target.IconId = source.IconId;
+        //target.Features = source.Features;
+      });
+
+      config.CreateMap<MediaEditModel, Media>((source, target) =>
+      {
+        //target.Name = source.Name;
+        //target.FullName = source.FullName;
+        //target.Email = source.Email;
+        //target.IsActive = source.IsActive;
+        //target.Domains = source.Domains;
+        //target.ImageId = source.ImageId;
+        //target.IconId = source.IconId;
+        //target.Features = source.Features;
+      });
+
+      config.CreateMap<Media, MediaListModel>((source, target) =>
+      {
+        target.Id = source.Id;
+        target.Name = source.Name;
+        target.IsFolder = false;
+        target.Size = source.Size;
+        target.Source = source.Source;
+        target.ThumbnailSource = source.ThumbnailSource;
+      });
+
+      config.CreateMap<MediaFolder, MediaListModel>((source, target) =>
+      {
+        target.Id = source.Id;
+        target.Name = source.Name;
+        target.IsFolder = true;
+      });
+    }
+  }
+}
diff --git a/zero.Web/Models/ApplicationEditModel.cs b/zero.Web/Models/ApplicationEditModel.cs
index d92470e6..a27f8bb7 100644
--- a/zero.Web/Models/ApplicationEditModel.cs
+++ b/zero.Web/Models/ApplicationEditModel.cs
@@ -7,9 +7,9 @@ namespace zero.Web.Models
   {
     public string Name { get; set; }
 
-    public Media Image { get; set; }
+    public string ImageId { get; set; }
 
-    public Media Icon { get; set; }
+    public string IconId { get; set; }
 
     public string[] Domains { get; set; } = new string[] { };
 
diff --git a/zero.Web/Models/ApplicationListModel.cs b/zero.Web/Models/ApplicationListModel.cs
index 4cd087c8..e681f72a 100644
--- a/zero.Web/Models/ApplicationListModel.cs
+++ b/zero.Web/Models/ApplicationListModel.cs
@@ -6,7 +6,7 @@
 
     public string FullName { get; set; }
 
-    public string Image { get; set; }
+    public string ImageId { get; set; }
 
     public string[] Domains { get; set; }
 
diff --git a/zero.Web/Models/MediaEditModel.cs b/zero.Web/Models/MediaEditModel.cs
new file mode 100644
index 00000000..eed643dd
--- /dev/null
+++ b/zero.Web/Models/MediaEditModel.cs
@@ -0,0 +1,7 @@
+namespace zero.Web.Models
+{
+  public class MediaEditModel : EditModel
+  {
+    
+  }
+}
diff --git a/zero.Web/Models/MediaListModel.cs b/zero.Web/Models/MediaListModel.cs
new file mode 100644
index 00000000..7058e2ce
--- /dev/null
+++ b/zero.Web/Models/MediaListModel.cs
@@ -0,0 +1,15 @@
+namespace zero.Web.Models
+{
+  public class MediaListModel : ListModel
+  {
+    public bool IsFolder { get; set; }
+
+    public string Name { get; set; }
+
+    public string Source { get; set; }
+
+    public string ThumbnailSource { get; set; }
+
+    public int Size { get; set; }
+  }
+}
diff --git a/zero.Web/Models/MediaListResultModel.cs b/zero.Web/Models/MediaListResultModel.cs
new file mode 100644
index 00000000..d07f30fe
--- /dev/null
+++ b/zero.Web/Models/MediaListResultModel.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using zero.Core.Entities;
+
+namespace zero.Web.Models
+{
+  public class MediaListResultModel : ListResult<MediaListModel>
+  {
+    public IEnumerable<MediaListModel> Folders { get; private set; }
+
+    public MediaListResultModel(ListResult<MediaListModel> items, IEnumerable<MediaListModel> folders) : base(items.Items, items.TotalItems, items.Page, items.PageSize)
+    {
+      Folders = folders;
+      Statistics = items.Statistics;
+    }
+  }
+}
diff --git a/zero.Web/ZeroBuilder.cs b/zero.Web/ZeroBuilder.cs
index 1cef494b..71292770 100644
--- a/zero.Web/ZeroBuilder.cs
+++ b/zero.Web/ZeroBuilder.cs
@@ -9,11 +9,13 @@ using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
 using Raven.Client.Documents;
 using Raven.Client.Documents.Conventions;
+using Raven.Client.Documents.Indexes;
 using System;
-using System.Collections.Generic;
+using System.Reflection;
 using System.Threading.Tasks;
 using zero.Core;
 using zero.Core.Api;
+using zero.Core.Database.Indexes;
 using zero.Core.Entities;
 using zero.Core.Extensions;
 using zero.Core.Identity;
@@ -154,6 +156,8 @@ namespace zero.Web
           Database = options.Raven.Database
         };
 
+        store.Conventions.IdentityPartsSeparator = ".";
+
         store.Conventions.FindCollectionName = type =>
         {
           if (!typeof(IZeroDbConventions).IsAssignableFrom(type))
@@ -173,12 +177,16 @@ namespace zero.Web
 
         store.Conventions.TransformTypeCollectionNameToDocumentIdPrefix = name =>
         {
-          return name.ToCamelCaseId();
+          return name.Replace(Constants.Database.CollectionPrefix, Constants.Database.CollectionPrefix + store.Conventions.IdentityPartsSeparator).ToCamelCaseId();
         };
 
-        store.Conventions.IdentityPartsSeparator = ".";
+        
 
-        return store.Initialize();
+        IDocumentStore raven = store.Initialize();
+
+        IndexCreation.CreateIndexes(Assembly.GetAssembly(typeof(MediaFolder_ByHierarchy)), store);
+
+        return raven;
       });
     }