diff --git a/client/src/main/java/envoy/client/ui/listcell/MessageListCell.java b/client/src/main/java/envoy/client/ui/listcell/MessageListCell.java
index efd2d73..49bcd61 100644
--- a/client/src/main/java/envoy/client/ui/listcell/MessageListCell.java
+++ b/client/src/main/java/envoy/client/ui/listcell/MessageListCell.java
@@ -32,6 +32,6 @@ public final class MessageListCell extends AbstractListCell<Message, MessageCont
 
 	private void adjustPadding(int listWidth, boolean ownMessage) {
 		int padding = 10 + Math.max((listWidth - 1000) / 2, 0);
-		setPadding(ownMessage ? new Insets(0, padding, 6, 0) : new Insets(0, 0, 6, padding));
+		setPadding(ownMessage ? new Insets(3, padding, 3, 0) : new Insets(3, 0, 3, padding));
 	}
 }
diff --git a/client/src/main/resources/css/base.css b/client/src/main/resources/css/base.css
index d3c0954..79099d7 100644
--- a/client/src/main/resources/css/base.css
+++ b/client/src/main/resources/css/base.css
@@ -4,8 +4,10 @@
 
 .context-menu, .context-menu > * {
 	-fx-background-radius: 15.0px;
-	/*TODO: solution below does not work */
-	-fx-background-color: transparent;
+}
+
+.list-cell:selected, .menu-item:hover {
+    -fx-background-color: #454c4f;
 }
 
 #text-enter-container, #contact-search-enter-container {
diff --git a/client/src/main/resources/css/dark.css b/client/src/main/resources/css/dark.css
index f990855..7ab6a59 100644
--- a/client/src/main/resources/css/dark.css
+++ b/client/src/main/resources/css/dark.css
@@ -22,10 +22,6 @@
 	-fx-background-color: #222222;
 }
 
-.list-cell:selected, .list-cell:selected > *, .menu-item:hover {
-    -fx-background-color: #690099;
-}
-
 .received-message {
 	-fx-background-color: gray;
 }
diff --git a/client/src/main/resources/css/light.css b/client/src/main/resources/css/light.css
index 147bd2b..7cd3ac1 100644
--- a/client/src/main/resources/css/light.css
+++ b/client/src/main/resources/css/light.css
@@ -18,10 +18,6 @@
 	-fx-background-color: #E3E3E3;
 }
 
-.list-cell:selected, .list-cell:selected > *, .menu-item:hover {
-    -fx-background-color: #805959;
-}
-
 .received-message {
 	-fx-background-color: lightgray;
 }