diff --git a/packages/builder/src/components/common/Input.svelte b/packages/builder/src/components/common/Input.svelte
index bc6741e0d8..a136b4e2f3 100644
--- a/packages/builder/src/components/common/Input.svelte
+++ b/packages/builder/src/components/common/Input.svelte
@@ -11,12 +11,12 @@
   input {
     display: block;
     font-size: 14px;
-    font-family: sans-serif;
     font-weight: 500;
-    color: #163057;
+    color: var(--ink);
     line-height: 1.3;
-    padding: 1em 2.6em 0.9em 1.4em;
-    width: 100%;
+    padding: 12px;
+    width: 164px;
+    float: right;
     max-width: 100%;
     box-sizing: border-box;
     margin: 0;
@@ -24,7 +24,7 @@
     -webkit-appearance: none;
     appearance: none;
     background: #fff;
-    border: 1px solid #ccc;
-    height: 35px;
+    border: 1px solid var(--grey-dark);
+    height: 32px;
   }
 </style>
diff --git a/packages/builder/src/components/common/Inputs/InputGroup.svelte b/packages/builder/src/components/common/Inputs/InputGroup.svelte
index c4118aa289..ffe6880f51 100644
--- a/packages/builder/src/components/common/Inputs/InputGroup.svelte
+++ b/packages/builder/src/components/common/Inputs/InputGroup.svelte
@@ -29,7 +29,6 @@
 
 <style>
   .input-container {
-    display: flex;
   }
 
   .label {
@@ -43,16 +42,18 @@
   input {
     width: 40px;
     height: 32px;
-    font-size: 13px;
+    font-size: 12px;
     font-weight: 700;
-    margin: 0px 5px;
-    color: #163057;
+    margin: 0px 0px 0px 1px;
+    text-align: center;
+    color: var(--ink);
     opacity: 0.7;
-    padding: 5px 10px;
+    padding: 0px 4px;
     box-sizing: border-box;
-    border: 1px solid #dbdbdb;
+    border: 1px solid var(--grey);
     border-radius: 2px;
     outline: none;
+    float: right;
   }
 
   input[type="number"]::-webkit-inner-spin-button,
diff --git a/packages/builder/src/components/userInterface/CategoryTab.svelte b/packages/builder/src/components/userInterface/CategoryTab.svelte
index 246c1141e8..074839eca2 100644
--- a/packages/builder/src/components/userInterface/CategoryTab.svelte
+++ b/packages/builder/src/components/userInterface/CategoryTab.svelte
@@ -4,7 +4,7 @@
   export let onClick = category => {}
 </script>
 
-<ul class="tabs">
+<div class="tabs">
   {#each categories as category}
     <li
       on:click={() => onClick(category)}
@@ -13,31 +13,23 @@
     </li>
   {/each}
 
-</ul>
+</div>
 
 <style>
   .tabs {
     display: flex;
-    justify-content: center;
     list-style: none;
-    margin: 0 auto;
-    padding: 0 30px;
-    border-bottom: 1px solid #d8d8d8;
-
-    font-size: 14px;
-    font-weight: 500;
-    letter-spacing: 0.14px;
+    font-size: 18px;
+    font-weight: 700;
   }
 
   li {
-    color: #808192;
-    margin: 0 5px;
-    padding: 0 8px;
+    color: var(--ink-lighter);
     cursor: pointer;
+    margin-right: 20px;
   }
 
   .active {
-    border-bottom: solid 3px #0055ff;
-    color: #393c44;
+    color: var(--ink);
   }
 </style>
diff --git a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
index 507d04c356..3ab8c522f0 100644
--- a/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
+++ b/packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
@@ -117,7 +117,7 @@
   }
 
   .component-props-container {
-    margin-top: 10px;
+    margin-top: 20px;
     flex: 1 1 auto;
   }
 </style>
diff --git a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
index c85e23403c..185b1d640d 100644
--- a/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
+++ b/packages/builder/src/components/userInterface/ComponentsPaneSwitcher.svelte
@@ -54,13 +54,13 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    padding: 20px 0;
+    padding: 20px 20px;
     border-left: solid 1px #e8e8ef;
   }
 
   .switcher {
     display: flex;
-    margin: 0px 20px 20px 20px;
+    margin: 0px 20px 20px 0px;
   }
 
   .switcher > button {
diff --git a/packages/builder/src/components/userInterface/FlatButton.svelte b/packages/builder/src/components/userInterface/FlatButton.svelte
index abc4a3dc28..9e11a546e3 100644
--- a/packages/builder/src/components/userInterface/FlatButton.svelte
+++ b/packages/builder/src/components/userInterface/FlatButton.svelte
@@ -19,16 +19,16 @@
 <style>
   .flatbutton {
     cursor: pointer;
-    padding: 5px;
+    padding: 8px 4px;
     text-align: center;
     background: #ffffff;
-    color: #808192;
-    border-radius: 4px;
+    color: var(--ink-light);
+    border-radius: 5px;
     font-family: Roboto;
-    font-size: 11px;
+    font-size: 13px;
     font-weight: 500;
-    letter-spacing: 0.11px;
     transition: background 0.5s, color 0.5s ease;
+    text-rendering: optimizeLegibility;
   }
 
   .selected {
diff --git a/packages/builder/src/components/userInterface/FlatButtonGroup.svelte b/packages/builder/src/components/userInterface/FlatButtonGroup.svelte
index f16d832c67..9081694c0c 100644
--- a/packages/builder/src/components/userInterface/FlatButtonGroup.svelte
+++ b/packages/builder/src/components/userInterface/FlatButtonGroup.svelte
@@ -44,11 +44,9 @@
 <style>
   .flatbutton-group {
     display: flex;
-    flex-flow: row nowrap;
   }
 
   .button-container {
     flex: 1;
-    margin: 5px;
   }
 </style>
diff --git a/packages/builder/src/components/userInterface/PropertyControl.svelte b/packages/builder/src/components/userInterface/PropertyControl.svelte
index cd1bad35f7..82acb8b3f9 100644
--- a/packages/builder/src/components/userInterface/PropertyControl.svelte
+++ b/packages/builder/src/components/userInterface/PropertyControl.svelte
@@ -43,21 +43,24 @@
 <style>
   .property-control {
     display: flex;
-    flex-flow: row nowrap;
+    flex-flow: row;
     margin: 8px 0px;
+    align-items: center;
   }
 
   .label {
     flex: 0 0 50px;
-    padding: 0px 5px;
     font-size: 12px;
-    font-weight: 500;
-    letter-spacing: 0.12px;
+    font-weight: 400;
     text-align: left;
+    color: var(--ink);
+    margin-right: auto;
+    text-transform: capitalize;
   }
 
   .control {
     flex: 1;
-    padding-left: 5px;
+    padding-left: 2px;
+    max-width: 164px;
   }
 </style>
diff --git a/packages/builder/src/components/userInterface/PropertyGroup.svelte b/packages/builder/src/components/userInterface/PropertyGroup.svelte
index 240618a4c7..6d0cf63ab0 100644
--- a/packages/builder/src/components/userInterface/PropertyGroup.svelte
+++ b/packages/builder/src/components/userInterface/PropertyGroup.svelte
@@ -42,14 +42,15 @@
     display: flex;
     flex-direction: column;
     height: auto;
-    background: #fbfbfb;
-    margin: 5px;
-    padding: 5px;
+    background: var(--grey-light);
+    margin: 0px 0px 4px 0px;
+    padding: 8px 12px;
+    justify-content: center;
+    border-radius: 4px;
   }
 
   .property-group-name {
     cursor: pointer;
-    flex: 0 0 20px;
     display: flex;
     flex-flow: row nowrap;
   }
@@ -61,7 +62,7 @@
     font-size: 14px;
     font-weight: 500;
     letter-spacing: 0.14px;
-    color: #393c44;
+    color: var(--ink);
   }
 
   .icon {
diff --git a/packages/builder/src/pages/[application]/frontend/_layout.svelte b/packages/builder/src/pages/[application]/frontend/_layout.svelte
index df9762fb07..c480a75bfa 100644
--- a/packages/builder/src/pages/[application]/frontend/_layout.svelte
+++ b/packages/builder/src/pages/[application]/frontend/_layout.svelte
@@ -127,7 +127,6 @@
   .root {
     display: grid;
     grid-template-columns: 275px 1fr 275px;
-    height: 100%;
     width: 100%;
     background: var(--grey-light);
   }
@@ -136,7 +135,6 @@
     .root {
       display: grid;
       grid-template-columns: 300px 1fr 300px;
-      height: 100%;
       width: 100%;
       background: var(--grey-light);
     }
@@ -162,8 +160,6 @@
   .components-pane {
     grid-column: 3;
     background-color: var(--white);
-    min-height: 0px;
-    overflow-y: scroll;
   }
 
   .components-nav-page {