diff --git a/src/app/atoms/header/Header.scss b/src/app/atoms/header/Header.scss
index 081b61e..9e45f82 100644
--- a/src/app/atoms/header/Header.scss
+++ b/src/app/atoms/header/Header.scss
@@ -1,6 +1,5 @@
 @use '../../partials/text';
 @use '../../partials/dir';
-@use '../../partials/screen';
 
 .header {
   @include dir.side(padding, var(--sp-normal), var(--sp-extra-tight));
@@ -41,8 +40,4 @@
       display: -webkit-box;
     }
   }
-
-  @include screen.smallerThan(mobileBreakpoint) {
-    @include dir.side(padding, calc(var(--sp-normal) - 10px), var(--sp-extra-tight));
-  }
 }
\ No newline at end of file
diff --git a/src/app/organisms/room/RoomView.scss b/src/app/organisms/room/RoomView.scss
index 2eda3ea..4f06bf2 100644
--- a/src/app/organisms/room/RoomView.scss
+++ b/src/app/organisms/room/RoomView.scss
@@ -1,4 +1,6 @@
 @use '../../partials/flex';
+@use '../../partials/screen';
+@use '../../partials/dir';
 
 .room-view {
   @extend .cp-fx__column;
@@ -18,6 +20,12 @@
     box-shadow: var(--bs-popup);
   }
 
+  & .header {
+    @include screen.smallerThan(mobileBreakpoint) {
+      padding: 0 var(--sp-tight);
+    }
+  }
+
   &__content-wrapper {
     @extend .cp-fx__item-one;
     @extend .cp-fx__column;
diff --git a/src/app/organisms/room/RoomViewHeader.scss b/src/app/organisms/room/RoomViewHeader.scss
index 79bb8dd..267cd11 100644
--- a/src/app/organisms/room/RoomViewHeader.scss
+++ b/src/app/organisms/room/RoomViewHeader.scss
@@ -27,14 +27,14 @@
   }
 }
 
-.header .room-header__drawer-btn {
+.room-header__drawer-btn {
   @include screen.smallerThan(tabletBreakpoint) {
     display: none;
   }
 }
 
-.header .room-header__back-btn {
-  @include dir.side(margin, 0, 5px);
+.room-header__back-btn {
+  @include dir.side(margin, 0, var(--sp-tight));
 
   @include screen.biggerThan(mobileBreakpoint) {
     display: none;
diff --git a/src/app/partials/screen.scss b/src/app/partials/_screen.scss
similarity index 100%
rename from src/app/partials/screen.scss
rename to src/app/partials/_screen.scss