diff --git a/Signal/Images.xcassets/audio_pause_black_40.imageset/Contents.json b/Signal/Images.xcassets/audio_pause_black_40.imageset/Contents.json
deleted file mode 100644
index 08698f7cf..000000000
--- a/Signal/Images.xcassets/audio_pause_black_40.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "pause_black_40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "pause_black_40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "pause_black_40@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/audio_pause_black_40.imageset/pause_black_40@1x.png b/Signal/Images.xcassets/audio_pause_black_40.imageset/pause_black_40@1x.png
deleted file mode 100644
index e45cf7d05..000000000
Binary files a/Signal/Images.xcassets/audio_pause_black_40.imageset/pause_black_40@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_black_40.imageset/pause_black_40@2x.png b/Signal/Images.xcassets/audio_pause_black_40.imageset/pause_black_40@2x.png
deleted file mode 100644
index 8eba9aebb..000000000
Binary files a/Signal/Images.xcassets/audio_pause_black_40.imageset/pause_black_40@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_black_40.imageset/pause_black_40@3x.png b/Signal/Images.xcassets/audio_pause_black_40.imageset/pause_black_40@3x.png
deleted file mode 100644
index b2d4048d8..000000000
Binary files a/Signal/Images.xcassets/audio_pause_black_40.imageset/pause_black_40@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_black_40.imageset/Contents.json b/Signal/Images.xcassets/audio_pause_black_48.imageset/Contents.json
similarity index 67%
rename from Signal/Images.xcassets/audio_play_black_40.imageset/Contents.json
rename to Signal/Images.xcassets/audio_pause_black_48.imageset/Contents.json
index 2f22c2c65..dcd8be87f 100644
--- a/Signal/Images.xcassets/audio_play_black_40.imageset/Contents.json
+++ b/Signal/Images.xcassets/audio_pause_black_48.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "play_black_40@1x.png",
+      "filename" : "pause-48@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "play_black_40@2x.png",
+      "filename" : "pause-48@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "play_black_40@3x.png",
+      "filename" : "pause-48@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/Signal/Images.xcassets/audio_pause_black_48.imageset/pause-48@1x.png b/Signal/Images.xcassets/audio_pause_black_48.imageset/pause-48@1x.png
new file mode 100644
index 000000000..2209338fa
Binary files /dev/null and b/Signal/Images.xcassets/audio_pause_black_48.imageset/pause-48@1x.png differ
diff --git a/Signal/Images.xcassets/audio_pause_black_48.imageset/pause-48@2x.png b/Signal/Images.xcassets/audio_pause_black_48.imageset/pause-48@2x.png
new file mode 100644
index 000000000..33d0c0f5a
Binary files /dev/null and b/Signal/Images.xcassets/audio_pause_black_48.imageset/pause-48@2x.png differ
diff --git a/Signal/Images.xcassets/audio_pause_black_48.imageset/pause-48@3x.png b/Signal/Images.xcassets/audio_pause_black_48.imageset/pause-48@3x.png
new file mode 100644
index 000000000..e1f207878
Binary files /dev/null and b/Signal/Images.xcassets/audio_pause_black_48.imageset/pause-48@3x.png differ
diff --git a/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/Contents.json b/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/Contents.json
deleted file mode 100644
index d9913d280..000000000
--- a/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_blue_bubble@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_blue_bubble@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_blue_bubble@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/audio_pause_blue_bubble@1x.png b/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/audio_pause_blue_bubble@1x.png
deleted file mode 100644
index cdfd78e64..000000000
Binary files a/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/audio_pause_blue_bubble@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/audio_pause_blue_bubble@2x.png b/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/audio_pause_blue_bubble@2x.png
deleted file mode 100644
index 213cdda4d..000000000
Binary files a/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/audio_pause_blue_bubble@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/audio_pause_blue_bubble@3x.png b/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/audio_pause_blue_bubble@3x.png
deleted file mode 100644
index 134283a6b..000000000
Binary files a/Signal/Images.xcassets/audio_pause_blue_bubble.imageset/audio_pause_blue_bubble@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_white_40.imageset/Contents.json b/Signal/Images.xcassets/audio_pause_white_40.imageset/Contents.json
deleted file mode 100644
index 9408a9e9f..000000000
--- a/Signal/Images.xcassets/audio_pause_white_40.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_white_40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_white_40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_white_40@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/audio_pause_white_40.imageset/audio_pause_white_40@1x.png b/Signal/Images.xcassets/audio_pause_white_40.imageset/audio_pause_white_40@1x.png
deleted file mode 100644
index e71876852..000000000
Binary files a/Signal/Images.xcassets/audio_pause_white_40.imageset/audio_pause_white_40@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_white_40.imageset/audio_pause_white_40@2x.png b/Signal/Images.xcassets/audio_pause_white_40.imageset/audio_pause_white_40@2x.png
deleted file mode 100644
index 5acbc3c35..000000000
Binary files a/Signal/Images.xcassets/audio_pause_white_40.imageset/audio_pause_white_40@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_white_40.imageset/audio_pause_white_40@3x.png b/Signal/Images.xcassets/audio_pause_white_40.imageset/audio_pause_white_40@3x.png
deleted file mode 100644
index 1e30ced9f..000000000
Binary files a/Signal/Images.xcassets/audio_pause_white_40.imageset/audio_pause_white_40@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_white_bubble.imageset/Contents.json b/Signal/Images.xcassets/audio_pause_white_bubble.imageset/Contents.json
deleted file mode 100644
index f83340d99..000000000
--- a/Signal/Images.xcassets/audio_pause_white_bubble.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_white_bubble@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_white_bubble@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_white_bubble@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/audio_pause_white_bubble.imageset/audio_pause_white_bubble@1x.png b/Signal/Images.xcassets/audio_pause_white_bubble.imageset/audio_pause_white_bubble@1x.png
deleted file mode 100644
index 4a13333f3..000000000
Binary files a/Signal/Images.xcassets/audio_pause_white_bubble.imageset/audio_pause_white_bubble@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_white_bubble.imageset/audio_pause_white_bubble@2x.png b/Signal/Images.xcassets/audio_pause_white_bubble.imageset/audio_pause_white_bubble@2x.png
deleted file mode 100644
index 5eba2a221..000000000
Binary files a/Signal/Images.xcassets/audio_pause_white_bubble.imageset/audio_pause_white_bubble@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_white_bubble.imageset/audio_pause_white_bubble@3x.png b/Signal/Images.xcassets/audio_pause_white_bubble.imageset/audio_pause_white_bubble@3x.png
deleted file mode 100644
index 242727482..000000000
Binary files a/Signal/Images.xcassets/audio_pause_white_bubble.imageset/audio_pause_white_bubble@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_white_large.imageset/Contents.json b/Signal/Images.xcassets/audio_pause_white_large.imageset/Contents.json
deleted file mode 100644
index ae1d595fd..000000000
--- a/Signal/Images.xcassets/audio_pause_white_large.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_white_large@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_white_large@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_pause_white_large@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/audio_pause_white_large.imageset/audio_pause_white_large@1x.png b/Signal/Images.xcassets/audio_pause_white_large.imageset/audio_pause_white_large@1x.png
deleted file mode 100644
index 4539bc0c1..000000000
Binary files a/Signal/Images.xcassets/audio_pause_white_large.imageset/audio_pause_white_large@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_white_large.imageset/audio_pause_white_large@2x.png b/Signal/Images.xcassets/audio_pause_white_large.imageset/audio_pause_white_large@2x.png
deleted file mode 100644
index 27c7a8376..000000000
Binary files a/Signal/Images.xcassets/audio_pause_white_large.imageset/audio_pause_white_large@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_pause_white_large.imageset/audio_pause_white_large@3x.png b/Signal/Images.xcassets/audio_pause_white_large.imageset/audio_pause_white_large@3x.png
deleted file mode 100644
index abdc8097e..000000000
Binary files a/Signal/Images.xcassets/audio_pause_white_large.imageset/audio_pause_white_large@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_black_40.imageset/play_black_40@1x.png b/Signal/Images.xcassets/audio_play_black_40.imageset/play_black_40@1x.png
deleted file mode 100644
index 97218beab..000000000
Binary files a/Signal/Images.xcassets/audio_play_black_40.imageset/play_black_40@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_black_40.imageset/play_black_40@2x.png b/Signal/Images.xcassets/audio_play_black_40.imageset/play_black_40@2x.png
deleted file mode 100644
index 4a4c6c1a8..000000000
Binary files a/Signal/Images.xcassets/audio_play_black_40.imageset/play_black_40@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_black_40.imageset/play_black_40@3x.png b/Signal/Images.xcassets/audio_play_black_40.imageset/play_black_40@3x.png
deleted file mode 100644
index 5077824f5..000000000
Binary files a/Signal/Images.xcassets/audio_play_black_40.imageset/play_black_40@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/play_button_large.imageset/Contents.json b/Signal/Images.xcassets/audio_play_black_48.imageset/Contents.json
similarity index 70%
rename from Signal/Images.xcassets/play_button_large.imageset/Contents.json
rename to Signal/Images.xcassets/audio_play_black_48.imageset/Contents.json
index e6d233075..0ed539fff 100644
--- a/Signal/Images.xcassets/play_button_large.imageset/Contents.json
+++ b/Signal/Images.xcassets/audio_play_black_48.imageset/Contents.json
@@ -2,16 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "play_button_large.png",
+      "filename" : "play-48@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "play_button_large@2x.png",
+      "filename" : "play-48@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
+      "filename" : "play-48@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/Signal/Images.xcassets/audio_play_black_48.imageset/play-48@1x.png b/Signal/Images.xcassets/audio_play_black_48.imageset/play-48@1x.png
new file mode 100644
index 000000000..0ddb16928
Binary files /dev/null and b/Signal/Images.xcassets/audio_play_black_48.imageset/play-48@1x.png differ
diff --git a/Signal/Images.xcassets/audio_play_black_48.imageset/play-48@2x.png b/Signal/Images.xcassets/audio_play_black_48.imageset/play-48@2x.png
new file mode 100644
index 000000000..e2e1f6e60
Binary files /dev/null and b/Signal/Images.xcassets/audio_play_black_48.imageset/play-48@2x.png differ
diff --git a/Signal/Images.xcassets/audio_play_black_48.imageset/play-48@3x.png b/Signal/Images.xcassets/audio_play_black_48.imageset/play-48@3x.png
new file mode 100644
index 000000000..f083fc5b6
Binary files /dev/null and b/Signal/Images.xcassets/audio_play_black_48.imageset/play-48@3x.png differ
diff --git a/Signal/Images.xcassets/audio_play_blue_bubble.imageset/Contents.json b/Signal/Images.xcassets/audio_play_blue_bubble.imageset/Contents.json
deleted file mode 100644
index 535e58c8d..000000000
--- a/Signal/Images.xcassets/audio_play_blue_bubble.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "audio_play_blue_bubble@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_play_blue_bubble@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_play_blue_bubble@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/audio_play_blue_bubble.imageset/audio_play_blue_bubble@1x.png b/Signal/Images.xcassets/audio_play_blue_bubble.imageset/audio_play_blue_bubble@1x.png
deleted file mode 100644
index 5f3727319..000000000
Binary files a/Signal/Images.xcassets/audio_play_blue_bubble.imageset/audio_play_blue_bubble@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_blue_bubble.imageset/audio_play_blue_bubble@2x.png b/Signal/Images.xcassets/audio_play_blue_bubble.imageset/audio_play_blue_bubble@2x.png
deleted file mode 100644
index f218f8eca..000000000
Binary files a/Signal/Images.xcassets/audio_play_blue_bubble.imageset/audio_play_blue_bubble@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_blue_bubble.imageset/audio_play_blue_bubble@3x.png b/Signal/Images.xcassets/audio_play_blue_bubble.imageset/audio_play_blue_bubble@3x.png
deleted file mode 100644
index 11fbea5d0..000000000
Binary files a/Signal/Images.xcassets/audio_play_blue_bubble.imageset/audio_play_blue_bubble@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_white_40.imageset/Contents.json b/Signal/Images.xcassets/audio_play_white_40.imageset/Contents.json
deleted file mode 100644
index add443ad5..000000000
--- a/Signal/Images.xcassets/audio_play_white_40.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "play_white_40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "play_white_40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "play_white_40@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/audio_play_white_40.imageset/play_white_40@1x.png b/Signal/Images.xcassets/audio_play_white_40.imageset/play_white_40@1x.png
deleted file mode 100644
index b892eee00..000000000
Binary files a/Signal/Images.xcassets/audio_play_white_40.imageset/play_white_40@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_white_40.imageset/play_white_40@2x.png b/Signal/Images.xcassets/audio_play_white_40.imageset/play_white_40@2x.png
deleted file mode 100644
index 2b414d83a..000000000
Binary files a/Signal/Images.xcassets/audio_play_white_40.imageset/play_white_40@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_white_40.imageset/play_white_40@3x.png b/Signal/Images.xcassets/audio_play_white_40.imageset/play_white_40@3x.png
deleted file mode 100644
index 073333aaa..000000000
Binary files a/Signal/Images.xcassets/audio_play_white_40.imageset/play_white_40@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_white_bubble.imageset/Contents.json b/Signal/Images.xcassets/audio_play_white_bubble.imageset/Contents.json
deleted file mode 100644
index 5419b447c..000000000
--- a/Signal/Images.xcassets/audio_play_white_bubble.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "audio_play_white_bubble@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_play_white_bubble@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_play_white_bubble@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/audio_play_white_bubble.imageset/audio_play_white_bubble@1x.png b/Signal/Images.xcassets/audio_play_white_bubble.imageset/audio_play_white_bubble@1x.png
deleted file mode 100644
index b3ff7bcb3..000000000
Binary files a/Signal/Images.xcassets/audio_play_white_bubble.imageset/audio_play_white_bubble@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_white_bubble.imageset/audio_play_white_bubble@2x.png b/Signal/Images.xcassets/audio_play_white_bubble.imageset/audio_play_white_bubble@2x.png
deleted file mode 100644
index 9294b58e2..000000000
Binary files a/Signal/Images.xcassets/audio_play_white_bubble.imageset/audio_play_white_bubble@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_white_bubble.imageset/audio_play_white_bubble@3x.png b/Signal/Images.xcassets/audio_play_white_bubble.imageset/audio_play_white_bubble@3x.png
deleted file mode 100644
index 48c0619a5..000000000
Binary files a/Signal/Images.xcassets/audio_play_white_bubble.imageset/audio_play_white_bubble@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_white_large.imageset/Contents.json b/Signal/Images.xcassets/audio_play_white_large.imageset/Contents.json
deleted file mode 100644
index 349353a52..000000000
--- a/Signal/Images.xcassets/audio_play_white_large.imageset/Contents.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "audio_play_white_large@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_play_white_large@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "audio_play_white_large@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/audio_play_white_large.imageset/audio_play_white_large@1x.png b/Signal/Images.xcassets/audio_play_white_large.imageset/audio_play_white_large@1x.png
deleted file mode 100644
index af18c795e..000000000
Binary files a/Signal/Images.xcassets/audio_play_white_large.imageset/audio_play_white_large@1x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_white_large.imageset/audio_play_white_large@2x.png b/Signal/Images.xcassets/audio_play_white_large.imageset/audio_play_white_large@2x.png
deleted file mode 100644
index c14e50fd0..000000000
Binary files a/Signal/Images.xcassets/audio_play_white_large.imageset/audio_play_white_large@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/audio_play_white_large.imageset/audio_play_white_large@3x.png b/Signal/Images.xcassets/audio_play_white_large.imageset/audio_play_white_large@3x.png
deleted file mode 100644
index da1178b12..000000000
Binary files a/Signal/Images.xcassets/audio_play_white_large.imageset/audio_play_white_large@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/play_button_large.imageset/play_button_large.png b/Signal/Images.xcassets/play_button_large.imageset/play_button_large.png
deleted file mode 100644
index 7f5f552ab..000000000
Binary files a/Signal/Images.xcassets/play_button_large.imageset/play_button_large.png and /dev/null differ
diff --git a/Signal/Images.xcassets/play_button_large.imageset/play_button_large@2x.png b/Signal/Images.xcassets/play_button_large.imageset/play_button_large@2x.png
deleted file mode 100644
index b4e394f27..000000000
Binary files a/Signal/Images.xcassets/play_button_large.imageset/play_button_large@2x.png and /dev/null differ
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
index e167b21c5..13ecd63c9 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSAudioMessageView.m
@@ -108,12 +108,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)setAudioIconToPlay
 {
-    [self setAudioIcon:[UIImage imageNamed:@"audio_play_black_40"]];
+    [self setAudioIcon:[UIImage imageNamed:@"audio_play_black_48"]];
 }
 
 - (void)setAudioIconToPause
 {
-    [self setAudioIcon:[UIImage imageNamed:@"audio_pause_black_40"]];
+    [self setAudioIcon:[UIImage imageNamed:@"audio_pause_black_48"]];
 }
 
 - (void)updateAudioProgressView
