diff --git a/app/src/main/java/org/kontalk/ui/view/AudioContentView.java b/app/src/main/java/org/kontalk/ui/view/AudioContentView.java
index 6d2f28bca..b015e8005 100644
--- a/app/src/main/java/org/kontalk/ui/view/AudioContentView.java
+++ b/app/src/main/java/org/kontalk/ui/view/AudioContentView.java
@@ -86,6 +86,10 @@ protected void onFinishInflate() {
         mSeekBar = (SeekBar) findViewById(R.id.balloon_audio_seekbar);
         mDownloadButton = (ImageView) findViewById(R.id.balloon_audio_download);
         mTime = (TextView) findViewById(R.id.balloon_audio_time);
+
+        if (isInEditMode()) {
+            mDownloadButton.setVisibility(GONE);
+        }
     }
 
     @Override
diff --git a/app/src/main/res/drawable-hdpi/pause_balloon.png b/app/src/main/res/drawable-hdpi/pause_balloon.png
index 60e19f033..cfe8056cd 100644
Binary files a/app/src/main/res/drawable-hdpi/pause_balloon.png and b/app/src/main/res/drawable-hdpi/pause_balloon.png differ
diff --git a/app/src/main/res/drawable-hdpi/play_balloon.png b/app/src/main/res/drawable-hdpi/play_balloon.png
index eaeddee24..8fcb34c9d 100644
Binary files a/app/src/main/res/drawable-hdpi/play_balloon.png and b/app/src/main/res/drawable-hdpi/play_balloon.png differ
diff --git a/app/src/main/res/drawable-mdpi/pause_balloon.png b/app/src/main/res/drawable-mdpi/pause_balloon.png
index 5354edb25..90f38c6b2 100644
Binary files a/app/src/main/res/drawable-mdpi/pause_balloon.png and b/app/src/main/res/drawable-mdpi/pause_balloon.png differ
diff --git a/app/src/main/res/drawable-mdpi/play_balloon.png b/app/src/main/res/drawable-mdpi/play_balloon.png
index dd022c741..2026f82b7 100644
Binary files a/app/src/main/res/drawable-mdpi/play_balloon.png and b/app/src/main/res/drawable-mdpi/play_balloon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/pause_balloon.png b/app/src/main/res/drawable-xhdpi/pause_balloon.png
index 9b428c2c1..f6b78fe81 100644
Binary files a/app/src/main/res/drawable-xhdpi/pause_balloon.png and b/app/src/main/res/drawable-xhdpi/pause_balloon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/play_balloon.png b/app/src/main/res/drawable-xhdpi/play_balloon.png
index a0005ccf0..8a2bff800 100644
Binary files a/app/src/main/res/drawable-xhdpi/play_balloon.png and b/app/src/main/res/drawable-xhdpi/play_balloon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/pause_balloon.png b/app/src/main/res/drawable-xxhdpi/pause_balloon.png
index 6e84637d0..681604c83 100644
Binary files a/app/src/main/res/drawable-xxhdpi/pause_balloon.png and b/app/src/main/res/drawable-xxhdpi/pause_balloon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/play_balloon.png b/app/src/main/res/drawable-xxhdpi/play_balloon.png
index 322410a42..e3ffdde95 100644
Binary files a/app/src/main/res/drawable-xxhdpi/play_balloon.png and b/app/src/main/res/drawable-xxhdpi/play_balloon.png differ
diff --git a/app/src/main/res/layout/message_content_audio.xml b/app/src/main/res/layout/message_content_audio.xml
index 2903e2ef8..b1051d9a0 100644
--- a/app/src/main/res/layout/message_content_audio.xml
+++ b/app/src/main/res/layout/message_content_audio.xml
@@ -21,7 +21,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:id="@+id/balloon_audio_player"
-        android:layout_marginTop="12dp"
         android:focusable="false"
         android:background="@drawable/play_balloon"
         android:layout_alignParentLeft="true" />
@@ -30,10 +29,9 @@
         android:id="@+id/balloon_audio_seekbar"
         android:layout_width="@dimen/message_audio_width"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="9dp"
-        android:layout_marginTop="6dp"
+        android:layout_marginTop="8dp"
         android:focusable="false"
-        android:layout_toRightOf="@+id/balloon_audio_player" />
+        android:layout_toRightOf="@+id/balloon_audio_player"/>
 
     <TextView
         android:id="@+id/balloon_audio_time"