diff --git a/customize.dist/main.css b/customize.dist/main.css
index ffda4ba19..10ffd4f7b 100644
--- a/customize.dist/main.css
+++ b/customize.dist/main.css
@@ -348,7 +348,7 @@ html.cp,
   font-weight: 400;
   line-height: 2rem;
 }
-.cp #language-selector {
+.cp #language-selector:not(.poll) {
   position: absolute;
   top: 0px;
   right: 0px;
@@ -652,7 +652,7 @@ html.cp,
 }
 .cp form.realtime table input[type="text"],
 .cp div.realtime table input[type="text"] {
-  height: 100%;
+  height: auto;
   border: 1px solid #302B28;
   width: 80%;
 }
@@ -902,3 +902,6 @@ html.cp,
 .cp div#modal #addtime {
   border-bottom-left-radius: 5px;
 }
+#cors-store {
+  display: none;
+}
diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less
index 21c9e1e71..910cd643b 100644
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -22,7 +22,7 @@ body {
     line-height: 2rem;
 }
 
-#language-selector {
+#language-selector:not(.poll) {
     position: absolute;
     top: 0px;
     right: 0px;
@@ -359,7 +359,7 @@ form.realtime, div.realtime {
 
         input {
             &[type="text"] {
-                height: 100%;
+                height: auto;
                 border: 1px solid @base;
                 width: 80%;
             }
@@ -625,3 +625,7 @@ div.modal, div#modal {
 }
 }
 
+// hack for our cross-origin iframe
+#cors-store {
+    display: none;
+}
diff --git a/customize.dist/src/less/toolbar.less b/customize.dist/src/less/toolbar.less
index 21182b991..454eedbf7 100644
--- a/customize.dist/src/less/toolbar.less
+++ b/customize.dist/src/less/toolbar.less
@@ -242,6 +242,7 @@
         right: 0;
         span:not(.cryptpad-lag) {
             vertical-align: top;
+            display: inline-block;
         }
         @media screen and (max-width: @media-narrow-screen) {
             top: 3em;
diff --git a/customize.dist/toolbar.css b/customize.dist/toolbar.css
index ed3f95e14..cd9545990 100644
--- a/customize.dist/toolbar.css
+++ b/customize.dist/toolbar.css
@@ -247,6 +247,7 @@
 }
 .cryptpad-toolbar-top .cryptpad-user span:not(.cryptpad-lag) {
   vertical-align: top;
+  display: inline-block;
 }
 @media screen and (max-width: 400px) {
   .cryptpad-toolbar-top .cryptpad-user {