diff --git a/Cartfile b/Cartfile
index 543e2fd94..c396ca96a 100644
--- a/Cartfile
+++ b/Cartfile
@@ -1,3 +1,4 @@
 github "mxcl/PromiseKit"
 github "TheLevelUp/ZXingObjC"
+github "PureLayout/PureLayout"
 
diff --git a/Cartfile.resolved b/Cartfile.resolved
index fad392f6d..53a361538 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,2 +1,3 @@
 github "mxcl/PromiseKit" "4.1.8"
+github "PureLayout/PureLayout" "v3.0.2"
 github "TheLevelUp/ZXingObjC" "3.2.1"
diff --git a/Carthage b/Carthage
index 3b6c9805d..c52834e19 160000
--- a/Carthage
+++ b/Carthage
@@ -1 +1 @@
-Subproject commit 3b6c9805dc594bb7a0b77b6f451594011af67ea2
+Subproject commit c52834e1987ffe93dac39113b7cec876dcfe4a70
diff --git a/Podfile b/Podfile
index f3ef1f003..06f40022c 100644
--- a/Podfile
+++ b/Podfile
@@ -8,10 +8,8 @@ target 'Signal' do
     pod 'SignalServiceKit',           git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
     #pod 'SignalServiceKit',           path: '../SignalServiceKit'
     pod 'OpenSSL'
-    pod 'FFCircularProgressView',     '~> 0.5'
     pod 'SCWaveformView',             '~> 1.0'
     pod 'JSQMessagesViewController'
-    pod 'PureLayout'
     target 'SignalTests' do
         inherit! :search_paths
     end
diff --git a/Podfile.lock b/Podfile.lock
index 93bc9a3a9..239d0e7df 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -27,7 +27,6 @@ PODS:
     - CocoaLumberjack/Core
   - CocoaLumberjack/Extensions (2.4.0):
     - CocoaLumberjack/Default
-  - FFCircularProgressView (0.5)
   - HKDFKit (0.0.3)
   - JSQMessagesViewController (7.3.4):
     - JSQSystemSoundPlayer (~> 2.0.1)
@@ -38,7 +37,6 @@ PODS:
   - Mantle/extobjc (2.1.0)
   - OpenSSL (1.0.210)
   - ProtocolBuffers (1.9.11)
-  - PureLayout (3.0.2)
   - Reachability (3.2)
   - SAMKeychain (1.5.2)
   - SCWaveformView (1.0.0)
@@ -112,10 +110,8 @@ PODS:
 
 DEPENDENCIES:
   - AxolotlKit (from `https://github.com/WhisperSystems/SignalProtocolKit.git`)
-  - FFCircularProgressView (~> 0.5)
   - JSQMessagesViewController
   - OpenSSL
-  - PureLayout
   - SCWaveformView (~> 1.0)
   - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
   - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
@@ -144,7 +140,6 @@ SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
   AxolotlKit: 240c7d761e4b1be9c6de78ebec498aaeedc978f4
   CocoaLumberjack: aa9dcab71bdf9eaf2a63bbd9ddc87863efe45457
-  FFCircularProgressView: 683a4ab1e1bd613246a3dffa61503ffdebcde8d8
   HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
   JSQMessagesViewController: 39fed975e3c9f8eba7292071e29eeb541d105e66
   JSQSystemSoundPlayer: c5850e77a4363ffd374cd851154b9af93264ed8d
@@ -152,7 +147,6 @@ SPEC CHECKSUMS:
   Mantle: 2fa750afa478cd625a94230fbf1c13462f29395b
   OpenSSL: 246ffb948e9d56466727fd318134af35f5aa764e
   ProtocolBuffers: d509225eb2ea43d9582a59e94348fcf86e2abd65
-  PureLayout: 4d550abe49a94f24c2808b9b95db9131685fe4cd
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
   SAMKeychain: 1865333198217411f35327e8da61b43de79b635b
   SCWaveformView: 52a96750255d817e300565a80c81fb643e233e07
@@ -163,6 +157,6 @@ SPEC CHECKSUMS:
   UnionFind: c33be5adb12983981d6e827ea94fc7f9e370f52d
   YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
 
-PODFILE CHECKSUM: e1b30ecf8ba192005de35b7e0928ed01ae8a91ba
+PODFILE CHECKSUM: c4ba1b6a6e6d71830df353075ba164e346303c27
 
 COCOAPODS: 1.2.0