diff --git a/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios.png b/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios.png
deleted file mode 100644
index d9509fd73..000000000
Binary files a/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios.png and /dev/null differ
diff --git a/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@2x.png b/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@2x.png
deleted file mode 100644
index be4932065..000000000
Binary files a/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@2x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@3x.png b/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@3x.png
deleted file mode 100644
index c2cef2ebc..000000000
Binary files a/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@3x.png and /dev/null differ
diff --git a/Signal/Images.xcassets/devices-icon.imageset/Contents.json b/Signal/Images.xcassets/ic_devices_ios.imageset/Contents.json
similarity index 85%
rename from Signal/Images.xcassets/devices-icon.imageset/Contents.json
rename to Signal/Images.xcassets/ic_devices_ios.imageset/Contents.json
index 32a80e337..cf22442ff 100644
--- a/Signal/Images.xcassets/devices-icon.imageset/Contents.json
+++ b/Signal/Images.xcassets/ic_devices_ios.imageset/Contents.json
@@ -19,8 +19,5 @@
   "info" : {
     "version" : 1,
     "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
   }
 }
\ No newline at end of file
diff --git a/Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios.png b/Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios.png
new file mode 100644
index 000000000..455b1b4de
Binary files /dev/null and b/Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios.png differ
diff --git a/Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios@2x.png b/Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios@2x.png
new file mode 100644
index 000000000..99a4ed1e0
Binary files /dev/null and b/Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios@2x.png differ
diff --git a/Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios@3x.png b/Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios@3x.png
new file mode 100644
index 000000000..f655c164d
Binary files /dev/null and b/Signal/Images.xcassets/ic_devices_ios.imageset/ic_devices_ios@3x.png differ
diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 381959b4e..0b8c4b3aa 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.5.0.5</string>
+	<string>2.5.0.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>
diff --git a/Signal/src/Storyboard/Storyboard.storyboard b/Signal/src/Storyboard/Storyboard.storyboard
index 05dd1dd93..246470b84 100644
--- a/Signal/src/Storyboard/Storyboard.storyboard
+++ b/Signal/src/Storyboard/Storyboard.storyboard
@@ -1708,25 +1708,25 @@ A0 09 9A FF A8 8A 09 99</string>
                                 <rect key="frame" x="16" y="294" width="288" height="230"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oqf-fj-8Va" userLabel="Spacer">
-                                        <rect key="frame" x="0.0" y="0.0" width="288" height="40"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="288" height="49"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="Xq5-fV-fUr"/>
                                         </constraints>
                                     </view>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="devices-icon" translatesAutoresizingMaskIntoConstraints="NO" id="zl7-KG-ma4">
-                                        <rect key="frame" x="72" y="40" width="144" height="115"/>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_devices_ios" translatesAutoresizingMaskIntoConstraints="NO" id="zl7-KG-ma4">
+                                        <rect key="frame" x="72" y="49" width="144" height="96"/>
                                         <color key="tintColor" red="0.67450980392156867" green="0.67450980392156867" blue="0.67450980392156867" alpha="1" colorSpace="calibratedRGB"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" secondItem="zl7-KG-ma4" secondAttribute="height" multiplier="5:4" id="RKt-hc-iWB"/>
+                                            <constraint firstAttribute="width" secondItem="zl7-KG-ma4" secondAttribute="height" multiplier="3:2" id="RKt-hc-iWB"/>
                                         </constraints>
                                     </imageView>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GMf-cM-kQN" userLabel="Spacer">
-                                        <rect key="frame" x="0.0" y="190.5" width="288" height="39.5"/>
+                                        <rect key="frame" x="0.0" y="181" width="288" height="49"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     </view>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Scan the QR code displayed on the device to link." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="3D8-yn-TJ8">
-                                        <rect key="frame" x="0.0" y="171" width="288" height="19.5"/>
+                                        <rect key="frame" x="0.0" y="161" width="288" height="20"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                         <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                         <nil key="highlightedColor"/>
@@ -2036,9 +2036,9 @@ A0 09 9A FF A8 8A 09 99</string>
         <image name="btnQRShow--white-1" width="66" height="66"/>
         <image name="call.png" width="100" height="100"/>
         <image name="contact-options-action" width="44" height="44"/>
-        <image name="devices-icon" width="180" height="144"/>
         <image name="empty-group-avatar" width="53" height="53"/>
         <image name="endcall.png" width="100" height="100"/>
+        <image name="ic_devices_ios" width="180" height="119"/>
         <image name="logoSignal" width="138" height="139"/>
         <image name="mute-active" width="80" height="80"/>
         <image name="mute-inactive" width="80" height="80"/>