diff --git a/src/App/App.csproj b/src/App/App.csproj
index fee663757..f40b674b0 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -109,6 +109,7 @@
     <Compile Include="Pages\MainPage.cs" />
     <Compile Include="Pages\SettingsEditFolderPage.cs" />
     <Compile Include="Pages\LockFingerprintPage.cs" />
+    <Compile Include="Pages\ToolsPage.cs" />
     <Compile Include="Pages\SyncPage.cs" />
     <Compile Include="Pages\SettingsPage.cs" />
     <Compile Include="Pages\SettingsListFoldersPage.cs" />
diff --git a/src/App/Pages/MainPage.cs b/src/App/Pages/MainPage.cs
index 85303a2ea..3c48c8b56 100644
--- a/src/App/Pages/MainPage.cs
+++ b/src/App/Pages/MainPage.cs
@@ -15,7 +15,7 @@ namespace Bit.App.Pages
             var settingsNavigation = new ExtendedNavigationPage(new SettingsPage());
             var favoritesNavigation = new ExtendedNavigationPage(new VaultListSitesPage(true));
             var vaultNavigation = new ExtendedNavigationPage(new VaultListSitesPage(false));
-            var syncNavigation = new ExtendedNavigationPage(new SyncPage());
+            var toolsNavigation = new ExtendedNavigationPage(new ToolsPage());
 
             favoritesNavigation.Title = AppResources.Favorites;
             favoritesNavigation.Icon = "star";
@@ -23,15 +23,15 @@ namespace Bit.App.Pages
             vaultNavigation.Title = AppResources.MyVault;
             vaultNavigation.Icon = "fa-lock";
 
-            syncNavigation.Title = AppResources.Sync;
-            syncNavigation.Icon = "fa-refresh";
+            toolsNavigation.Title = AppResources.Tools;
+            toolsNavigation.Icon = "fa-refresh";
 
             settingsNavigation.Title = AppResources.Settings;
             settingsNavigation.Icon = "cogs";
 
             Children.Add(favoritesNavigation);
             Children.Add(vaultNavigation);
-            Children.Add(syncNavigation);
+            Children.Add(toolsNavigation);
             Children.Add(settingsNavigation);
         }
     }
diff --git a/src/App/Pages/SettingsPage.cs b/src/App/Pages/SettingsPage.cs
index 621401016..a299da3bc 100644
--- a/src/App/Pages/SettingsPage.cs
+++ b/src/App/Pages/SettingsPage.cs
@@ -63,7 +63,8 @@ namespace Bit.App.Pages
 
             var changeMasterPasswordCell = new ExtendedTextCell
             {
-                Text = "Change Master Password"
+                Text = "Change Master Password",
+                ShowDisclousure = true
             };
             changeMasterPasswordCell.Tapped += ChangeMasterPasswordCell_Tapped;
 
@@ -74,6 +75,13 @@ namespace Bit.App.Pages
             };
             foldersCell.Tapped += FoldersCell_Tapped;
 
+            var syncCell = new ExtendedTextCell
+            {
+                Text = "Sync",
+                ShowDisclousure = true
+            };
+            syncCell.Tapped += SyncCell_Tapped;
+
             var lockCell = new ExtendedTextCell
             {
                 Text = "Lock"
@@ -100,9 +108,10 @@ namespace Bit.App.Pages
                         PinCell,
                         changeMasterPasswordCell
                     },
-                    new TableSection("Manage Folders")
+                    new TableSection("Manage")
                     {
-                        foldersCell
+                        foldersCell,
+                        syncCell
                     },
                     new TableSection("Current Session")
                     {
@@ -164,6 +173,11 @@ namespace Bit.App.Pages
             LockOptionsCell.Detail = selection;
         }
 
+        private void SyncCell_Tapped(object sender, EventArgs e)
+        {
+            Navigation.PushAsync(new SyncPage());
+        }
+
         private void LockCell_Tapped(object sender, EventArgs e)
         {
             MessagingCenter.Send(Application.Current, "Lock", true);
diff --git a/src/App/Pages/ToolsPage.cs b/src/App/Pages/ToolsPage.cs
new file mode 100644
index 000000000..5c385de4c
--- /dev/null
+++ b/src/App/Pages/ToolsPage.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Threading.Tasks;
+using Acr.UserDialogs;
+using Bit.App.Abstractions;
+using Bit.App.Controls;
+using Bit.App.Resources;
+using Plugin.Connectivity.Abstractions;
+using Xamarin.Forms;
+using XLabs.Ioc;
+
+namespace Bit.App.Pages
+{
+    public class ToolsPage : ExtendedContentPage
+    {
+        private readonly IUserDialogs _userDialogs;
+
+        public ToolsPage()
+        {
+            _userDialogs = Resolver.Resolve<IUserDialogs>();
+
+            Init();
+        }
+
+        public void Init()
+        {
+            Title = AppResources.Tools;
+            Icon = "fa-refresh";
+        }
+    }
+}
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 0bde9d638..d5236464c 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -412,6 +412,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Tools.
+        /// </summary>
+        internal static string Tools {
+            get {
+                return ResourceManager.GetString("Tools", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to URI.
         /// </summary>
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index fd626e3ef..35b76ccfb 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -271,6 +271,10 @@
     <value>Sync</value>
     <comment>The title for the sync page.</comment>
   </data>
+  <data name="Tools" xml:space="preserve">
+    <value>Tools</value>
+    <comment>The title for the tools page.</comment>
+  </data>
   <data name="URI" xml:space="preserve">
     <value>URI</value>
     <comment>Label for a uri/url.</comment>