diff --git a/zero.Core/Entities/DatabaseEntity.cs b/zero.Core/Entities/DatabaseEntity.cs
index 86a82ce8..f89d03ea 100644
--- a/zero.Core/Entities/DatabaseEntity.cs
+++ b/zero.Core/Entities/DatabaseEntity.cs
@@ -16,6 +16,7 @@ namespace zero.Core.Entities
     public string AppId { get; set; }
 
     /// <inheritdoc/>
+    [Inherit]
     public string Name { get; set; }
 
     /// <inheritdoc/>
diff --git a/zero.Core/Entities/InheritAttribute.cs b/zero.Core/Entities/InheritAttribute.cs
new file mode 100644
index 00000000..b2ac527c
--- /dev/null
+++ b/zero.Core/Entities/InheritAttribute.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace zero.Core.Entities
+{
+  internal class InheritAttribute : Attribute
+  {
+  }
+}
\ No newline at end of file
diff --git a/zero.Web/Mapper/DefaultMapper.cs b/zero.Core/Mapper/DefaultMapper.cs
similarity index 99%
rename from zero.Web/Mapper/DefaultMapper.cs
rename to zero.Core/Mapper/DefaultMapper.cs
index 274f5723..ac6614f5 100644
--- a/zero.Web/Mapper/DefaultMapper.cs
+++ b/zero.Core/Mapper/DefaultMapper.cs
@@ -7,7 +7,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using zero.Core.Entities;
 
