diff --git a/dev/Common/Links.js b/dev/Common/Links.js
index 9466bd489..21b2f8d44 100644
--- a/dev/Common/Links.js
+++ b/dev/Common/Links.js
@@ -68,7 +68,7 @@ export const
 	 * @param {string} path
 	 * @returns {string}
 	 */
-	staticLink = path => VERSION_PREFIX + 'static/' + path,
+	staticLink = path => Settings.app('webPath') + VERSION_PREFIX + 'static/' + path,
 
 	/**
 	 * @param {string} theme
diff --git a/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
index 18f928970..6eafd94fe 100644
--- a/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
+++ b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
@@ -49,7 +49,8 @@
     background-image: linear-gradient(to bottom, #f4f4f4, #dfdfdf) !important;
     background-repeat: repeat-x !important;
 }
-#V-AdminPane > .b-toolbar {
+#V-AdminPane > .b-toolbar,
+#V-PopupsCompose header {
 	background-color: #0082c9;
 	background-image: linear-gradient(40deg, #0082c9 0%, #30b6ff 100%);
 	color: #fff;
diff --git a/integrations/nextcloud/snappymail/css/embed.css b/integrations/nextcloud/snappymail/css/embed.css
index 7506cb75a..d4c7704fc 100644
--- a/integrations/nextcloud/snappymail/css/embed.css
+++ b/integrations/nextcloud/snappymail/css/embed.css
@@ -48,6 +48,12 @@ Then the below #rl-app can be used to style it.
 	margin: 0;
 	padding: 3px;
 }
+button.btn:not(.button-vue) {
+	min-height: auto;
+	height: auto;
+	margin: 0;
+	padding: 4px 12px;
+}
 #rl-app .form-horizontal .control-group > :not(label)
 {
 	margin-left: 20px;
@@ -60,6 +66,20 @@ Then the below #rl-app can be used to style it.
 	display: none;
 }
 
+#rl-app .squire-plain, #rl-app .squire-wysiwyg {
+	box-sizing: border-box;
+	font-size: 13px;
+	height: 100%;
+	line-height: 16px;
+	min-height: 200px;
+}
+
+#V-PopupsCompose header {
+	background-color: var(--color-primary);
+	background-image: linear-gradient(40deg, #0082c9 0%, #30b6ff 100%);
+	color: #fff;
+}
+
 #appmenu {
 	margin: 0;
 }