diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index de15c05bd..07b8cb491 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -222,7 +222,7 @@
                 background-color: @alertify-input-fg;
                 color: @cryptpad_text_col;
                 border: 1px solid @alertify-input-bg;
-                margin-bottom: 15px;
+                margin: @alertify_padding-base 0px;
                 width: 100%;
                 font-size: 100%;
                 padding: @alertify_padding-base;
@@ -365,6 +365,7 @@
 
             nav {
                 padding: @alertify_padding-base;
+                padding-top: 0px;
                 text-align: right;
                 button {
                     margin: 0px !important;
@@ -518,7 +519,7 @@
         }
     }
     .alert {
-        margin: 5px 0px;
+        margin: 0px 0px @alertify_padding-base 0px;
         font-size: 12px;
         padding: 5px;
         border-radius: 0px;
@@ -531,6 +532,15 @@
                 text-decoration: underline;
             }
         }
+        &.dismissable {
+            display: flex;
+            align-items: center;
+            span.fa-times {
+                font-size: @colortheme_app-font-size;
+                margin-left: 20px;
+                cursor: pointer;
+            }
+        }
     }
 }
 
diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 6e3921781..28bd63278 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -1,5 +1,5 @@
 @import (reference) "./colortheme-all.less";
-
+@import (reference) "./variables.less";
 .modals-ui-elements_main() {
     --LessLoader_require: LessLoader_currentFile();
 }
@@ -7,6 +7,7 @@
     // Share modal
     .msg.cp-inline-radio-group {
         overflow: unset !important;
+        padding: 0px @variables_padding;
         .radio-group {
             display: flex;
             flex-direction: row;
diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less
index 973b1a516..f4e72591e 100644
--- a/customize.dist/src/less2/include/usergrid.less
+++ b/customize.dist/src/less2/include/usergrid.less
@@ -28,6 +28,7 @@
             input {
                 flex: 1;
                 min-width: 0;
+                margin-top: 0 !important;
                 margin-bottom: 0 !important;
                 height: 38px;
                 margin: 6px 0px;
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index d5ac033a9..2b6ad9717 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1097,7 +1097,6 @@ define([
             h('br'),
         ] : [
             UI.createCheckbox('cp-share-embed', Messages.share_linkEmbed, false, { mark: {tabindex:1} }),
-            h('br'),
         ];
         
         linkContent.push(UI.dialog.selectableArea('', { id: 'cp-share-link-preview', tabindex: 1, rows:3}));