diff --git a/web/src/index.css b/web/src/index.css
index 98d8732..6adcd44 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -27,6 +27,8 @@
 	--button-hover-color: rgba(0, 0, 0, .2);
 	--light-hover-color: rgba(0, 0, 0, .1);
 
+	--composer-background-color: #eeeeee;
+
 	--timeline-hover-bg-color: #eee;
 	--timeline-highlight-bg-color: rgba(255, 255, 0, .1);
 	--timeline-highlight-hover-bg-color: #eec;
@@ -103,6 +105,8 @@
 		--button-hover-color: rgba(255, 255, 255, .2);
 		--light-hover-color: rgba(255, 255, 255, .1);
 
+		--composer-background-color: #0a0a0a;
+
 		--timeline-hover-bg-color: #111;
 		--timeline-highlight-bg-color: rgba(255, 255, 0, .1);
 		--timeline-highlight-hover-bg-color: #331;
@@ -115,7 +119,7 @@
 		--room-list-entry-hover-color: rgba(255, 255, 255, 0.075);
 		--room-list-entry-selected-color: rgba(255, 255, 255, 0.125);
 
-		--modal-box-shadow-color: rgba(255, 255, 255, 0.1);
+		--modal-box-shadow-color: rgba(255, 255, 255, 0.04);
 
 		--emoji-selected-border-color: #131;
 
diff --git a/web/src/ui/composer/Autocompleter.css b/web/src/ui/composer/Autocompleter.css
index bd013b5..f437174 100644
--- a/web/src/ui/composer/Autocompleter.css
+++ b/web/src/ui/composer/Autocompleter.css
@@ -5,9 +5,11 @@ div.autocompletions-wrapper {
 
 div.autocompletions {
 	position: absolute;
-	bottom: 0;
-	border-top: 1px solid var(--border-color);
-	border-right: 1px solid var(--border-color);
+	bottom: 1.2rem;
+	left: 1.6rem;
+	border: 1px solid var(--border-color);
+	border-radius: 0.5rem;
+	box-shadow: 0 0 1rem var(--modal-box-shadow-color);
 	background-color: var(--background-color);
 	padding: .5rem;
 	max-height: 20rem;
diff --git a/web/src/ui/composer/MessageComposer.css b/web/src/ui/composer/MessageComposer.css
index 6c02fd1..b15258e 100644
--- a/web/src/ui/composer/MessageComposer.css
+++ b/web/src/ui/composer/MessageComposer.css
@@ -1,9 +1,14 @@
 div.message-composer {
-	border-top: 1px solid var(--border-color);
+	margin: -1rem 1.6rem 0 1.6rem;
+	background-color: var(--composer-background-color);
+	border: 1px solid var(--border-color);
+	border-radius: 0.5rem;
 	overflow: hidden;
 	grid-area: input;
 	/* WebKit/Safari requires this hack for some reason, works fine without in other browsers */
 	min-height: 2.25rem;
+	z-index: 999;
+	box-shadow: 0 0 1rem var(--modal-box-shadow-color);
 
 	blockquote.reply-body > pre {
 		text-wrap: auto !important;
diff --git a/web/src/ui/timeline/TimelineView.css b/web/src/ui/timeline/TimelineView.css
index 9620bc0..dda9cbf 100644
--- a/web/src/ui/timeline/TimelineView.css
+++ b/web/src/ui/timeline/TimelineView.css
@@ -1,5 +1,5 @@
 div.timeline-view {
-	padding: 1rem;
+	padding: 1rem 0 2rem 0;
 	overflow-y: scroll;
 
 	display: flex;