diff --git a/nae.json b/nae.json
index 29df04537f..2a486c4b0f 100644
--- a/nae.json
+++ b/nae.json
@@ -321,6 +321,34 @@
                     "routing": {
                         "path": "breadcrumbs"
                     }
+                },
+                "double-menu-tabbed-views": {
+                    "component": {
+                        "class": "TabbedViewsExampleComponent",
+                        "from": "./doc/tabbed-case-view/tabbed-views-example.component"
+                    },
+                    "access": "private",
+                    "navigation": {
+                        "title": "Custom Tabbed View",
+                        "icon": "tab"
+                    },
+                    "routing": {
+                        "path": "double-menu-tabbed-views"
+                    },
+                    "children": {
+                        "custom-redirect": {
+                            "component": {
+                                "class": "TabbedViewsExampleComponent",
+                                "from": "./doc/tabbed-case-view/tabbed-views-example.component"
+                            },
+                            "access": "private",
+                            "navigation": false,
+                            "routing": {
+                                "path": "**"
+                            }
+                        }
+                    },
+                    "processUri": "/"
                 }
             }
         },
diff --git a/projects/nae-example-app/src/app/doc/double-drawer-example/double-drawer-example.component.html b/projects/nae-example-app/src/app/doc/double-drawer-example/double-drawer-example.component.html
index 8f2dcbaa1c..bcab3fc0f4 100644
--- a/projects/nae-example-app/src/app/doc/double-drawer-example/double-drawer-example.component.html
+++ b/projects/nae-example-app/src/app/doc/double-drawer-example/double-drawer-example.component.html
@@ -1,3 +1,3 @@
-<nc-navigation-double-drawer #sidenav image="assets/img/netgrif_full_white.svg" imageRouterLink="/tabbed-views">
+<nc-navigation-double-drawer #sidenav image="assets/img/netgrif_full_black.svg" imageRouterLink="/tabbed-views">
     <router-outlet></router-outlet>
 </nc-navigation-double-drawer>
diff --git a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-case-view/tabbed-case-view.component.ts b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-case-view/tabbed-case-view.component.ts
index a6e30285d2..7a38cd7754 100644
--- a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-case-view/tabbed-case-view.component.ts
+++ b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-case-view/tabbed-case-view.component.ts
@@ -78,7 +78,11 @@ export class TabbedCaseViewComponent extends AbstractTabbedCaseViewComponent imp
                 @Inject(NAE_TAB_DATA) injectedTabData: InjectedTabbedCaseViewData) {
         super(caseViewService, loggerService, injectedTabData, overflowService, undefined, undefined, {
             enableCaseTitle: true,
-            isCaseTitleRequired: true
+            isCaseTitleRequired: true,
+            newCaseButtonConfig: {
+                createCaseButtonTitle: 'My custom create case button',
+                createCaseButtonIcon: 'home'
+            }
         });
     }
 
