diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html
index da00235c..009e4ee9 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.html
@@ -17,7 +17,7 @@
       ></ucap-account-change-password>
     </div>
   </mat-card-content>
-  <mat-card-actions class="button-farm flex-row">
+  <mat-card-actions class="button-frame flex-row">
     <button
       mat-stroked-button
       (click)="onClickChoice(false)"
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.scss
index eeffa9a1..75117792 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/account/change-password.dialog.component.scss
@@ -1,4 +1,4 @@
-::ng-deep .setting-frame {
+.setting-frame {
   padding: 16px;
   height: 100%;
   min-width: 400px;
@@ -23,7 +23,7 @@
     border-bottom: 1px solid #dddddd;
   }
 
-  .button-farm {
+  .button-frame {
     text-align: right;
     position: absolute;
     width: 100%;
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss
index 0302135b..226ccc32 100644
--- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss
+++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss
@@ -165,20 +165,28 @@ $tablet-s-width: 768px;
     }
   }
 }
-::ng-deep .bubble-main {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  word-break: break-word;
-  a {
-    color: #0367a6;
-    text-decoration: underline;
+
+::ng-deep .bubble {
+  .bubble-main {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: break-word;
+    a {
+      color: #0367a6;
+      text-decoration: underline;
+    }
+  }
+  .btn-box {
+    min-width: 300px;
+    @media screen and (max-width: #{$tablet-s-width}) {
+      min-width: 250px;
+    }
   }
 }
 
 ::ng-deep .view-previous {
   display: flex;
   flex-flow: column;
-  //background-color: rgba(0, 0, 0, 0.4);
   color: #ffffff;
   justify-content: center;
   justify-items: center;
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss
index 11aa5f22..b23f81b3 100644
--- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss
+++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss
@@ -128,7 +128,7 @@
     margin-top: 10px;
   }
 }
-::ng-deep .attach-file {
+.attach-file {
   display: flex;
   flex-flow: row;
   flex: 1 1 auto;