diff --git a/skins/elastic/styles/widgets/common.less b/skins/elastic/styles/widgets/common.less
index db7f46c94..3647edc4c 100644
--- a/skins/elastic/styles/widgets/common.less
+++ b/skins/elastic/styles/widgets/common.less
@@ -385,6 +385,7 @@ fieldset.image-attachment {
         tr.selected td {
             background-color: @color-table-selected-background;
             color: @color-table-selected;
+            outline: 0;
         }
 
         td:not(:first-child) span {
diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index aae17f6cf..4165ddff9 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -560,7 +560,7 @@ td.editfield { width: 99%;  /* TODO */ }
 
 
 ul.proplist {
-    padding-left: 15px;
+    padding-left: 0;
     margin-bottom: 0;
 
     li {
@@ -705,12 +705,20 @@ html.touch .popupmenu.form {
         box-shadow: none;
     }
 
+    .input-group-text {
+        border-left: 1px solid @color-input-border;
+    }
+
+    .input-group-append {
+        margin-left: 0;
+    }
+
     .input-group {
         margin: 0 !important;
         flex-wrap: nowrap; // Bootstrap makes them wrappable (imho)
 
         &:last-child * {
-            border: 0;
+            border-bottom: 0;
         }
     }
 
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 93c10c19b..463419ae0 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -810,7 +810,9 @@ function rcube_elastic_ui()
             })
             .each(function() {
                 // TODO: Consider implementing automatic setting of table-responsive on window resize
-                $(this).addClass('table table-responsive-sm').find('thead').addClass('thead-default');
+                var table = $(this).addClass('table');
+                table.parent().addClass('table-responsive-sm');
+                table.find('thead').addClass('thead-default');
             });
 
         $('.toolbarmenu select', context).addClass('form-control');