diff --git a/app/ux/mixin/Badge.js b/app/ux/mixin/Badge.js
index 03d62e85..babe147b 100644
--- a/app/ux/mixin/Badge.js
+++ b/app/ux/mixin/Badge.js
@@ -23,7 +23,7 @@ Ext.define('Rambox.ux.mixin.Badge', {
 	renderBadgeText: function() {
 		var badgeText = this.getBadgeText();
 
-		if (badgeText) {
+		if (badgeText && typeof badgeText === 'string') {
 			this.updateBadgeText(badgeText);
 		}
 	},
@@ -34,7 +34,7 @@ Ext.define('Rambox.ux.mixin.Badge', {
 
 		if (me.rendered) {
 			el.set({
-				'data-badge-text': badgeText !== '0' ? badgeText : ''
+				'data-badge-text': Number(badgeText) > 0 ? badgeText : ''
 			});
 
 			el.toggleCls(Ext.baseCSSPrefix + 'badge', !! badgeText);
diff --git a/packages/local/rambox-dark-theme/sass/etc/all.scss b/packages/local/rambox-dark-theme/sass/etc/all.scss
index fcbd6bdc..bfb11676 100644
--- a/packages/local/rambox-dark-theme/sass/etc/all.scss
+++ b/packages/local/rambox-dark-theme/sass/etc/all.scss
@@ -193,16 +193,17 @@ body {
 .x-badge[data-badge-text]:after {
 	content: attr(data-badge-text);
 	position: absolute;
-	font-size: 10px;
-	top: 0px;
-	right: 2px;
+	font-size: 11px;
+	top: -5px;
+	right: -5px;
+	z-index: 100;
 	width: auto;
 	font-weight: bold;
 	color: white;
 	text-shadow: rgba(0, 0, 0, 0.5) 0 -0.08em 0;
-	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	padding: 0 4px;
+	-webkit-border-radius: $border-radius-md;
+	border-radius: $border-radius-md;
+	padding: 0 6px;
 	background-image: none;
 	background-color: #C00;
 	background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ff1a1a), color-stop(3%, #e60000), color-stop(100%, #b30000));
@@ -250,8 +251,14 @@ body {
 .x-title-icon { background-size: 16px; }
 
 // Fix for scroller tab bar
-//.x-box-scroller-body-horizontal { width: auto !important; margin-right: 18px; padding-right: 18px; }
+// .x-box-scroller-body-horizontal { width: auto !important; margin-right: 18px; padding-right: 18px; }
 //.x-box-scroller-tab-bar { z-index: 9999; }
+.x-box-inner.x-box-scroller-body-horizontal {
+	overflow: visible;
+	.x-tab-default-top {
+		overflow: visible;
+	}
+}
 
 .service {
 	width: 230px;
diff --git a/packages/local/rambox-dark-theme/sass/src/button/Button.scss b/packages/local/rambox-dark-theme/sass/src/button/Button.scss
index 4f09c3ae..62fde0b4 100644
--- a/packages/local/rambox-dark-theme/sass/src/button/Button.scss
+++ b/packages/local/rambox-dark-theme/sass/src/button/Button.scss
@@ -23,10 +23,16 @@
 }
 
 .x-btn {
-	&.x-btn-pressed, &.x-btn-focus, &.x-btn-over, &.x-btn-menu-active {
+	&.x-btn-focus, &.x-btn-over, &.x-btn-menu-active {
 		&.x-btn-default-toolbar-small {
 			border-color: $body-light-color;
 			background-color: $base-dark-color;
 		}
 	}
+	&.x-btn-pressed {
+		&.x-btn-default-toolbar-small {
+			border-color: $base-white;
+			background-color: $base-dark-color;
+		}
+	}
 }
\ No newline at end of file
diff --git a/packages/local/rambox-dark-theme/sass/src/form/field/Text.scss b/packages/local/rambox-dark-theme/sass/src/form/field/Text.scss
index a601cc54..ebf5411b 100644
--- a/packages/local/rambox-dark-theme/sass/src/form/field/Text.scss
+++ b/packages/local/rambox-dark-theme/sass/src/form/field/Text.scss
@@ -1,11 +1,25 @@
 .x-form-trigger-wrap {
-	border-radius: $border-radius-md;
-	border-width: 2px;
-	border-color: $base-gray;
-	background-color: transparent;
+	// border-radius: $border-radius-md;
+	// border-width: 2px;
+	// border-color: $base-gray;
+	// background-color: transparent;
+	border-width: 1px;
+    border-radius: 0;
+    border-style: solid;
+    border-color: $base-color;
+    background-color: $base-dark-color;
+	color: $base-light-text;
 	.x-form-text, .x-form-trigger-default {
 		border-radius: $border-radius-md;
 		background-color: transparent;
 		color: $base-light-text;
+		.x-form-spinner-default {
+			border-radius: $border-radius-md;
+			background-color: $body-color;
+			color: $base-light-text;
+		}
 	}
+}
+.x-form-item-label-default {
+	color: $base-light-text;
 }
\ No newline at end of file
diff --git a/packages/local/rambox-dark-theme/sass/src/panel/Tool.scss b/packages/local/rambox-dark-theme/sass/src/panel/Tool.scss
index 67858f49..a11bf6a1 100644
--- a/packages/local/rambox-dark-theme/sass/src/panel/Tool.scss
+++ b/packages/local/rambox-dark-theme/sass/src/panel/Tool.scss
@@ -1,13 +1,17 @@
 .x-btn-icon-el-default-small.x-btn-glyph {
 	cursor: pointer;
-	color: #2E658E;
+	color: $base-gray;
+}
+.x-btn-icon-el-default-toolbar-small.x-btn-glyph {
+	cursor: pointer;
+	color: $base-gray;
+	opacity: 1;
 }
 .x-panel-default {
 	.x-toolbar-docked-bottom {
 		background-color: $body-color;	
 	}
 }
-
 .x-autocontainer-innerCt {
 	background-color: rgba($body-light-color, .12);
 }
\ No newline at end of file
diff --git a/packages/local/rambox-dark-theme/sass/src/window/MessageBox.scss b/packages/local/rambox-dark-theme/sass/src/window/MessageBox.scss
index 74f3ee76..5155d8ae 100644
--- a/packages/local/rambox-dark-theme/sass/src/window/MessageBox.scss
+++ b/packages/local/rambox-dark-theme/sass/src/window/MessageBox.scss
@@ -1,5 +1,8 @@
 .x-window-header-default-top {
 	background: $base-color;
+	.x-tool-img {
+		background-color: transparent;
+	}
 }
 .x-message-box .x-window-body {
 	background: $body-color;
diff --git a/packages/local/rambox-dark-theme/sass/src/window/Window.scss b/packages/local/rambox-dark-theme/sass/src/window/Window.scss
new file mode 100644
index 00000000..f7fc603b
--- /dev/null
+++ b/packages/local/rambox-dark-theme/sass/src/window/Window.scss
@@ -0,0 +1,22 @@
+.x-window-default {
+	// .x-window-header-default {
+
+	// }
+	.x-window-body-default {
+		background: $body-color;
+		color: $base-light-text;
+		.x-window-item > div {
+			background: $body-color;
+			color: $base-light-text;
+			.x-component-default {
+				color: $base-light-text;
+			}
+			.fieldset-body-default {
+				padding: 0 .1rem .25rem
+			}
+		}
+	}
+	// .x-window-footer-default {
+
+	// }
+}
\ No newline at end of file