diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/util/SlidingPanelHandler.java b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/util/SlidingPanelHandler.java
index 66f920c640b95da472290b51736f48e3c360b5c5..dfe024d16e15c77dc5129fcecac300065ca39bda 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/util/SlidingPanelHandler.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/util/SlidingPanelHandler.java
@@ -183,10 +183,10 @@ public class SlidingPanelHandler {
         chatline.setOnKeyListener((v, keyCode, event) -> {
             if (event.getAction() == KeyEvent.ACTION_DOWN && (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER)) {
                 sendInput();
-                return true;
-            } else {
-                return false;
             }
+
+            // Always return false to make sure we don’t lose focus
+            return false;
         });
     }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_delete_dark.png b/app/src/main/res/drawable-hdpi/ic_delete_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..921e56198a8d784c09185f26ff4c0353c2c235a7
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_delete_dark.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_delete_light.png b/app/src/main/res/drawable-hdpi/ic_delete_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..29415958a21b2f0514eddc1ba3b452032a9e88d2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_delete_light.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pencil_dark.png b/app/src/main/res/drawable-hdpi/ic_pencil_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ca8fa1001ecc784dc4d2ad3a9147d37e97e69f2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_pencil_dark.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_pencil_light.png b/app/src/main/res/drawable-hdpi/ic_pencil_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..7adfd5509904cf534a498e14e7c70fb2dc296141
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_pencil_light.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete_dark.png b/app/src/main/res/drawable-mdpi/ic_delete_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..24bc02fd69949cff749fa2c8e871a51b4dd75e93
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_delete_dark.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_delete_light.png b/app/src/main/res/drawable-mdpi/ic_delete_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2e4dacbf5eb4661aaea1bcfcb63cf9292382f4f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_delete_light.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pencil_dark.png b/app/src/main/res/drawable-mdpi/ic_pencil_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c7ec3c17cf425cf71e956d806ab46dc241c9d4f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_pencil_dark.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pencil_light.png b/app/src/main/res/drawable-mdpi/ic_pencil_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..55baeb235e3da82767e85367a305cab983c4ef0a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_pencil_light.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_dark.png b/app/src/main/res/drawable-xhdpi/ic_delete_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b0e2dbd298fb15dc3cb05b60d0003338de2b521
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_delete_dark.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_light.png b/app/src/main/res/drawable-xhdpi/ic_delete_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f2aacd502bb97e49b3274bc4253c461d9d3635e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_delete_light.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pencil_dark.png b/app/src/main/res/drawable-xhdpi/ic_pencil_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c6a745434e309d6fa9e2ba6e756b33dca0943f5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_pencil_dark.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pencil_light.png b/app/src/main/res/drawable-xhdpi/ic_pencil_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..fceffdae9bc3030362b54a2dfc2c1b1fac0e6b2c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_pencil_light.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_dark.png b/app/src/main/res/drawable-xxhdpi/ic_delete_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..21287cbd0e69f4c938db6ae09dde6e8830ddc1dc
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_delete_dark.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_light.png b/app/src/main/res/drawable-xxhdpi/ic_delete_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..86508758d0a996aed2fff40cf3ccccf87ab6dabe
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_delete_light.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pencil_dark.png b/app/src/main/res/drawable-xxhdpi/ic_pencil_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..2beb2b4279e750488b07e8add9a7979d45ff4d6d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_pencil_dark.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pencil_light.png b/app/src/main/res/drawable-xxhdpi/ic_pencil_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccc7d2968311d49591adef22a1b1aef9c10f0a27
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_pencil_light.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..beb1637ee9735fc9dcf3a30f835a41f9c708e1b5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_delete_dark.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_light.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..acb9ab0c554f5b422d5a492fe986ae182484f781
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_delete_light.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pencil_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_pencil_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a20a6076541f5c0e3f9294a0e4ce93834f6d62d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_pencil_dark.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pencil_light.png b/app/src/main/res/drawable-xxxhdpi/ic_pencil_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..63dc6112ea2d547032b6182d32131af84cfdc7be
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_pencil_light.png differ