diff --git a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-task-view/tabbed-task-view.component.scss b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-task-view/tabbed-task-view.component.scss
index f9b1dec43f..ae796da831 100644
--- a/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-task-view/tabbed-task-view.component.scss
+++ b/projects/nae-example-app/src/app/doc/tabbed-case-view/tabbed-task-view/tabbed-task-view.component.scss
@@ -7,7 +7,7 @@
 
 .search-panel {
     margin-top: 16px;
-    padding: 8px 16px;
+    margin-bottom: 2px;
 }
 
 .content-margin {
diff --git a/projects/nae-example-app/src/assets/img/netgrif_full_black.svg b/projects/nae-example-app/src/assets/img/netgrif_full_black.svg
new file mode 100644
index 0000000000..31df685b01
--- /dev/null
+++ b/projects/nae-example-app/src/assets/img/netgrif_full_black.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="485.477px" height="169.799px" viewBox="0 0 485.477 169.799" enable-background="new 0 0 485.477 169.799"
+	 xml:space="preserve">
+<g>
+	<path fill="#2497F2" d="M127.233,111.582c0.876,5.812-3.126,11.231-8.935,12.106l-66.284,9.987
+		c-5.811,0.875-11.229-3.129-12.104-8.938l-9.987-66.283c-0.875-5.812,3.125-11.23,8.935-12.106l66.284-9.987
+		c5.811-0.875,11.23,3.125,12.105,8.936L127.233,111.582z M103.691,52.527c-0.182-1.208-1.278-2.044-2.452-1.868l-54.442,8.203
+		c-1.172,0.177-1.976,1.299-1.792,2.507l8.46,56.144c0.181,1.207,1.278,2.043,2.45,1.867l54.442-8.205
+		c1.174-0.176,1.977-1.298,1.794-2.506L103.691,52.527z"/>
+	<path fill="#3ABEAD" d="M47.859,80.323c21.082-2.005,40.294,12.812,43.488,34.007c3.306,21.937-11.799,42.396-33.734,45.701
+		c-21.935,3.307-42.396-11.798-45.701-33.732c-2.669-17.712,6.665-34.463,21.904-41.998l2.316,15.378
+		c-7.329,5.516-11.478,14.772-10.015,24.479c2.124,14.092,15.267,23.793,29.355,21.67s23.792-15.267,21.669-29.356
+		c-2.011-13.347-13.912-22.757-27.137-21.906L47.859,80.323z"/>
+	<path fill="#6038B2" d="M120.795,68.857c6.755-5.579,10.499-14.461,9.1-23.756c-2.124-14.088-15.268-23.791-29.356-21.668
+		C86.448,25.556,76.747,38.701,78.87,52.79c2.062,13.688,14.522,23.232,28.148,21.823l2.143,14.216
+		c-21.475,2.585-41.253-12.362-44.497-33.896C61.359,32.997,76.462,12.534,98.396,9.229c21.938-3.305,42.399,11.799,45.704,33.734
+		c2.613,17.34-6.276,33.757-20.952,41.509L120.795,68.857z"/>
+</g>
+<g>
+	<path fill="#000000" d="M184.064,59.583l0.636,7.568c1.758-2.702,3.922-4.801,6.493-6.299c2.571-1.497,5.452-2.246,8.644-2.246
+		c5.338,0,9.505,1.717,12.5,5.151c2.994,3.435,4.492,8.862,4.492,16.284v32.374h-14.308V80.09c0-3.776-0.659-6.453-1.978-8.032
+		c-1.318-1.579-3.296-2.368-5.934-2.368c-2.115,0-3.979,0.399-5.591,1.196c-1.61,0.798-2.938,1.896-3.979,3.296v38.233h-14.258
+		V59.583H184.064z"/>
+	<path fill="#000000" d="M250.373,113.44c-7.878,0-14.03-2.418-18.457-7.252c-4.429-4.834-6.642-11.06-6.642-18.676V85.56
+		c0-7.911,2.148-14.388,6.445-19.434c4.297-5.045,10.205-7.552,17.725-7.52c7.097,0,12.54,2.173,16.333,6.519
+		c3.792,4.346,5.688,10.197,5.688,17.554v7.374h-31.494l-0.146,0.294c0.228,3.612,1.325,6.543,3.296,8.788
+		c1.969,2.246,4.891,3.369,8.765,3.369c3.189,0,5.899-0.326,8.13-0.978c2.229-0.65,4.532-1.645,6.909-2.979l3.857,8.789
+		c-2.116,1.725-4.98,3.174-8.595,4.346C258.575,112.854,254.636,113.44,250.373,113.44z M249.445,69.592
+		c-2.864,0-5.069,0.985-6.615,2.954c-1.547,1.97-2.482,4.582-2.809,7.837l0.099,0.244h17.383v-1.074c0-3.092-0.635-5.525-1.904-7.3
+		C254.328,70.479,252.277,69.592,249.445,69.592z"/>
+	<path fill="#000000" d="M296.857,46.643v12.939h8.937v10.01h-8.937v26.905c0,2.051,0.432,3.516,1.294,4.395
+		s1.993,1.318,3.395,1.318c0.748,0,1.398-0.041,1.952-0.123c0.554-0.08,1.188-0.219,1.904-0.414l1.172,10.303
+		c-1.433,0.488-2.823,0.854-4.175,1.099c-1.352,0.243-2.824,0.366-4.419,0.366c-4.916,0-8.7-1.352-11.353-4.053
+		c-2.653-2.701-3.979-6.981-3.979-12.842V69.592h-7.715v-10.01h7.715V46.643H296.857z"/>
+	<path fill="#000000" d="M314.386,86.976c0-8.497,1.813-15.349,5.443-20.557s8.699-7.813,15.21-7.813c3.354,0,6.3,0.676,8.839,2.026
+		c2.538,1.351,4.671,3.296,6.396,5.835l1.172-6.885h7.666v53.125c0,6.771-1.97,11.971-5.908,15.601
+		c-3.938,3.629-9.618,5.444-17.041,5.444c-2.539,0-5.281-0.351-8.228-1.051c-2.946-0.699-5.542-1.652-7.788-2.854l1.465-7.472
+		c1.855,0.978,4.093,1.767,6.714,2.367c2.62,0.603,5.2,0.903,7.739,0.903c4.688,0,8.097-1.065,10.229-3.198
+		c2.132-2.132,3.197-5.38,3.197-9.74v-6.006c-1.726,2.213-3.793,3.89-6.201,5.028c-2.408,1.14-5.191,1.709-8.35,1.709
+		c-6.445,0-11.483-2.336-15.112-7.008c-3.63-4.67-5.443-10.813-5.443-18.432L314.386,86.976L314.386,86.976z M324.005,88.001
+		c0,5.307,1.09,9.57,3.271,12.793s5.55,4.834,10.107,4.834c2.896,0,5.321-0.66,7.274-1.979c1.953-1.319,3.564-3.183,4.834-5.59
+		V73.743c-1.236-2.246-2.849-4.028-4.834-5.347c-1.985-1.318-4.379-1.978-7.178-1.978c-4.59,0-7.983,1.904-10.181,5.713
+		c-2.198,3.809-3.296,8.757-3.296,14.845v1.025H324.005z"/>
+	<path fill="#000000" d="M397.931,68.079L393,67.786c-2.539,0-4.681,0.603-6.422,1.807c-1.741,1.205-3.085,2.897-4.027,5.078v37.745
+		h-9.619V59.583h8.594l0.928,7.715c1.497-2.734,3.346-4.866,5.542-6.396c2.197-1.53,4.729-2.295,7.594-2.295
+		c0.716,0,1.398,0.057,2.051,0.171c0.649,0.114,1.188,0.236,1.611,0.366L397.931,68.079z"/>
+	<path fill="#000000" d="M418.341,46.057h-9.619v-9.814h9.619V46.057z M418.341,112.415h-9.619V59.583h9.619V112.415z"/>
+	<path fill="#000000" d="M437.14,112.415V66.711h-8.252v-7.129h8.252v-6.689c0-5.631,1.473-9.985,4.419-13.062
+		c2.945-3.076,7.056-4.614,12.329-4.614c1.105,0,2.222,0.09,3.345,0.269c1.123,0.179,2.368,0.432,3.735,0.757l-1.172,7.324
+		c-0.586-0.13-1.294-0.244-2.124-0.342s-1.701-0.146-2.612-0.146c-2.8,0-4.883,0.838-6.25,2.515c-1.367,1.677-2.051,4.11-2.051,7.3
+		v6.689h9.569v7.129h-9.569v45.704L437.14,112.415L437.14,112.415z"/>
+</g>
+</svg>
diff --git a/projects/netgrif-components/nae-theme.scss b/projects/netgrif-components/nae-theme.scss
index 367bb45d44..5ec1a58659 100644
--- a/projects/netgrif-components/nae-theme.scss
+++ b/projects/netgrif-components/nae-theme.scss
@@ -45,3 +45,7 @@
     margin-top: 0 !important;
     margin-bottom: 0 !important;
 }
