diff --git a/skins/elastic/styles/icons.less b/skins/elastic/styles/icons.less
index 08656af58..a8b985138 100644
--- a/skins/elastic/styles/icons.less
+++ b/skins/elastic/styles/icons.less
@@ -9,6 +9,7 @@ a.button.icon:before,
 .folderlist li a:before,
 .listing.iconized tr td:before,
 .listing.iconized li a:before,
+.listing.iconized li > i:before,
 ul.treelist li div.treetoggle:before,
 .messagelist tr.thread td.threads div:before,
 .messagelist td.subject span.msgicon.status:before,
@@ -165,6 +166,15 @@ a.rcmaddcontact:before,
     content: @fa-var-lock;
 }
 
+/* autocomplete popup */
+.listing.iconized li > i:before {
+    content: @fa-var-user;
+}
+.listing.iconized li.group > i:before {
+    content: @fa-var-group;
+}
+
+/* selecatable list: spellcheck language selection */
 .listing.iconized.selectable li a:before {
     content: "";
 }
@@ -324,6 +334,7 @@ a.rcmaddcontact:before,
     content: @fa-var-angle-down;
 }
 
+
 button.btn.save:before {
   content: @fa-var-check;
 }
diff --git a/skins/elastic/styles/styles.less b/skins/elastic/styles/styles.less
index e0978ca67..49a283904 100644
--- a/skins/elastic/styles/styles.less
+++ b/skins/elastic/styles/styles.less
@@ -5,6 +5,13 @@
 @import "widgets.less";
 
 
+/* Reset some Bootstrap style */
+
+button, input, select, textarea {
+    line-height: initial;
+}
+
+
 /*** Login form ***/
 
 .task-login #content {
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 930123cd8..8b50c8616 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -208,6 +208,8 @@ function rcube_elastic_ui()
             .addEventListener('menu-open', menu_toggle)
             .addEventListener('menu-close', menu_toggle)
             .addEventListener('editor-init', tinymce_init)
+            .addEventListener('autocomplete_create', rcmail_popup_init)
+            .addEventListener('googiespell_create', rcmail_popup_init)
             .addEventListener('init', init);
     };
 
@@ -316,6 +318,17 @@ function rcube_elastic_ui()
         }
     };
 
+    /**
+     * Handler for roundcube some popups
+     */
+    function rcmail_popup_init(o)
+    {
+        // Add some common styling to the autocomplete/googiespell popups
+        $('table,ul', o.obj).addClass('listing iconized');
+        $(o.obj).addClass('ui popup');
+        bootstrap_style(o.obj);
+    };
+
     /**
      * Window resize handler
      * Does layout reflows e.g. on screen orientation change