diff --git a/src/static/skins/colibris/src/components/chat.css b/src/static/skins/colibris/src/components/chat.css
index eb1dce445..c9a668241 100644
--- a/src/static/skins/colibris/src/components/chat.css
+++ b/src/static/skins/colibris/src/components/chat.css
@@ -6,6 +6,19 @@
   box-shadow: 0 0 0 1px rgba(99, 114, 130, 0.16), 0 8px 16px rgba(27, 39, 51, 0.08);
   width: 400px;
   height: 300px;
+  background-color: #f9f9f9 !important;
+}
+
+#chatbox.stickyChat {
+  width: 193px !important;  
+  border: none !important;
+}
+
+#chatbox.stickyChat.chatAndUsersChat{
+  margin-top: 181px;
+  box-shadow: none;
+  border-top: 1px solid #d2d2d2 !important;
+  padding: 0!important;
 }
 
 #titlebar {
@@ -27,16 +40,23 @@
 
 #chattext {
   top: 45px;
-  font-size: 13px;
-  padding: 10px;
-  bottom: 45px;
+  font-size: 13px;  
+  bottom: 52px;
   overflow-y: auto;
+  padding: 0;
+  border: none;
+  border-bottom: 1px solid #cccccc;
 }
 
-#chattext.authorColors p, #chattext.authorColors span {
-  background-color: transparent !important;
+.plugin-ep_author_neat #chattext {
+  padding: 10px;  
 }
 
+.plugin-ep_author_neat #chattext.authorColors p, 
+.plugin-ep_author_neat #chattext.authorColors span {
+  background-color: transparent !important;
+}    
+
 #chattext p b {
   color: #4c4c4c;
 }
@@ -55,8 +75,12 @@
   background-color: #C5C5C5;
 }
 
+#chatbox.stickyChat #chattext {
+  padding: 0px;  
+}
+
 #chatinputbox {
-  padding: 0 5px 5px 10px;
+  padding: 8px;
 }
 
 #chatinput {
@@ -64,18 +88,8 @@
   float: right;  
 }
 
-#chatbox.stickyChat {
-  width: 193px !important;
-  background-color: #f9f9f9 !important;
-  border: none !important;
-}
-
-#chatbox.stickyChat #chattext {
-  padding: 6px;
-}
-
-#chatbox.stickyChat #chatinputbox {
-  padding: 5px 5px 3px 5px;
+.plugin-ep_author_neat #chatbox.stickyChat #chattext {
+  padding: 5px 3px;
 }
 
 #chaticon {
diff --git a/src/static/skins/colibris/src/components/form.css b/src/static/skins/colibris/src/components/form.css
index 74a6fb589..5d34fc865 100644
--- a/src/static/skins/colibris/src/components/form.css
+++ b/src/static/skins/colibris/src/components/form.css
@@ -4,5 +4,6 @@
   border-radius: 3px;
   padding: 8px 10px;
   background: none !important;
+  background-color: white !important;
   box-shadow: none !important;
 }
\ No newline at end of file
diff --git a/src/static/skins/colibris/src/components/users.css b/src/static/skins/colibris/src/components/users.css
index 7e05b87ae..4d99ba281 100644
--- a/src/static/skins/colibris/src/components/users.css
+++ b/src/static/skins/colibris/src/components/users.css
@@ -80,4 +80,16 @@ table#otheruserstable {
     left: initial;
     top: initial !important;
   } 
+}
+
+#users.chatAndUsers {
+  width: 172px!important;
+  box-shadow: none;
+  border: none !important;
+  padding: 10px;
+  padding-top: 15px;  
+}
+
+#users.chatAndUsers #myusernameedit {
+  width: calc(100% - 10px);
 }
\ No newline at end of file