+
+.mat-paginator {
+    background: transparent !important;
+}
diff --git a/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss b/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss
index 27cea47505..f6983fb197 100644
--- a/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss
+++ b/projects/netgrif-components/src/lib/data-fields/button-field/button-default-field/button-default-field.component.scss
@@ -36,7 +36,7 @@
 }
 
 .padding-bottom {
-    padding-bottom: 6px;
+    padding-bottom: 12px;
 }
 .no-shadow {
     box-shadow: unset !important;
diff --git a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss
index 9ee0fa25ed..8f597a3f7f 100644
--- a/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss
+++ b/projects/netgrif-components/src/lib/data-fields/data-field.theme.scss
@@ -15,6 +15,10 @@
     $color-text-enabled: #64748B;
     $color-outline-enabled: #64748B;
 
+    .mat-form-field-label {
+        color: $color-text-enabled !important;
+    }
+
     .editor-preview > h1 {
         border-bottom: 1px solid #ddd;
     }
@@ -70,13 +74,13 @@
     }
 
     .invalid-form-input {
-        border: solid 2px mat.get-color-from-palette($primary) !important;
+        border: solid 2px mat.get-color-from-palette($warn) !important;
         padding: 1px !important;
     }
 
-    .invalid-form-label {
-        color: mat.get-color-from-palette($primary) !important;
-    }
+    //.invalid-form-label {
+    //    color: mat.get-color-from-palette($primary) !important;
+    //}
 
     .netgrif-input {
 
@@ -216,7 +220,7 @@
         }
 
         .mat-form-field-appearance-outline .mat-form-field-wrapper {
-            margin: 0.25px 0 0;
+            margin: 0.25px 0 2px;
         }
 
         // DISABLED
