diff --git a/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java b/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
index 1312615ab..695ecb6d7 100644
--- a/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
+++ b/src/main/java/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
@@ -137,10 +137,10 @@ public class AttachmentTypeSelector extends PopupWindow {
       animateButtonIn(cameraButton, ANIMATION_DURATION / 2);
       animateButtonIn(videoButton, ANIMATION_DURATION / 2);
       animateButtonIn(imageButton, ANIMATION_DURATION / 3);
-      animateButtonIn(audioButton, ANIMATION_DURATION / 3);
+      animateButtonIn(contactButton, ANIMATION_DURATION / 3);
       animateButtonIn(locationButton, ANIMATION_DURATION / 4);
       animateButtonIn(documentButton, ANIMATION_DURATION / 4);
-      animateButtonIn(contactButton, 0);
+      animateButtonIn(audioButton, 0);
       animateButtonIn(closeButton, 0);
     }
   }
diff --git a/src/main/res/layout/attachment_type_selector.xml b/src/main/res/layout/attachment_type_selector.xml
index 87268fdba..18178b8dc 100644
--- a/src/main/res/layout/attachment_type_selector.xml
+++ b/src/main/res/layout/attachment_type_selector.xml
@@ -143,25 +143,25 @@
             <!-- second row -->
 
             <LinearLayout android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:gravity="center"
-                          android:layout_weight="1"
-                          android:orientation="vertical">
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:layout_weight="1">
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
-                    android:id="@+id/audio_button"
+                    android:id="@+id/contact_button"
                     android:layout_width="53dp"
                     android:layout_height="53dp"
-                    android:src="@drawable/ic_headset_white_24dp"
+                    android:src="@drawable/ic_person_white_24dp"
                     android:scaleType="center"
-                    android:contentDescription="@string/audio"
-                    app:circleColor="@color/audio_icon"/>
+                    android:contentDescription="@string/contact"
+                    app:circleColor="@color/contact_icon"/>
 
                 <TextView android:layout_marginTop="10dp"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          style="@style/AttachmentTypeLabel"
-                          android:text="@string/audio"/>
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AttachmentTypeLabel"
+                    android:text="@string/contact"/>
 
             </LinearLayout>
 
@@ -189,25 +189,25 @@
             </LinearLayout>
 
             <LinearLayout android:layout_width="match_parent"
-                          android:layout_height="wrap_content"
-                          android:gravity="center"
-                          android:orientation="vertical"
-                          android:layout_weight="1">
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_weight="1"
+                android:orientation="vertical">
 
                 <org.thoughtcrime.securesms.components.CircleColorImageView
-                        android:id="@+id/contact_button"
-                        android:layout_width="53dp"
-                        android:layout_height="53dp"
-                        android:src="@drawable/ic_person_white_24dp"
-                        android:scaleType="center"
-                        android:contentDescription="@string/contact"
-                        app:circleColor="@color/contact_icon"/>
+                    android:id="@+id/audio_button"
+                    android:layout_width="53dp"
+                    android:layout_height="53dp"
+                    android:src="@drawable/ic_headset_white_24dp"
+                    android:scaleType="center"
+                    android:contentDescription="@string/audio"
+                    app:circleColor="@color/audio_icon"/>
 
                 <TextView android:layout_marginTop="10dp"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          style="@style/AttachmentTypeLabel"
-                          android:text="@string/contact"/>
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/AttachmentTypeLabel"
+                    android:text="@string/audio"/>
 
             </LinearLayout>