diff --git a/css/converse.css b/css/converse.css
index dceac4039..fc6f97fba 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -5673,8 +5673,7 @@ body.reset {
     font-size: 14px;
     left: 0;
     text-align: left;
-    overflow-x: hidden;
-    border-radius: 4px; }
+    overflow-x: hidden; }
     #conversejs #controlbox .controlbox-pane .add-converse-contact {
       margin: 0 0 0.75em 0; }
     #conversejs #controlbox .controlbox-pane .chatbox-btn {
diff --git a/css/inverse.css b/css/inverse.css
index fe4b3f73d..2ce171c3a 100644
--- a/css/inverse.css
+++ b/css/inverse.css
@@ -5743,8 +5743,7 @@ body {
     font-size: 16px;
     left: 0;
     text-align: left;
-    overflow-x: hidden;
-    border-radius: 4px; }
+    overflow-x: hidden; }
     #conversejs #controlbox .controlbox-pane .add-converse-contact {
       margin: 0 0 0.75em 0; }
     #conversejs #controlbox .controlbox-pane .chatbox-btn {
diff --git a/sass/_controlbox.scss b/sass/_controlbox.scss
index 9911829eb..fd3acc27f 100644
--- a/sass/_controlbox.scss
+++ b/sass/_controlbox.scss
@@ -383,7 +383,6 @@
             left: 0;
             text-align: left;
             overflow-x: hidden;
-            border-radius: $chatbox-border-radius;
 
             .add-converse-contact {
                 margin: 0 0 0.75em 0;
diff --git a/src/templates/chatroom_invite.html b/src/templates/chatroom_invite.html
index 9885f1269..bdc037693 100644
--- a/src/templates/chatroom_invite.html
+++ b/src/templates/chatroom_invite.html
@@ -1,6 +1,6 @@
-<form class="pure-form room-invite">
+<form class="room-invite">
     {[ if (o.error_message) { ]}
         <span class="pure-form-message error">{{{o.error_message}}}</span>
     {[ } ]}
-    <input class="invited-contact" placeholder="{{{o.label_invitation}}}" type="text"/>
+    <input class="form-control invited-contact" placeholder="{{{o.label_invitation}}}" type="text"/>
 </form>
diff --git a/src/templates/trimmed_chat.html b/src/templates/trimmed_chat.html
index 63b071957..70927e0ee 100644
--- a/src/templates/trimmed_chat.html
+++ b/src/templates/trimmed_chat.html
@@ -1,7 +1,7 @@
-<a class="chatbox-btn close-chatbox-button icon-close"></a>
 <a href="#" class="restore-chat w-100 align-self-center" title="{{{o.tooltip}}}">
     {[ if (o.num_unread) { ]} 
         <span class="badge badge-light">{{{o.num_unread}}}</span>
     {[ } ]}
     {{{o. title }}}
 </a>
+<a class="chatbox-btn close-chatbox-button fa fa-times"></a>