diff --git a/zero.Backoffice.UI/app/components/ui-form.vue b/zero.Backoffice.UI/app/components/ui-form.vue
index 5b81e908..235cb077 100644
--- a/zero.Backoffice.UI/app/components/ui-form.vue
+++ b/zero.Backoffice.UI/app/components/ui-form.vue
@@ -116,12 +116,12 @@
       // loads data on creation of the form
       async load(promise)
       {
-        this.setState('loading');
+        this.loadingState = 'loading';
         const response = await promise();
 
         if (!response.success)
         {
-          this.setState('error');
+          this.loadingState = 'error';
           if (response.errors)
           {
             this.loadingError = response.errors[0].message;
@@ -130,7 +130,7 @@
         }
 
         this.canEdit = true;
-        this.setState('default');
+        this.loadingState = 'default';
         this.$nextTick(() =>
         {
           this.$emit('loaded', this);
diff --git a/zero.Backoffice.UI/app/components/ui-pick.vue b/zero.Backoffice.UI/app/components/ui-pick.vue
index 31bec64b..b086a6ed 100644
--- a/zero.Backoffice.UI/app/components/ui-pick.vue
+++ b/zero.Backoffice.UI/app/components/ui-pick.vue
@@ -44,7 +44,7 @@
 
       <!-- items -->
       <div class="ui-pick-overlay-items">
-        <button v-for="item in items" :key="item[configuration.keys.id]" type="button" class="ui-pick-overlay-item" @click="select(item)" :class="{'is-selected': isSelected(item) }">
+        <button v-for="item in items" :key="item[configuration.keys.id]" type="button" class="ui-pick-overlay-item" @click="select(item)" :class="{'is-selected': isSelected(item) }" :disabled="item.disabled">
           <ui-icon v-if="item[configuration.keys.icon] && !configuration.list.iconAsImage" class="-icon" :symbol="item[configuration.keys.icon]" />
           <span v-if="item[configuration.keys.icon] && configuration.list.iconAsImage" class="-image">
             <ui-thumbnail :media="item[configuration.keys.icon]" :alt="item[configuration.keys.name]" />
@@ -698,6 +698,11 @@
     transition: background .2s, transform .2s, opacity .2s;
     position: relative;
 
+    &[disabled]
+    {
+      opacity: .6;
+    }
+
     &:hover
     {
       background: var(--color-dropdown-selected);
diff --git a/zero.Backoffice.UI/app/styles/Settings/_accent.scss b/zero.Backoffice.UI/app/styles/Settings/_accent.scss
index b0ed15c6..0bab77b8 100644
--- a/zero.Backoffice.UI/app/styles/Settings/_accent.scss
+++ b/zero.Backoffice.UI/app/styles/Settings/_accent.scss
@@ -3,8 +3,8 @@
 // theme-agnostic colors
 :root
 {
-  --color-accent: #cff206; // #76b900 // #67bdb1
-  --color-accent-fg: #000;
+  --color-accent: #009ae5; // #f9aa19 yellow // #76b900 // #67bdb1 // #009ae5 blue
+  --color-accent-fg: #fff;
 
   --color-negative: rgb(216, 40, 83);
   --color-image-bg: rgb(255, 255, 255);