diff --git a/customize.dist/src/less2/include/framework.less b/customize.dist/src/less2/include/framework.less
index 7b372d5ee..7e58b62ad 100644
--- a/customize.dist/src/less2/include/framework.less
+++ b/customize.dist/src/less2/include/framework.less
@@ -1,3 +1,4 @@
+@import (once) "./colortheme-all.less";
 @import (once) "./toolbar.less";
 @import (once) './fileupload.less';
 @import (once) './alertify.less';
@@ -22,3 +23,19 @@
     );
 }
 
+.framework_min_main(
+    @color: @colortheme_default-color, // Color of the text for the toolbar
+    @bg-color: @colortheme_default-bg, // color of the toolbar background
+    @warn-color: @colortheme_default-warn, // color of the warning text in the toolbar
+) {
+    .toolbar_main(
+        @bg-color: @bg-color,
+        @warn-color: @warn-color,
+        @color: @color
+    );
+    .fileupload_main();
+    .alertify_main();
+    .tippy_main();
+}
+
+
diff --git a/customize.dist/src/less2/include/tippy.less b/customize.dist/src/less2/include/tippy.less
index c8f9605db..72ceaa822 100644
--- a/customize.dist/src/less2/include/tippy.less
+++ b/customize.dist/src/less2/include/tippy.less
@@ -1,4 +1,4 @@
-@import (once) './creation.less';
+@import (once) './colortheme-all.less';
 
 .tippy_main() {
     .tippy-tooltip.cryptpad-theme {
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 475ba98e1..24058199b 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -669,7 +669,7 @@ define([
         theme: 'cryptpad',
         arrow: true,
         maxWidth: '200px',
-        flip: false,
+        flip: true,
         popperOptions: {
             modifiers: {
                 preventOverflow: { boundariesElement: 'window' }
diff --git a/www/contacts/app-contacts.less b/www/contacts/app-contacts.less
index 0beffa75c..34702d6a3 100644
--- a/www/contacts/app-contacts.less
+++ b/www/contacts/app-contacts.less
@@ -1,17 +1,13 @@
 @import (once) "../../customize/src/less2/include/browser.less";
-@import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";
-@import (once) '../../customize/src/less2/include/fileupload.less';
-@import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/avatar.less';
+@import (once) '../../customize/src/less2/include/framework.less';
 
-.toolbar_main(
+.framework_min_main(
     @bg-color: @colortheme_friends-bg,
     @warn-color: @colortheme_friends-warn,
     @color: @colortheme_friends-color
 );
-.fileupload_main();
-.alertify_main();
 
 // body
 &.cp-app-contacts {
diff --git a/www/debug/app-debug.less b/www/debug/app-debug.less
index da305f120..2a4af9c37 100644
--- a/www/debug/app-debug.less
+++ b/www/debug/app-debug.less
@@ -1,15 +1,11 @@
 @import (once) "../../customize/src/less2/include/browser.less";
-@import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";
-@import (once) '../../customize/src/less2/include/fileupload.less';
-@import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/tools.less';
 @import (once) '../../customize/src/less2/include/tokenfield.less';
+@import (once) '../../customize/src/less2/include/framework.less';
 
-.toolbar_main();
-.fileupload_main();
-.alertify_main();
 .tokenfield_main();
+.framework_min_main();
 
 // body
 &.cp-app-debug {
diff --git a/www/drive/app-drive.less b/www/drive/app-drive.less
index 29870f560..0348cf89e 100644
--- a/www/drive/app-drive.less
+++ b/www/drive/app-drive.less
@@ -1,20 +1,17 @@
 @import (once) "../../customize/src/less2/include/browser.less";
-@import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";
-@import (once) '../../customize/src/less2/include/fileupload.less';
-@import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/leftside-menu.less';
 @import (once) "../../customize/src/less2/include/tools.less";
 @import (once) "../../customize/src/less2/include/limit-bar.less";
 @import (once) "../../customize/src/less2/include/tokenfield.less";
+@import (once) '../../customize/src/less2/include/framework.less';
 
-.toolbar_main(
+.framework_min_main(
     @bg-color: @colortheme_drive-bg,
     @warn-color: @colortheme_drive-warn,
     @color: @colortheme_drive-color
 );
-.fileupload_main();
-.alertify_main();
+
 .limit-bar_main();
 .tokenfield_main();
 
diff --git a/www/file/app-file.less b/www/file/app-file.less
index ec22a2e0c..444e5777b 100644
--- a/www/file/app-file.less
+++ b/www/file/app-file.less
@@ -1,17 +1,13 @@
 @import (once) "../../customize/src/less2/include/browser.less";
-@import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";
-@import (once) '../../customize/src/less2/include/fileupload.less';
-@import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/tokenfield.less';
+@import (once) '../../customize/src/less2/include/framework.less';
 
-.toolbar_main(
+.framework_min_main(
     @bg-color: @colortheme_file-bg,
     @warn-color: @colortheme_file-warn,
     @color: @colortheme_file-color
 );
-.fileupload_main();
-.alertify_main();
 .tokenfield_main();
 
 @button-border: 2px;
diff --git a/www/profile/app-profile.less b/www/profile/app-profile.less
index d36233782..4bbc377e4 100644
--- a/www/profile/app-profile.less
+++ b/www/profile/app-profile.less
@@ -1,19 +1,15 @@
 @import (once) "../../customize/src/less2/include/browser.less";
-@import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";
-@import (once) '../../customize/src/less2/include/fileupload.less';
-@import (once) '../../customize/src/less2/include/alertify.less';
+@import (once) '../../customize/src/less2/include/framework.less';
 
 @import (once) '../../customize/src/less2/include/avatar.less';
 @import (once) '../../customize/src/less2/include/sidebar-layout.less';
 
-.toolbar_main(
+.framework_min_main(
     @bg-color: @colortheme_profile-bg,
     @warn-color: @colortheme_profile-warn,
     @color: @colortheme_profile-color
 );
-.fileupload_main();
-.alertify_main();
 .sidebar-layout_main();
 
 // body
diff --git a/www/settings/app-settings.less b/www/settings/app-settings.less
index bb033c6dc..6c78318db 100644
--- a/www/settings/app-settings.less
+++ b/www/settings/app-settings.less
@@ -1,18 +1,15 @@
-@import (once) "../../customize/src/less2/include/colortheme-all.less";
 @import (once) "../../customize/src/less2/include/browser.less";
-@import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";
-@import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/sidebar-layout.less';
 @import (once) "../../customize/src/less2/include/limit-bar.less";
 @import (once) "../../customize/src/less2/include/creation.less";
+@import (once) '../../customize/src/less2/include/framework.less';
 
-.toolbar_main(
+.framework_min_main(
     @bg-color: @colortheme_settings-bg,
     @warn-color: @colortheme_settings-warn,
     @color: @colortheme_settings-color
 );
-.alertify_main();
 .sidebar-layout_main();
 .limit-bar_main();
 .creation_main();
diff --git a/www/todo/app-todo.less b/www/todo/app-todo.less
index 5008498b1..1c3d8ed97 100644
--- a/www/todo/app-todo.less
+++ b/www/todo/app-todo.less
@@ -1,17 +1,13 @@
 @import (once) "../../customize/src/less2/include/browser.less";
-@import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";
-@import (once) '../../customize/src/less2/include/fileupload.less';
-@import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/avatar.less';
+@import (once) '../../customize/src/less2/include/framework.less';
 
-.toolbar_main(
+.framework_min_main(
     @bg-color: @colortheme_todo-bg,
     @warn-color: @colortheme_todo-warn,
     @color: @colortheme_todo-color
 );
-.fileupload_main();
-.alertify_main();
 
 // body
 &.cp-app-todo {
diff --git a/www/worker/app-worker.less b/www/worker/app-worker.less
index 9e437ecdc..2e0a9f94e 100644
--- a/www/worker/app-worker.less
+++ b/www/worker/app-worker.less
@@ -1,14 +1,9 @@
 @import (once) "../../customize/src/less2/include/browser.less";
-@import (once) "../../customize/src/less2/include/toolbar.less";
 @import (once) "../../customize/src/less2/include/markdown.less";
-@import (once) '../../customize/src/less2/include/fileupload.less';
-@import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/avatar.less';
+@import (once) '../../customize/src/less2/include/framework.less';
 
-
-.toolbar_main();
-.fileupload_main();
-.alertify_main();
+.framework_min_main();
 
 // body
 &.cp-app-worker {