diff --git a/src/App/Pages/Generator/GeneratorHistoryPage.xaml b/src/App/Pages/Generator/GeneratorHistoryPage.xaml
index 48f635d52..8e74dea42 100644
--- a/src/App/Pages/Generator/GeneratorHistoryPage.xaml
+++ b/src/App/Pages/Generator/GeneratorHistoryPage.xaml
@@ -19,17 +19,22 @@
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
             <u:DateTimeConverter x:Key="dateTime" />
+            <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
+                         x:Name="_closeItem" x:Key="closeItem" />
+            <ToolbarItem Text="{u:I18n Clear}"
+                         Clicked="Clear_Clicked"
+                         Order="Secondary"
+                         x:Name="_clearItem"
+                         x:Key="clearItem" />
+            <ToolbarItem Icon="more_vert.png"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n Options}"
+                         Clicked="More_Clicked"
+                         x:Name="_moreItem"
+                         x:Key="moreItem" />
         </ResourceDictionary>
     </ContentPage.Resources>
 
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
-        <ToolbarItem Text="{u:I18n Clear}"
-                     Clicked="Clear_Clicked"
-                     Order="Secondary"
-                     x:Name="_clearItem" />
-    </ContentPage.ToolbarItems>
-
     <StackLayout x:Name="_mainLayout">
         <Label IsVisible="{Binding ShowNoData}"
                Text="{u:I18n NoPasswordsToList}"
diff --git a/src/App/Pages/Generator/GeneratorHistoryPage.xaml.cs b/src/App/Pages/Generator/GeneratorHistoryPage.xaml.cs
index 65dba0121..48479dd17 100644
--- a/src/App/Pages/Generator/GeneratorHistoryPage.xaml.cs
+++ b/src/App/Pages/Generator/GeneratorHistoryPage.xaml.cs
@@ -1,4 +1,6 @@
-using System;
+using Bit.App.Resources;
+using System;
+using Xamarin.Forms;
 
 namespace Bit.App.Pages
 {
@@ -12,6 +14,15 @@ namespace Bit.App.Pages
             SetActivityIndicator();
             _vm = BindingContext as GeneratorHistoryPageViewModel;
             _vm.Page = this;
+            if(Device.RuntimePlatform == Device.iOS)
+            {
+                ToolbarItems.Add(_closeItem);
+                ToolbarItems.Add(_moreItem);
+            }
+            else
+            {
+                ToolbarItems.Add(_clearItem);
+            }
         }
 
         protected override async void OnAppearing()
@@ -34,5 +45,19 @@ namespace Bit.App.Pages
                 await Navigation.PopModalAsync();
             }
         }
+
+        private async void More_Clicked(object sender, EventArgs e)
+        {
+            if(!DoOnce())
+            {
+                return;
+            }
+            var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel,
+                null, AppResources.Clear);
+            if(selection == AppResources.Clear)
+            {
+                await _vm.ClearAsync();
+            }
+        }
     }
 }
diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index 8cc2a6927..f0b3584b4 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -12,19 +12,25 @@
         <pages:GeneratorPageViewModel />
     </ContentPage.BindingContext>
 
-    <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{u:I18n Select}"
-                     Clicked="Select_Clicked"
-                     Order="Primary"
-                     x:Name="_selectItem" />
-        <ToolbarItem Text="{u:I18n PasswordHistory}"
-                     Clicked="History_Clicked"
-                     Order="Secondary" />
-    </ContentPage.ToolbarItems>
-
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
+            <ToolbarItem Text="{u:I18n Select}"
+                     Clicked="Select_Clicked"
+                     Order="Primary"
+                     x:Name="_selectItem"
+                     x:Key="selectItem" />
+            <ToolbarItem Text="{u:I18n PasswordHistory}"
+                     Clicked="History_Clicked"
+                     Order="Secondary"
+                     x:Name="_historyItem"
+                     x:Key="historyItem" />
+            <ToolbarItem Icon="more_vert.png"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n Options}"
+                         Clicked="More_Clicked"
+                         x:Name="_moreItem"
+                         x:Key="moreItem" />
         </ResourceDictionary>
     </ContentPage.Resources>
 
diff --git a/src/App/Pages/Generator/GeneratorPage.xaml.cs b/src/App/Pages/Generator/GeneratorPage.xaml.cs
index 9124cb58a..cd61d2f29 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml.cs
+++ b/src/App/Pages/Generator/GeneratorPage.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using Bit.App.Resources;
+using System;
 using System.Threading.Tasks;
 using Xamarin.Forms;
 
@@ -19,9 +20,17 @@ namespace Bit.App.Pages
             _vm.Page = this;
             _fromTabPage = fromTabPage;
             _selectAction = selectAction;
-            if(selectAction == null)
+            if(selectAction != null)
             {
-                ToolbarItems.Remove(_selectItem);
+                ToolbarItems.Add(_selectItem);
+            }
+            if(Device.RuntimePlatform == Device.iOS)
+            {
+                ToolbarItems.Add(_moreItem);
+            }
+            else
+            {
+                ToolbarItems.Add(_historyItem);
             }
         }
 
@@ -59,6 +68,21 @@ namespace Bit.App.Pages
             await _vm.CopyAsync();
         }
 
+        private async void More_Clicked(object sender, EventArgs e)
+        {
+            if(!DoOnce())
+            {
+                return;
+            }
+            var selection = await DisplayActionSheet(AppResources.Options, AppResources.Cancel,
+                null, AppResources.PasswordHistory);
+            if(selection == AppResources.PasswordHistory)
+            {
+                var page = new GeneratorHistoryPage();
+                await Navigation.PushModalAsync(new NavigationPage(page));
+            }
+        }
+
         private void Select_Clicked(object sender, EventArgs e)
         {
             _selectAction?.Invoke(_vm.Password);
diff --git a/src/App/Pages/Vault/AddEditPage.xaml b/src/App/Pages/Vault/AddEditPage.xaml
index ac4193031..9f9a04202 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -36,7 +36,9 @@
                          Clicked="Share_Clicked"
                          Order="Secondary" />
             <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary" x:Name="_moreItem"
-                         x:Key="moreItem" />
+                         x:Key="moreItem"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n Options}" />
             <ToolbarItem Text="{u:I18n Attachments}"
                          Clicked="Attachments_Clicked"
                          Order="Secondary"
diff --git a/src/App/Pages/Vault/ViewPage.xaml b/src/App/Pages/Vault/ViewPage.xaml
index 92017518d..7a345492d 100644
--- a/src/App/Pages/Vault/ViewPage.xaml
+++ b/src/App/Pages/Vault/ViewPage.xaml
@@ -36,7 +36,9 @@
             <ToolbarItem Text="{u:I18n Edit}" Clicked="EditToolbarItem_Clicked" Order="Primary"
                          x:Name="_editItem" x:Key="editItem" />
             <ToolbarItem Icon="more_vert.png" Clicked="More_Clicked" Order="Primary"
-                         x:Name="_moreItem" x:Key="moreItem" />
+                         x:Name="_moreItem" x:Key="moreItem"
+                         AutomationProperties.IsInAccessibleTree="True"
+                         AutomationProperties.Name="{u:I18n Options}" />
             <ToolbarItem Text="{u:I18n Attachments}" Clicked="Attachments_Clicked" Order="Secondary"
                          x:Name="_attachmentsItem" x:Key="attachmentsItem" />
             <ToolbarItem Text="{u:I18n Delete}" Clicked="Delete_Clicked" Order="Secondary" IsDestructive="True"