@@ -140,7 +140,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (CGFloat)vMargin
 {
-    return 0.f;
+    return 5.f;
 }
 
 - (CGFloat)vMargin
@@ -164,7 +164,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (CGFloat)iconSize
 {
-    return 40.f;
+    return 48.f;
 }
 
 - (CGFloat)iconSize
@@ -182,6 +182,8 @@ NS_ASSUME_NONNULL_BEGIN
     self.axis = UILayoutConstraintAxisHorizontal;
     self.alignment = UIStackViewAlignmentCenter;
     self.spacing = self.hSpacing;
+    self.layoutMarginsRelativeArrangement = YES;
+    self.layoutMargins = UIEdgeInsetsMake(self.vMargin, 0, self.vMargin, 0);
 
     _audioPlayPauseButton = [UIButton buttonWithType:UIButtonTypeCustom];
     self.audioPlayPauseButton.enabled = NO;
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
index 9c7c62a7d..94da5eee6 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSGenericAttachmentView.m
@@ -55,7 +55,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (CGFloat)vMargin
 {
-    return 0.f;
+    return 5.f;
 }
 
 - (CGSize)measureSizeWithMaxMessageWidth:(CGFloat)maxMessageWidth
@@ -92,6 +92,8 @@ NS_ASSUME_NONNULL_BEGIN
     self.axis = UILayoutConstraintAxisHorizontal;
     self.alignment = UIStackViewAlignmentCenter;
     self.spacing = self.hSpacing;
+    self.layoutMarginsRelativeArrangement = YES;
+    self.layoutMargins = UIEdgeInsetsMake(self.vMargin, 0, self.vMargin, 0);
 
     // attachment_file
     UIImage *image = [UIImage imageNamed:@"generic-attachment"];