diff --git a/frontend/resources/styles/main/layouts/main-layout.scss b/frontend/resources/styles/main/layouts/main-layout.scss
index 228fe088c..738f6c0ab 100644
--- a/frontend/resources/styles/main/layouts/main-layout.scss
+++ b/frontend/resources/styles/main/layouts/main-layout.scss
@@ -28,18 +28,6 @@
   }
 }
 
-.settings-layout {
-  background-color: $color-white;
-  display: grid;
-  grid-template-rows: 40px 1fr;
-  grid-template-columns: 1fr;
-  height: 100vh;
-
-  & .settings-content {
-    grid-row: 1;
-  }
-}
-
 .dashboard-content {
   background-color: lighten($color-gray-10, 5%);
   display: flex;
diff --git a/frontend/resources/styles/main/partials/user-settings.scss b/frontend/resources/styles/main/partials/user-settings.scss
index 302a696bf..18d4a5070 100644
--- a/frontend/resources/styles/main/partials/user-settings.scss
+++ b/frontend/resources/styles/main/partials/user-settings.scss
@@ -49,7 +49,6 @@
 
   .input-text {
     color: $color-gray-60;
-    background-color: $color-gray-10;
   }
 
   .btn-primary {
diff --git a/frontend/src/uxbox/main/ui/settings.cljs b/frontend/src/uxbox/main/ui/settings.cljs
index 000daa173..794ea37d5 100644
--- a/frontend/src/uxbox/main/ui/settings.cljs
+++ b/frontend/src/uxbox/main/ui/settings.cljs
@@ -26,14 +26,11 @@
         profile (mf/deref refs/profile)]
     [:main.settings-main
      [:& messages-widget]
-     [:section.settings-layout
-      [:div.settings-content
-       [:div.main-logo {:on-click #(st/emit! (rt/nav :dashboard-team {:team-id "self"}))}
-        i/logo-icon]
-       [:& header {:section section}]
-       (case section
-         :settings-profile (mf/element profile-page)
-         :settings-password (mf/element password-page))]]]))
+     [:div.settings-content
+      [:& header {:section section}]
+      (case section
+        :settings-profile (mf/element profile-page)
+        :settings-password (mf/element password-page))]]))
 
 
 
diff --git a/frontend/src/uxbox/main/ui/settings/header.cljs b/frontend/src/uxbox/main/ui/settings/header.cljs
index 807f215d3..b58e83c62 100644
--- a/frontend/src/uxbox/main/ui/settings/header.cljs
+++ b/frontend/src/uxbox/main/ui/settings/header.cljs
@@ -19,14 +19,17 @@
   (let [profile? (= section :settings-profile)
         password? (= section :settings-password)
         locale (i18n/use-locale)]
-    [:header.main-bar
-     [:nav
-      [:a.nav-item
-       {:class (when profile? "current")
-        :on-click #(st/emit! (rt/nav :settings-profile))}
-       (t locale "settings.profile")]
-      [:a.nav-item
-       {:class (when password? "current")
-        :on-click #(st/emit! (rt/nav :settings-password))}
-       (t locale "settings.password")]]]))
+    [:header
+      [:div.main-logo {:on-click #(st/emit! (rt/nav :dashboard-team {:team-id "self"}))}
+       i/logo-icon]
+     [:section.main-bar
+      [:nav
+       [:a.nav-item
+        {:class (when profile? "current")
+         :on-click #(st/emit! (rt/nav :settings-profile))}
+        (t locale "settings.profile")]
+       [:a.nav-item
+        {:class (when password? "current")
+         :on-click #(st/emit! (rt/nav :settings-password))}
+        (t locale "settings.password")]]]]))