@@ -323,6 +327,17 @@
             }
         }
 
+        .netgrif-chip-button-fix {
+            &.mat-form-field .mat-form-field-prefix {
+                top: 0.33em !important;
+                padding-right: 4px !important;
+            }
+
+            .netgrif-label {
+                font-weight: 400 !important;
+            }
+        }
+
         .mat-select-trigger {
             height: unset;
             min-height: 1.125em;
diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html
index 9a55b0c9a9..93f2d7669e 100644
--- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html
+++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.html
@@ -23,7 +23,7 @@
     </ng-template>
 </ng-template>
 <ng-template [ngIf]="!formControlRef.disabled">
-    <div class="full-width">
+    <div class="full-width" [ngClass]="{'padding-bottom-fix': !dataField.isInvalid(formControlRef) && !hasHint()}">
         <div #i18nLabel class="i18n-label" [ngClass]="{'invalid-form-label': dataField.isInvalid(formControlRef)}">
             {{dataField.title}}
             <nc-required-label *ngIf="dataField.behavior.required" [isIn]="!dataField.disabled"></nc-required-label>
@@ -75,8 +75,10 @@
                 </button>
             </div>
         </div>
-        <mat-hint class="i18n-hint-error" [ngClass]="{'mat-hint-disabled': formControlRef.disabled}"
-                  *ngIf="!dataField.isInvalid(formControlRef) && hasHint()">{{dataField.description}}</mat-hint>
-        <mat-error class="i18n-hint-error" *ngIf="dataField.isInvalid(formControlRef)">{{getErrorMessage()}}</mat-error>
+        <div class="i18n-hint-wrapper" *ngIf="!dataField.isInvalid(formControlRef) && hasHint() || dataField.isInvalid(formControlRef)">
+            <mat-hint class="i18n-hint-error" [ngClass]="{'mat-hint-disabled': formControlRef.disabled}"
+                      *ngIf="!dataField.isInvalid(formControlRef) && hasHint()">{{dataField.description}}</mat-hint>
+            <mat-error class="i18n-hint-error" *ngIf="dataField.isInvalid(formControlRef)">{{getErrorMessage()}}</mat-error>
+        </div>
     </div>
 </ng-template>
diff --git a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss
index 63556224be..edd1fb2c7a 100644
--- a/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss
+++ b/projects/netgrif-components/src/lib/data-fields/i18n-field/i18n-text-field/i18n-text-field.component.scss
@@ -49,6 +49,7 @@
     padding: 0 1em;
     font-size: 75%;
     width: auto !important;
+    display: block;
 }
 
 .language-svg-wrapper {
@@ -149,3 +150,12 @@
 .i18n-bold-text {
     font-weight: bold;
 }
+
+.padding-bottom-fix {
+    padding-bottom: 1em;
+}
+
+.i18n-hint-wrapper {
+    height: 18px;
+    margin-top: -3px;
+}
diff --git a/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html
index 45de84c6ad..39da3f0efc 100644
--- a/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html
+++ b/projects/netgrif-components/src/lib/data-fields/string-collection-field/string-collection-default-field/string-collection-default-field.component.html
@@ -1,4 +1,4 @@
-<mat-form-field [appearance]="dataField.materialAppearance" class="full-width" color="primary">
+<mat-form-field [appearance]="dataField.materialAppearance" class="full-width" [ngClass]="{'netgrif-chip-fix' : dataField.value?.length > 0}" color="primary">
     <mat-label *ngIf="!showLargeLayout.value">{{dataField.title}}</mat-label>
     <mat-chip-list #chipList aria-label="Autocomplete" [formControl]="formControlRef">
         <mat-chip
diff --git a/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html b/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html
index 8b875c8902..0c456026bf 100644
--- a/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html
+++ b/projects/netgrif-components/src/lib/data-fields/user-list-field/user-list-default-field/user-list-default-field.component.html
@@ -1,4 +1,4 @@
-<mat-form-field [appearance]="dataField.materialAppearance" class="full-width"
+<mat-form-field [appearance]="dataField.materialAppearance" class="full-width netgrif-chip-button-fix"
                 [ngClass]="{'netgrif-chip-fix' : dataField.value?.userValues?.size > 0}" color="primary">
     <mat-label class="netgrif-label" [ngClass]="{'netgrif-label-disabled': formControlRef.disabled}"
                *ngIf="!showLargeLayout.value">{{ dataField.title }}
@@ -30,6 +30,7 @@
             aria-label="Autocomplete"
             matInput
             #input
+            disabled="true"
             [placeholder]="dataField.placeholder"
             [required]="dataField.behavior.required"
             [matChipInputFor]="chipList">
diff --git a/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.scss b/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.scss
index fc527d4a49..230372a901 100644
--- a/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.scss
+++ b/projects/netgrif-components/src/lib/navigation/breadcrumbs/breadcrumbs.component.scss
@@ -1,5 +1,5 @@
 .breadcrumbs {
-    margin: 4px;
+    margin: 4px 0;
     -webkit-box-align: center;
     align-items: center;
     align-self: center;
diff --git a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-case-ref-list-view/default-case-ref-list-view.component.scss b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-case-ref-list-view/default-case-ref-list-view.component.scss
index c82aaa003d..7794a7b857 100644
--- a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-case-ref-list-view/default-case-ref-list-view.component.scss
+++ b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-case-ref-list-view/default-case-ref-list-view.component.scss
@@ -1,5 +1,5 @@
 .case-view-container {
-    margin: 16px 24px;
+    //margin: 16px 24px;
     height: calc(100% - 32px);
     overflow: auto
 }
diff --git a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.scss b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.scss
index f9b1dec43f..312efbf93c 100644
--- a/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.scss
+++ b/projects/netgrif-components/src/lib/navigation/group-navigation-component-resolver/default-components/refs/default-task-view/default-task-view.component.scss
@@ -7,11 +7,11 @@
 
 .search-panel {
     margin-top: 16px;
-    padding: 8px 16px;
+    padding: 8px 0;
 }
 
 .content-margin {
-    margin: 8px 24px 0;
+    //margin: 8px 24px 0;
 }
 
 @media screen and (max-width: 599.99px) {
diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html
index f6dacd6429..1c7eff1a48 100644
--- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html
+++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.html
@@ -1,4 +1,4 @@
-<div class="drawer-control rail-color height-60" [ngClass]="{'index-menu': !configLeftMenu.opened}"
+<div class="drawer-control rail-color height-48" [ngClass]="{'index-menu': !configLeftMenu.opened}"
      fxLayoutAlign="center center" fxHide.lt-md>
     <button mat-icon-button (click)="toggleMenu()" class="menu-button mat-typography menu-font-color">
         <mat-icon>menu</mat-icon>
@@ -122,7 +122,7 @@
 
 <ng-template #defaultLeftSide>
 
-    <div class="height-60 border-bottom" fxLayoutAlign="center center" fxHide.lt-md>
+    <div class="height-48 border-bottom" fxLayoutAlign="center center" fxHide.lt-md>
         <button mat-icon-button (click)="toggleRightMenu()" class="menu-button mat-typography menu-font-color">
             <mat-icon>menu</mat-icon>
         </button>
@@ -165,14 +165,14 @@
         <img *ngIf="image !== undefined" [alt]="imageAlt" [src]="image" class="logoimg"
              [routerLink]="imageRouterLink !== undefined ? imageRouterLink : []">
     </div>
-    <div *ngIf="(rightLoading$ | async) === false">
-        <div fxLayout="column" fxLayoutAlign="end end" class="order-icon-wrapper">
-            <button mat-icon-button fxLayout="column" fxLayoutAlign="center center"
-                    class="mat-button mat-typography menu-font-color order-icon" (click)="switchOrder()"
-                    [matTooltip]="isAscending() ? ('dynamicNavigation.ascending' | translate) : ('dynamicNavigation.descending' | translate)">
-                <mat-icon>{{ isAscending() ? "expand_more" : "expand_less" }}</mat-icon>
-            </button>
-        </div>
+    <div *ngIf="(rightLoading$ | async) === false" class="margin-top-default">
+<!--        <div fxLayout="column" fxLayoutAlign="end end" class="order-icon-wrapper">-->
+<!--            <button mat-icon-button fxLayout="column" fxLayoutAlign="center center"-->
+<!--                    class="mat-button mat-typography menu-font-color order-icon" (click)="switchOrder()"-->
+<!--                    [matTooltip]="isAscending() ? ('dynamicNavigation.ascending' | translate) : ('dynamicNavigation.descending' | translate)">-->
+<!--                <mat-icon>{{ isAscending() ? "expand_more" : "expand_less" }}</mat-icon>-->
+<!--            </button>-->
+<!--        </div>-->
         <div *ngFor='let item of rightItems$ | async; trackBy: itemsTrackBy' (click)="onItemClick(item)"
              class="tree-node mat-typography mat-body-2" fxLayoutAlign="start center" [routerLink]='item.routing.path'
              routerLinkActive="active-tree-node">
diff --git a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss
index 5e58cc40dd..28cd9ea893 100644
--- a/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss
+++ b/projects/netgrif-components/src/lib/navigation/navigation-double-drawer/navigation-double-drawer.component.scss
@@ -23,8 +23,8 @@
     box-shadow: 0px 2px 4px rgba(13, 45, 60, 0.16), 0px 4px 8px rgba(84, 110, 122, 0.16);
 }
 
-.height-60 {
-    height: 60px;
+.height-48 {
+    height: 48px;
 }
 
 .drawer-control {
@@ -42,14 +42,15 @@
 
 .border-bottom {
     border-bottom: 1px solid #E2E8F0;
+    box-sizing: content-box !important;
 }
 
 .logo {
-    height: 60px;
+    height: 48px;
 }
 
 .logo-closed {
-    width: 60px !important;
+    width: 48px !important;
 }
 
 .logoimg {
diff --git a/projects/netgrif-components/src/lib/navigation/navigation.theme.scss b/projects/netgrif-components/src/lib/navigation/navigation.theme.scss
index 73565b89e3..dffa6badb7 100644
--- a/projects/netgrif-components/src/lib/navigation/navigation.theme.scss
+++ b/projects/netgrif-components/src/lib/navigation/navigation.theme.scss
@@ -38,6 +38,7 @@
 
     .active-tree-node {
         color: mat.get-color-from-palette($primary) !important;
+        background-color: rgba(mat.get-color-from-palette($primary), 0.25);
     }
 
     .tree-node {
diff --git a/projects/netgrif-components/src/lib/panel/panel.theme.scss b/projects/netgrif-components/src/lib/panel/panel.theme.scss
index a8e113cc59..2ec86c2b6a 100644
--- a/projects/netgrif-components/src/lib/panel/panel.theme.scss
+++ b/projects/netgrif-components/src/lib/panel/panel.theme.scss
@@ -73,7 +73,7 @@
     .panel-body {
         .mat-expansion-panel-body {
             padding: 0 !important;
-            background-color: #F8FAFC;
+            background-color: #ffffff;
         }
     }
 
diff --git a/projects/netgrif-components/src/lib/tabs/tabs.theme.scss b/projects/netgrif-components/src/lib/tabs/tabs.theme.scss
index 2347fd64bb..9ffc545d66 100644
--- a/projects/netgrif-components/src/lib/tabs/tabs.theme.scss
+++ b/projects/netgrif-components/src/lib/tabs/tabs.theme.scss
@@ -19,7 +19,7 @@
     }
 
     .mat-tab-header {
-        border-bottom: 2px solid #E2E8F0;
+        border-bottom: 1px solid #E2E8F0;
     }
 
     .icon-tab-color {
diff --git a/projects/netgrif-components/src/lib/view/case-view/components/case-list-paginator/case-list-paginator.component.html b/projects/netgrif-components/src/lib/view/case-view/components/case-list-paginator/case-list-paginator.component.html
index 29b0d71c26..3a158fcfaf 100644
--- a/projects/netgrif-components/src/lib/view/case-view/components/case-list-paginator/case-list-paginator.component.html
+++ b/projects/netgrif-components/src/lib/view/case-view/components/case-list-paginator/case-list-paginator.component.html
@@ -3,7 +3,7 @@
 
         <div *ngIf="(loading$ | async) === false && cases.length === 0" fxLayout="column"
              fxLayoutAlign="center center" fxFlex>
-            <mat-icon color="accent" class="margin-bottom-default">storage</mat-icon>
+            <mat-icon color="accent" class="margin-bottom-default margin-top-default">storage</mat-icon>
             <span class="font-size-20">{{ 'view-list.noCasesSatisfyingThisFilter' | translate}}</span>
         </div>
 
diff --git a/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.html b/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.html
index 3a211e5383..5b06f3ea54 100644
--- a/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.html
+++ b/projects/netgrif-components/src/lib/view/case-view/components/case-list/case-list.component.html
@@ -3,7 +3,7 @@
 
         <div *ngIf="(loading$ | async) === false && cases.length === 0" fxLayout="column"
              fxLayoutAlign="center center" fxFlex>
-            <mat-icon color="accent" class="margin-bottom-default">storage</mat-icon>
+            <mat-icon color="accent" class="margin-bottom-default margin-top-default">storage</mat-icon>
             <span class="font-size-20">{{ 'view-list.noCasesSatisfyingThisFilter' | translate}}</span>
         </div>
 
diff --git a/projects/netgrif-components/src/lib/view/case-view/components/create-case-button/create-case-button.component.scss b/projects/netgrif-components/src/lib/view/case-view/components/create-case-button/create-case-button.component.scss
index 0eb87cee3d..96e9836b5e 100644
--- a/projects/netgrif-components/src/lib/view/case-view/components/create-case-button/create-case-button.component.scss
+++ b/projects/netgrif-components/src/lib/view/case-view/components/create-case-button/create-case-button.component.scss
@@ -5,6 +5,7 @@
 
 .height-44 {
     height: 44px;
+    margin-right: 8px !important;
 }
 
 .create-case-mat-mini-fab {