diff --git a/src/App/Pages/MainPage.cs b/src/App/Pages/MainPage.cs
index 38fdbd190..39785dc56 100644
--- a/src/App/Pages/MainPage.cs
+++ b/src/App/Pages/MainPage.cs
@@ -20,7 +20,7 @@ namespace Bit.App.Pages
             favoritesNavigation.Icon = "star";
 
             vaultNavigation.Title = AppResources.MyVault;
-            vaultNavigation.Icon = "fa-lock";
+            vaultNavigation.Icon = "fa_lock";
 
             toolsNavigation.Title = AppResources.Tools;
             toolsNavigation.Icon = "tools";
diff --git a/src/App/Pages/Vault/VaultListSitesPage.cs b/src/App/Pages/Vault/VaultListSitesPage.cs
index 3f6ece2f0..567442ce1 100644
--- a/src/App/Pages/Vault/VaultListSitesPage.cs
+++ b/src/App/Pages/Vault/VaultListSitesPage.cs
@@ -383,7 +383,7 @@ namespace Bit.App.Pages
             {
                 var image = new Image
                 {
-                    Source = "fa_folder_open.png",
+                    Source = "folder",
                     VerticalOptions = LayoutOptions.CenterAndExpand
                 };
 
diff --git a/src/iOS/Resources/fa-refresh.png b/src/iOS/Resources/fa-refresh.png
deleted file mode 100644
index 14053d2b5..000000000
Binary files a/src/iOS/Resources/fa-refresh.png and /dev/null differ
diff --git a/src/iOS/Resources/fa-refresh@2x.png b/src/iOS/Resources/fa-refresh@2x.png
deleted file mode 100644
index 138dd599c..000000000
Binary files a/src/iOS/Resources/fa-refresh@2x.png and /dev/null differ
diff --git a/src/iOS/Resources/fa-refresh@3x.png b/src/iOS/Resources/fa-refresh@3x.png
deleted file mode 100644
index 455815944..000000000
Binary files a/src/iOS/Resources/fa-refresh@3x.png and /dev/null differ
diff --git a/src/iOS/Resources/fa_folder_open.png b/src/iOS/Resources/fa_folder_open.png
deleted file mode 100644
index 52583578f..000000000
Binary files a/src/iOS/Resources/fa_folder_open.png and /dev/null differ
diff --git a/src/iOS/Resources/fa_folder_open@2x.png b/src/iOS/Resources/fa_folder_open@2x.png
deleted file mode 100644
index 38c3cbeee..000000000
Binary files a/src/iOS/Resources/fa_folder_open@2x.png and /dev/null differ
diff --git a/src/iOS/Resources/fa_folder_open@3x.png b/src/iOS/Resources/fa_folder_open@3x.png
deleted file mode 100644
index 34c69f4c2..000000000
Binary files a/src/iOS/Resources/fa_folder_open@3x.png and /dev/null differ
diff --git a/src/iOS/Resources/fa-lock.png b/src/iOS/Resources/fa_lock.png
similarity index 100%
rename from src/iOS/Resources/fa-lock.png
rename to src/iOS/Resources/fa_lock.png
diff --git a/src/iOS/Resources/fa-lock@2x.png b/src/iOS/Resources/fa_lock@2x.png
similarity index 100%
rename from src/iOS/Resources/fa-lock@2x.png
rename to src/iOS/Resources/fa_lock@2x.png
diff --git a/src/iOS/Resources/fa-lock@3x.png b/src/iOS/Resources/fa_lock@3x.png
similarity index 100%
rename from src/iOS/Resources/fa-lock@3x.png
rename to src/iOS/Resources/fa_lock@3x.png
diff --git a/src/iOS/Resources/folder.png b/src/iOS/Resources/folder.png
new file mode 100644
index 000000000..9799f5d0e
Binary files /dev/null and b/src/iOS/Resources/folder.png differ
diff --git a/src/iOS/Resources/folder@2x.png b/src/iOS/Resources/folder@2x.png
new file mode 100644
index 000000000..5e559423a
Binary files /dev/null and b/src/iOS/Resources/folder@2x.png differ
diff --git a/src/iOS/Resources/folder@3x.png b/src/iOS/Resources/folder@3x.png
new file mode 100644
index 000000000..27fb0308f
Binary files /dev/null and b/src/iOS/Resources/folder@3x.png differ
diff --git a/src/iOS/iOS.csproj b/src/iOS/iOS.csproj
index 6c9a3f3a9..8082a32fb 100644
--- a/src/iOS/iOS.csproj
+++ b/src/iOS/iOS.csproj
@@ -21,18 +21,27 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>x86_64</MtouchArch>
+    <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
     <MtouchSdkVersion>9.3</MtouchSdkVersion>
-    <MtouchI18n>
-    </MtouchI18n>
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignProvision>
     </CodesignProvision>
     <CodesignExtraArgs>
     </CodesignExtraArgs>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <MtouchProfiling>False</MtouchProfiling>
+    <MtouchFastDev>False</MtouchFastDev>
+    <MtouchUseLlvm>False</MtouchUseLlvm>
+    <MtouchUseThumb>False</MtouchUseThumb>
+    <MtouchEnableBitcode>False</MtouchEnableBitcode>
+    <MtouchUseSGen>False</MtouchUseSGen>
+    <MtouchUseRefCounting>False</MtouchUseRefCounting>
+    <OptimizePNGs>True</OptimizePNGs>
+    <MtouchTlsProvider>Default</MtouchTlsProvider>
+    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchFloat32>False</MtouchFloat32>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -54,14 +63,28 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARM64</MtouchArch>
+    <MtouchArch>ARMv7, ARM64</MtouchArch>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchDebug>true</MtouchDebug>
+    <MtouchDebug>True</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignProvision>
     </CodesignProvision>
     <CodesignExtraArgs>
     </CodesignExtraArgs>
+    <MtouchSdkVersion>9.3</MtouchSdkVersion>
+    <MtouchLink>SdkOnly</MtouchLink>
+    <MtouchProfiling>False</MtouchProfiling>
+    <MtouchFastDev>False</MtouchFastDev>
+    <MtouchUseLlvm>False</MtouchUseLlvm>
+    <MtouchUseThumb>False</MtouchUseThumb>
+    <MtouchEnableBitcode>False</MtouchEnableBitcode>
+    <MtouchUseSGen>False</MtouchUseSGen>
+    <MtouchUseRefCounting>False</MtouchUseRefCounting>
+    <OptimizePNGs>True</OptimizePNGs>
+    <MtouchTlsProvider>Default</MtouchTlsProvider>
+    <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
+    <MtouchFloat32>False</MtouchFloat32>
+    <DeviceSpecificBuild>False</DeviceSpecificBuild>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -273,22 +296,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\fa-refresh.png" />
+    <BundleResource Include="Resources\fa_lock.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\fa-refresh%403x.png" />
+    <BundleResource Include="Resources\fa_lock%402x.png" />
   </ItemGroup>
   <ItemGroup>
-    <BundleResource Include="Resources\fa-refresh%402x.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\fa-lock.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\fa-lock%402x.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\fa-lock%403x.png" />
+    <BundleResource Include="Resources\fa_lock%403x.png" />
   </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\Icon-120.png" />
@@ -347,15 +361,6 @@
   <ItemGroup>
     <ITunesArtwork Include="Resources\iTunesArtwork%402x.png" />
   </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\fa_folder_open.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\fa_folder_open%402x.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\fa_folder_open%403x.png" />
-  </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\logo.png" />
   </ItemGroup>
@@ -536,6 +541,15 @@
   <ItemGroup>
     <BundleResource Include="Resources\ext-use%403x.png" />
   </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\folder.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\folder%402x.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\folder%403x.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.107\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">