diff --git a/src/main/java/envoy/client/ui/controller/ChatScene.java b/src/main/java/envoy/client/ui/controller/ChatScene.java
index f515952..75f500c 100644
--- a/src/main/java/envoy/client/ui/controller/ChatScene.java
+++ b/src/main/java/envoy/client/ui/controller/ChatScene.java
@@ -111,6 +111,7 @@ public final class ChatScene implements Restorable {
 		userList.setCellFactory(ContactListCellFactory::new);
 
 		settingsButton.setGraphic(new ImageView(IconUtil.loadDefault("settings", 16)));
+		voiceButton.setGraphic(new ImageView(IconUtil.loadDefaultThemeSensitive("", 24)));
 
 		// Listen to received messages
 		eventBus.register(MessageCreationEvent.class, e -> {
@@ -262,13 +263,17 @@ public final class ChatScene implements Restorable {
 			try {
 				if (!recording) {
 					recording = true;
-					Platform.runLater(() -> voiceButton.setText("Recording..."));
+					Platform.runLater(() -> {
+						voiceButton.setText("Recording");
+						voiceButton.setGraphic(new ImageView(IconUtil.loadDefault("microphone_recording", 24)));
+					});
 					recorder.start();
 				} else {
 					pendingAttachment	= new Attachment(recorder.finish(), AttachmentType.VOICE);
 					recording			= false;
 					Platform.runLater(() -> {
-						voiceButton.setText("Record Voice Message");
+						voiceButton.setGraphic(new ImageView(IconUtil.loadDefaultThemeSensitive("microphone_", 24)));
+						voiceButton.setText(null);
 						checkPostConditions(false);
 						attachmentView.setImage(IconUtil.loadDefaultThemeSensitive("attachment_present_", 20));
 						attachmentView.setVisible(true);
diff --git a/src/main/resources/icons/forward_white.png b/src/main/resources/icons/forward_white.png
new file mode 100644
index 0000000..9c75854
Binary files /dev/null and b/src/main/resources/icons/forward_white.png differ
diff --git a/src/main/resources/icons/microphone_black.png b/src/main/resources/icons/microphone_black.png
new file mode 100644
index 0000000..58447c7
Binary files /dev/null and b/src/main/resources/icons/microphone_black.png differ
diff --git a/src/main/resources/icons/microphone_recording.png b/src/main/resources/icons/microphone_recording.png
new file mode 100644
index 0000000..a831cdb
Binary files /dev/null and b/src/main/resources/icons/microphone_recording.png differ
diff --git a/src/main/resources/icons/microphone_white.png b/src/main/resources/icons/microphone_white.png
new file mode 100644
index 0000000..5e35de0
Binary files /dev/null and b/src/main/resources/icons/microphone_white.png differ
diff --git a/src/main/resources/icons/settings_black.png b/src/main/resources/icons/settings_black.png
new file mode 100644
index 0000000..504d3d6
Binary files /dev/null and b/src/main/resources/icons/settings_black.png differ
diff --git a/src/main/resources/icons/settings_white.png b/src/main/resources/icons/settings_white.png
new file mode 100644
index 0000000..f956615
Binary files /dev/null and b/src/main/resources/icons/settings_white.png differ