diff --git a/resources/styles/partials/colorpicker.scss b/resources/styles/partials/colorpicker.scss
index 080f8ad8c..b81d86116 100644
--- a/resources/styles/partials/colorpicker.scss
+++ b/resources/styles/partials/colorpicker.scss
@@ -33,12 +33,32 @@
   .inputs-area {
     display: flex;
     justify-content: space-around;
+    width: 200px;
+
+    .row-flex{
+      margin: 0;
+    }
 
     > input {
       width: 50%;
     }
+
+    .input-text {
+      color: $intense-ui-text;
+      font-size: $fs13;
+      margin: 5px;
+      padding: 5px;
+      width: 100%;
+    }
+
   }
 
+  span {
+    color: $medium-ui-text;
+    font-size: $fs12;
+  }
+
+
   /* Default skin */
 
   &.theme-default {
@@ -75,9 +95,11 @@
       border-radius: 4px;
       background-color: white;
     }
+
     .inputs-area {
       width: 230px;
     }
+
   }
 
   /* Small skin */
@@ -114,11 +136,9 @@
       border-radius: 4px;
       background-color: white;
     }
-    .inputs-area {
-      width: 170px;
-    }
 
   }
+
 }
 
 /* NEW COLOR PICKER */
@@ -155,5 +175,23 @@
   padding: $small;
   position: absolute;
   z-index: 11;
-  width: 210px;
+  width: auto;
+
+  span {
+    color: $medium-ui-text;
+    font-size: $fs12;
+  }
+
+  .inputs-area {
+
+    .input-text {
+      color: $intense-ui-text;
+      font-size: $fs13;
+      margin: 5px;
+      padding: 5px;
+      width: 100%;
+    }
+
+  }
+
 }
diff --git a/src/uxbox/ui/colorpicker.cljs b/src/uxbox/ui/colorpicker.cljs
index 32f265c41..0e42f922a 100644
--- a/src/uxbox/ui/colorpicker.cljs
+++ b/src/uxbox/ui/colorpicker.cljs
@@ -189,9 +189,16 @@
            :type "text"
            :value value
            :on-change on-hex-changed}]
-         [:input.input-text
-          {:placeholder "RGB"
-           :type "text"}]]]))))
+         [:div.row-flex
+          [:input.input-text
+           {:placeholder "R"
+            :type "text"}]
+          [:input.input-text
+           {:placeholder "G"
+            :type "text"}]
+          [:input.input-text
+           {:placeholder "B"
+            :type "text"}]]]]))))