diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue
index b96ae2da5a..6f466e576f 100644
--- a/src/client/app/desktop/views/components/notes.note.vue
+++ b/src/client/app/desktop/views/components/notes.note.vue
@@ -473,10 +473,10 @@ root(isDark)
 
 						> *
 							display inline-block
-							margin 0 8px 0 0
+							margin 0 0 4px 6px
 							padding 2px 8px 2px 16px
 							font-size 90%
-							color #8d969e
+							color $theme-color
 							background isDark ? #313543 : #edf0f3
 							border-radius 4px
 
diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue
index d50fc3c235..617f633f56 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note.vue
@@ -381,10 +381,10 @@ root(isDark)
 
 						> *
 							display inline-block
-							margin 0 8px 0 0
+							margin 0 0 4px 6px
 							padding 2px 8px 2px 16px
 							font-size 90%
-							color #8d969e
+							color $theme-color
 							background isDark ? #313543 : #edf0f3
 							border-radius 4px
 
diff --git a/src/client/app/desktop/views/pages/user/user.profile.vue b/src/client/app/desktop/views/pages/user/user.profile.vue
index 8afa7122b3..21f3c57c75 100644
--- a/src/client/app/desktop/views/pages/user/user.profile.vue
+++ b/src/client/app/desktop/views/pages/user/user.profile.vue
@@ -126,7 +126,7 @@ root(isDark)
 	> .friend-form
 		padding 16px
 		text-align center
-		border-top solid 1px #eee
+		border-bottom solid 1px isDark ? #21242f : #eee
 
 		> .followed
 			margin 12px 0 0 0
@@ -144,7 +144,7 @@ root(isDark)
 	> .action-form
 		padding 16px
 		text-align center
-		border-top solid 1px #eee
+		border-bottom solid 1px isDark ? #21242f : #eee
 
 		> *
 			width 100%
@@ -154,8 +154,8 @@ root(isDark)
 
 	> .birthday
 		padding 16px
-		color #555
-		border-top solid 1px #eee
+		color isDark ? #e3e7ea : #555
+		border-bottom solid 1px isDark ? #21242f : #eee
 
 		> p
 			margin 0
@@ -165,8 +165,8 @@ root(isDark)
 
 	> .twitter
 		padding 16px
-		color #555
-		border-top solid 1px #eee
+		color isDark ? #e3e7ea : #555
+		border-bottom solid 1px isDark ? #21242f : #eee
 
 		> p
 			margin 0
@@ -176,8 +176,8 @@ root(isDark)
 
 	> .status
 		padding 16px
-		color #555
-		border-top solid 1px #eee
+		color isDark ? #e3e7ea : #555
+		border-bottom solid 1px isDark ? #21242f : #eee
 
 		> p
 			margin 8px 0
diff --git a/src/client/app/desktop/views/pages/user/user.vue b/src/client/app/desktop/views/pages/user/user.vue
index 7f05c695af..c8a04c6b04 100644
--- a/src/client/app/desktop/views/pages/user/user.vue
+++ b/src/client/app/desktop/views/pages/user/user.vue
@@ -92,7 +92,7 @@ root(isDark)
 		&.is-suspended
 			color isDark ? #ffb4b4 : #570808
 			background isDark ? #611d1d : #ffdbdb
-			border solid 1px isDarl ? #d64a4a : #e09696
+			border solid 1px isDark ? #d64a4a : #e09696
 
 		&.is-remote
 			color isDark ? #ffbd3e : #573c08
@@ -105,6 +105,7 @@ root(isDark)
 	> main
 		display flex
 		justify-content center
+		width 673px
 
 		> .main
 		> .side
diff --git a/src/client/app/desktop/views/pages/welcome.vue b/src/client/app/desktop/views/pages/welcome.vue
index 029e44e27c..2203efcc92 100644
--- a/src/client/app/desktop/views/pages/welcome.vue
+++ b/src/client/app/desktop/views/pages/welcome.vue
@@ -199,7 +199,7 @@ root(isDark)
 				> .login
 					width $loginWidth
 					padding 16px 32px 32px 32px
-					background #f5f5f5
+					background isDark ? #2e3440 : #f5f5f5
 
 			> .info
 				margin 16px auto
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue
index ecdfee3b44..bd0a0d1b5e 100644
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@@ -424,10 +424,10 @@ root(isDark)
 
 						> *
 							display inline-block
-							margin 0 8px 0 0
+							margin 0 0 4px 6px
 							padding 2px 8px 2px 16px
 							font-size 90%
-							color #8d969e
+							color $theme-color
 							background isDark ? #313543 : #edf0f3
 							border-radius 4px