diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index 5307a68bf..8abb473d8 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -254,6 +254,7 @@
                     &.danger {
                         background-color: @colortheme_alertify-red;
                         border-color: @colortheme_alertify-red-border;
+                        color: @colortheme_alertify-red-color;
                         &:hover, &:active {
                             background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-red, 10%), lighten(@colortheme_alertify-red, 10%));
                         }
@@ -262,6 +263,7 @@
                     &.safe {
                         background-color: @colortheme_alertify-green;
                         border-color: @colortheme_alertify-green-border;
+                        color: @colortheme_alertify-green-color;
                         &:hover, &:active {
                             background-color: contrast(@colortheme_modal-bg, darken(@colortheme_alertify-green, 10%), lighten(@colortheme_alertify-green, 10%));
                         }
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index 43b8cf0f6..385fe93c6 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -41,8 +41,10 @@
 
 // TODO modals buttons
 @colortheme_alertify-red: #E55236;
+@colortheme_alertify-red-color: #FFF;
 @colortheme_alertify-red-border: transparent;
 @colortheme_alertify-green: #77C825;
+@colortheme_alertify-green-color: #FFF;
 @colortheme_alertify-green-border: transparent;
 @colortheme_alertify-primary: @colortheme_form-bg;
 @colortheme_alertify-primary-text: @colortheme_form-color;
diff --git a/customize.dist/src/less2/include/creation.less b/customize.dist/src/less2/include/creation.less
index 59941044e..9e9da18f1 100644
--- a/customize.dist/src/less2/include/creation.less
+++ b/customize.dist/src/less2/include/creation.less
@@ -103,7 +103,7 @@
             display: flex;
             flex-flow: column;
             align-items: center;
-            flex: 1;
+            flex: 1 0 auto;
             & > div {
                 width: 400px;
                 max-width: 100%;
@@ -191,7 +191,7 @@
             }
             div.cp-creation-template {
                 width: 100%;
-                flex: 1;
+                flex: 1 0 auto;
             }
             .cp-creation-template-container {
                 width: 100%;
diff --git a/www/filepicker/app-filepicker.less b/www/filepicker/app-filepicker.less
index ca59ebe57..952a4d857 100644
--- a/www/filepicker/app-filepicker.less
+++ b/www/filepicker/app-filepicker.less
@@ -3,10 +3,12 @@
 @import (once) '../../customize/src/less2/include/icon-colors.less';
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
+@import (once) '../../customize/src/less2/include/tippy.less';
 
 .iconColors_main();
 .fileupload_main();
 .alertify_main();
+.tippy_main();
 
 #cp-filepicker-dialog {
     display: none;