-namespace zero.Web.Mapper
+namespace zero.Core.Mapper
 {
   public class DefaultMapper : IMapper
   {
diff --git a/zero.Web/Mapper/IMapperConfig.cs b/zero.Core/Mapper/IMapperConfig.cs
similarity index 80%
rename from zero.Web/Mapper/IMapperConfig.cs
rename to zero.Core/Mapper/IMapperConfig.cs
index c4aa4f32..444f59ee 100644
--- a/zero.Web/Mapper/IMapperConfig.cs
+++ b/zero.Core/Mapper/IMapperConfig.cs
@@ -1,6 +1,6 @@
 using Raven.Client.Documents;
 
-namespace zero.Web.Mapper
+namespace zero.Core.Mapper
 {
   public interface IMapperConfig
   {
diff --git a/zero.Web/Mapper/MapperServiceCollectionExtensions.cs b/zero.Core/Mapper/MapperServiceCollectionExtensions.cs
similarity index 94%
rename from zero.Web/Mapper/MapperServiceCollectionExtensions.cs
rename to zero.Core/Mapper/MapperServiceCollectionExtensions.cs
index fccc02de..7ea44be8 100644
--- a/zero.Web/Mapper/MapperServiceCollectionExtensions.cs
+++ b/zero.Core/Mapper/MapperServiceCollectionExtensions.cs
@@ -1,10 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Raven.Client.Documents;
 using System;
-using zero.Core;
-using zero.Web.Mapper;
 
-namespace zero.Web
+namespace zero.Core.Mapper
 {
   public static class MapperServiceCollectionExtensions
   {
diff --git a/zero.Core/Plugins/ZeroPlugin.cs b/zero.Core/Plugins/ZeroPlugin.cs
index 676d903a..4ef9e710 100644
--- a/zero.Core/Plugins/ZeroPlugin.cs
+++ b/zero.Core/Plugins/ZeroPlugin.cs
@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using zero.Core.Entities;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 
 namespace zero.Core.Plugins
 {
@@ -20,6 +21,8 @@ namespace zero.Core.Plugins
 
     protected FeatureCollection Features { get; private set; }
 
+    protected IMapper Mapper { get; private set; }
+
     protected virtual IServiceCollection ConfigureServices(IServiceCollection services)
     {
       return services;
diff --git a/zero.Web/App/Components/pickers/iconPicker/iconpicker.vue b/zero.Web/App/Components/pickers/iconPicker/iconpicker.vue
index 804ed9a4..1f6cfe7c 100644
--- a/zero.Web/App/Components/pickers/iconPicker/iconpicker.vue
+++ b/zero.Web/App/Components/pickers/iconPicker/iconpicker.vue
@@ -25,6 +25,10 @@
         type: Boolean,
         default: false
       },
+      colors: {
+        type: Boolean,
+        default: false
+      },
       options: {
         type: Object,
         default: () =>
@@ -69,7 +73,8 @@
           component: PickIconOverlay,
           display: 'editor',
           items: FEATHER_ICONS,
-          model: this.value
+          model: this.value,
+          colors: this.colors,
         }, typeof this.options === 'object' ? this.options : {});
 
         return Overlay.open(options).then(value =>
diff --git a/zero.Web/App/Components/pickers/iconPicker/overlay.vue b/zero.Web/App/Components/pickers/iconPicker/overlay.vue
index e938fa4c..9d9ce818 100644
--- a/zero.Web/App/Components/pickers/iconPicker/overlay.vue
+++ b/zero.Web/App/Components/pickers/iconPicker/overlay.vue
@@ -9,7 +9,7 @@
 
     <ui-search class="ui-iconpicker-overlay-search" v-model="query" />
 
-    <div class="ui-iconpicker-overlay-colors">
+    <div class="ui-iconpicker-overlay-colors" v-if="config.colors">
       <i v-for="col in colors" :class="{ 'is-active': ('color-' + col) === color || (col === 'default' && !color), ['bg-color-' + col]: true }" @click="selectColor(col)" :title="col"></i>
     </div>
 
@@ -127,9 +127,9 @@
 </script>
 
 <style lang="scss">
-  .ui-iconpicker-overlay
+  .ui-iconpicker-overlay content
   {
-
+    padding-top: 0;
   }
 
   .ui-iconpicker-overlay-items
diff --git a/zero.Web/Controllers/ApplicationsController.cs b/zero.Web/Controllers/ApplicationsController.cs
index 411887de..71fd6924 100644
--- a/zero.Web/Controllers/ApplicationsController.cs
+++ b/zero.Web/Controllers/ApplicationsController.cs
@@ -8,6 +8,7 @@ using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Extensions;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 using zero.Web.Mapper;
 using zero.Web.Models;
 
diff --git a/zero.Web/Controllers/BackofficeController.cs b/zero.Web/Controllers/BackofficeController.cs
index e121fd4b..915243b7 100644
--- a/zero.Web/Controllers/BackofficeController.cs
+++ b/zero.Web/Controllers/BackofficeController.cs
@@ -5,6 +5,7 @@ using zero.Core;
 using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 using zero.Web.Filters;
 using zero.Web.Mapper;
 using zero.Web.Models;
diff --git a/zero.Web/Controllers/CountriesController.cs b/zero.Web/Controllers/CountriesController.cs
index bae44f67..cb959a83 100644
--- a/zero.Web/Controllers/CountriesController.cs
+++ b/zero.Web/Controllers/CountriesController.cs
@@ -4,6 +4,7 @@ using zero.Core;
 using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 using zero.Web.Mapper;
 using zero.Web.Models;
 
diff --git a/zero.Web/Controllers/LanguagesController.cs b/zero.Web/Controllers/LanguagesController.cs
index 1f24849e..45cb6baf 100644
--- a/zero.Web/Controllers/LanguagesController.cs
+++ b/zero.Web/Controllers/LanguagesController.cs
@@ -8,6 +8,7 @@ using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Extensions;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 using zero.Web.Mapper;
 using zero.Web.Models;
 
diff --git a/zero.Web/Controllers/SpacesController.cs b/zero.Web/Controllers/SpacesController.cs
index cf1523d5..15caaf37 100644
--- a/zero.Web/Controllers/SpacesController.cs
+++ b/zero.Web/Controllers/SpacesController.cs
@@ -10,6 +10,7 @@ using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Extensions;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 using zero.TestData;
 using zero.Web.Mapper;
 using zero.Web.Models;
diff --git a/zero.Web/Controllers/TranslationsController.cs b/zero.Web/Controllers/TranslationsController.cs
index 6a9b1d24..a5b2e29a 100644
--- a/zero.Web/Controllers/TranslationsController.cs
+++ b/zero.Web/Controllers/TranslationsController.cs
@@ -5,6 +5,7 @@ using zero.Core;
 using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 using zero.Web.Mapper;
 using zero.Web.Models;
 
diff --git a/zero.Web/Controllers/UserRolesController.cs b/zero.Web/Controllers/UserRolesController.cs
index 089da538..d1e9ee44 100644
--- a/zero.Web/Controllers/UserRolesController.cs
+++ b/zero.Web/Controllers/UserRolesController.cs
@@ -5,6 +5,7 @@ using zero.Core;
 using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 using zero.Web.Filters;
 using zero.Web.Mapper;
 using zero.Web.Models;
diff --git a/zero.Web/Controllers/UsersController.cs b/zero.Web/Controllers/UsersController.cs
index fd7c48d8..9a6883a4 100644
--- a/zero.Web/Controllers/UsersController.cs
+++ b/zero.Web/Controllers/UsersController.cs
@@ -5,6 +5,7 @@ using zero.Core;
 using zero.Core.Api;
 using zero.Core.Entities;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 using zero.Web.Mapper;
 using zero.Web.Models;
 
diff --git a/zero.Web/Mapper/ApplicationMapperConfig.cs b/zero.Web/Mapper/ApplicationMapperConfig.cs
index b91bc316..a6758351 100644
--- a/zero.Web/Mapper/ApplicationMapperConfig.cs
+++ b/zero.Web/Mapper/ApplicationMapperConfig.cs
@@ -1,4 +1,5 @@
 using zero.Core.Entities;
+using zero.Core.Mapper;
 using zero.Web.Models;
 
 namespace zero.Web.Mapper
diff --git a/zero.Web/Mapper/CountryMapperConfig.cs b/zero.Web/Mapper/CountryMapperConfig.cs
index 7fb7d1b4..45e429ce 100644
--- a/zero.Web/Mapper/CountryMapperConfig.cs
+++ b/zero.Web/Mapper/CountryMapperConfig.cs
@@ -1,5 +1,6 @@
 using Raven.Client.Documents;
 using zero.Core.Entities;
+using zero.Core.Mapper;
 using zero.Web.Models;
 
 namespace zero.Web.Mapper
diff --git a/zero.Web/Mapper/LanguageMapperConfig.cs b/zero.Web/Mapper/LanguageMapperConfig.cs
index 5c59df97..f3776f1a 100644
--- a/zero.Web/Mapper/LanguageMapperConfig.cs
+++ b/zero.Web/Mapper/LanguageMapperConfig.cs
@@ -1,4 +1,5 @@
 using zero.Core.Entities;
+using zero.Core.Mapper;
 using zero.Web.Models;
 
 namespace zero.Web.Mapper
diff --git a/zero.Web/Mapper/SpaceMapperConfig.cs b/zero.Web/Mapper/SpaceMapperConfig.cs
index 99005faf..99f16371 100644
--- a/zero.Web/Mapper/SpaceMapperConfig.cs
+++ b/zero.Web/Mapper/SpaceMapperConfig.cs
@@ -5,6 +5,7 @@ using zero.Core.Identity;
 using zero.Core.Extensions;
 using zero.Web.Models;
 using Raven.Client.Documents;
+using zero.Core.Mapper;
 
 namespace zero.Web.Mapper
 {
diff --git a/zero.Web/Mapper/TranslationMapperConfig.cs b/zero.Web/Mapper/TranslationMapperConfig.cs
index f3451106..f78b59e3 100644
--- a/zero.Web/Mapper/TranslationMapperConfig.cs
+++ b/zero.Web/Mapper/TranslationMapperConfig.cs
@@ -1,4 +1,5 @@
 using zero.Core.Entities;
+using zero.Core.Mapper;
 using zero.Web.Models;
 
 namespace zero.Web.Mapper
diff --git a/zero.Web/Mapper/UserMapperConfig.cs b/zero.Web/Mapper/UserMapperConfig.cs
index 07b4b5bd..5a079237 100644
--- a/zero.Web/Mapper/UserMapperConfig.cs
+++ b/zero.Web/Mapper/UserMapperConfig.cs
@@ -5,6 +5,7 @@ using zero.Core.Identity;
 using zero.Core.Extensions;
 using zero.Web.Models;
 using Raven.Client.Documents;
+using zero.Core.Mapper;
 
 namespace zero.Web.Mapper
 {
diff --git a/zero.Web/ZeroBuilder.cs b/zero.Web/ZeroBuilder.cs
index ffb2a1d6..9fda68d2 100644
--- a/zero.Web/ZeroBuilder.cs
+++ b/zero.Web/ZeroBuilder.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using zero.Core;
 using zero.Core.Entities;
 using zero.Core.Identity;
+using zero.Core.Mapper;
 using zero.Core.Plugins;
 using zero.Core.Validation;
 using zero.Web.Mapper;