diff --git a/public/assets/chat/chat.css b/public/assets/chat/chat.css
index 104b61721..3d33aba23 100644
--- a/public/assets/chat/chat.css
+++ b/public/assets/chat/chat.css
@@ -105,7 +105,7 @@
   margin: 0 1em;
   display: inline-block;
   line-height: 2em;
-  padding: 0 0.7em;
+  padding: 0 .7em;
   border-radius: 1em;
   background: rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.04) inset; }
@@ -316,6 +316,7 @@
   box-shadow: none;
   padding: 1em 2em;
   outline: none;
+  box-shadow: none;
   resize: none;
   -webkit-flex: 1;
   -ms-flex: 1;
@@ -352,9 +353,7 @@
   display: block; }
 
 /*
-
   # Flat Design
-  
 */
 .zammad-chat--flat .zammad-chat-header,
 .zammad-chat--flat .zammad-chat-body {
diff --git a/public/assets/chat/chat.scss b/public/assets/chat/chat.scss
index 8fd6ef72c..8b2178e05 100644
--- a/public/assets/chat/chat.scss
+++ b/public/assets/chat/chat.scss
@@ -11,7 +11,7 @@
   will-change: bottom;
   display: none;
   flex-direction: column;
-  
+
   &.is-fullscreen {
     right: 0;
     width: 100%;
@@ -43,7 +43,7 @@
   background: hsl(203,67%,53%);
   color: white;
   line-height: 2.5em;
-  box-shadow: 
+  box-shadow:
     0 -1px rgba(0,0,0,.1),
     0 1px rgba(255,255,255,.3) inset,
     0 -1px rgba(0,0,0,.1) inset,
@@ -52,7 +52,7 @@
   border-radius: 5px 5px 0 0;
   overflow: hidden;
   cursor: pointer;
-  
+
   @media only screen and (max-width: 768px) {
     border-radius: 0 !important;
   }
@@ -294,8 +294,9 @@
   align-items: flex-start;
   border-top: 1px solid hsl(0,0%,93%);
   padding: 0;
+  margin: 0;
   line-height: 1.4em;
-  box-shadow: 
+  box-shadow:
     0 1px rgba(0,0,0,.01),
     0 -1px rgba(0,0,0,.02);
   position: relative;
@@ -314,6 +315,7 @@
   box-shadow: none;
   padding: 1em 2em;
   outline: none;
+  box-shadow: none;
   resize: none;
   flex: 1;
   max-height: 6em;
@@ -355,9 +357,7 @@
 }
 
 /*
-
   # Flat Design
-  
 */
 
 .zammad-chat--flat .zammad-chat-header,