From e0c721098c838ccfb875d6d1b203e1c5932729fd Mon Sep 17 00:00:00 2001
From: Dinis Vieira <dinisvieira@outlook.com>
Date: Thu, 9 Nov 2023 23:01:04 +0000
Subject: [PATCH] PM-3349 PM-3350 Migrated remaining AutomationProperties to
 SemanticProperties. All 'IsInAccessibleTree="True"' were deleted.
 'IsInAccessibleTree="False"' were kept and stayed in code.

---
 .../AuthenticatorViewCell.xaml                |  1 -
 .../CipherViewCell/CipherViewCell.xaml        |  3 --
 .../Controls/DateTime/DateTimePicker.xaml     |  6 +--
 .../Controls/DateTime/DateTimePicker.xaml.cs  |  4 +-
 src/Core/Controls/ExternalLinkItemView.xaml   |  1 -
 .../Controls/SendViewCell/SendViewCell.xaml   |  6 ---
 .../BooleanCustomFieldItemLayout.xaml         |  1 -
 .../HiddenCustomFieldItemLayout.xaml          |  4 --
 .../LinkedCustomFieldItemLayout.xaml          |  1 -
 .../TextCustomFieldItemLayout.xaml            |  3 --
 src/Core/Pages/Accounts/HomePage.xaml         |  1 -
 src/Core/Pages/Accounts/LockPage.xaml         |  8 +---
 src/Core/Pages/Accounts/LoginPage.xaml        |  5 +--
 src/Core/Pages/Accounts/RegisterPage.xaml     |  6 +--
 src/Core/Pages/Accounts/SetPasswordPage.xaml  |  6 +--
 src/Core/Pages/Accounts/TwoFactorPage.xaml    |  1 -
 .../Accounts/UpdateTempPasswordPage.xaml      |  9 ++---
 .../Pages/Accounts/VerificationCodePage.xaml  |  1 -
 .../Pages/Generator/GeneratorHistoryPage.xaml |  2 -
 src/Core/Pages/Generator/GeneratorPage.xaml   | 16 +-------
 src/Core/Pages/Send/SendAddEditPage.xaml      | 17 ++------
 .../Pages/Send/SendAddOnlyOptionsView.xaml    |  5 +--
 src/Core/Pages/Send/SendAddOnlyPage.xaml      |  1 -
 .../SendGroupingsPage/SendGroupingsPage.xaml  |  4 --
 .../Pages/Settings/AboutSettingsPage.xaml     |  1 -
 .../Pages/Settings/BlockAutofillUrisPage.xaml |  3 --
 src/Core/Pages/Settings/ExportVaultPage.xaml  |  3 +-
 .../Pages/Settings/FolderAddEditPage.xaml     |  1 -
 src/Core/Pages/Settings/FoldersPage.xaml      |  2 -
 .../LoginPasswordlessRequestsListPage.xaml    |  1 -
 .../Pages/Settings/SecuritySettingsPage.xaml  |  1 -
 src/Core/Pages/Vault/AttachmentsPage.xaml     |  1 -
 src/Core/Pages/Vault/CipherAddEditPage.xaml   | 39 +------------------
 src/Core/Pages/Vault/CipherDetailsPage.xaml   | 16 +-------
 src/Core/Pages/Vault/CipherSelectionPage.xaml |  3 --
 src/Core/Pages/Vault/CiphersPage.xaml         |  3 --
 .../Vault/GroupingsPage/GroupingsPage.xaml    |  6 ---
 src/Core/Pages/Vault/PasswordHistoryPage.xaml |  1 -
 38 files changed, 22 insertions(+), 171 deletions(-)

diff --git a/src/Core/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml b/src/Core/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
index 9f16b28ef..70b21fc50 100644
--- a/src/Core/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
+++ b/src/Core/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
@@ -122,6 +122,5 @@
         Padding="0,0,1,0"
         HorizontalOptions="Center"
         VerticalOptions="Center"
-        AutomationProperties.IsInAccessibleTree="True"
         SemanticProperties.Description="{u:I18n CopyTotp}" />
 </controls:ExtendedGrid>
\ No newline at end of file
diff --git a/src/Core/Controls/CipherViewCell/CipherViewCell.xaml b/src/Core/Controls/CipherViewCell/CipherViewCell.xaml
index 2a4347fe3..d86a61f39 100644
--- a/src/Core/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/Core/Controls/CipherViewCell/CipherViewCell.xaml
@@ -95,7 +95,6 @@
             Margin="5, 0, 0, 0"
             Text="{Binding Source={x:Static core:BitwardenIcons.Collection}}"
             IsVisible="{Binding Cipher.Shared, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Shared}"
             AutomationId="CipherInCollectionIcon" />
         <controls:IconLabel
@@ -107,7 +106,6 @@
             Margin="5, 0, 0, 0"
             Text="{Binding Source={x:Static core:BitwardenIcons.Paperclip}}"
             IsVisible="{Binding Cipher.HasAttachments, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Attachments}"
             AutomationId="CipherWithAttachmentsIcon" />
     </Grid>
@@ -120,7 +118,6 @@
         Clicked="MoreButton_Clicked"
         VerticalOptions="CenterAndExpand"
         HorizontalOptions="EndAndExpand"
-        AutomationProperties.IsInAccessibleTree="True"
         SemanticProperties.Description="{u:I18n Options}"
         AutomationId="CipherOptionsButton" />
 
diff --git a/src/Core/Controls/DateTime/DateTimePicker.xaml b/src/Core/Controls/DateTime/DateTimePicker.xaml
index 173016526..bdb4e00d5 100644
--- a/src/Core/Controls/DateTime/DateTimePicker.xaml
+++ b/src/Core/Controls/DateTime/DateTimePicker.xaml
@@ -10,12 +10,10 @@
         x:Name="_datePicker"
         Grid.Column="0"
         NullableDate="{Binding Date, Mode=TwoWay}"
-        Format="d"
-        AutomationProperties.IsInAccessibleTree="True" />
+        Format="d" />
     <controls:ExtendedTimePicker
         x:Name="_timePicker"
         Grid.Column="1"
         NullableTime="{Binding Time, Mode=TwoWay}"
-        Format="t"
-        AutomationProperties.IsInAccessibleTree="True" />
+        Format="t" />
 </Grid>
diff --git a/src/Core/Controls/DateTime/DateTimePicker.xaml.cs b/src/Core/Controls/DateTime/DateTimePicker.xaml.cs
index 889156c57..caca95865 100644
--- a/src/Core/Controls/DateTime/DateTimePicker.xaml.cs
+++ b/src/Core/Controls/DateTime/DateTimePicker.xaml.cs
@@ -18,8 +18,8 @@ namespace Bit.App.Controls
                 &&
                 BindingContext is DateTimeViewModel dateTimeViewModel)
             {
-                AutomationProperties.SetName(_datePicker, dateTimeViewModel.DateName);
-                AutomationProperties.SetName(_timePicker, dateTimeViewModel.TimeName);
+                SemanticProperties.SetDescription(_datePicker, dateTimeViewModel.DateName);
+                SemanticProperties.SetDescription(_timePicker, dateTimeViewModel.TimeName);
 
                 _datePicker.PlaceHolder = dateTimeViewModel.DatePlaceholder;
                 _timePicker.PlaceHolder = dateTimeViewModel.TimePlaceholder;
diff --git a/src/Core/Controls/ExternalLinkItemView.xaml b/src/Core/Controls/ExternalLinkItemView.xaml
index fe2d93410..8a4252eea 100644
--- a/src/Core/Controls/ExternalLinkItemView.xaml
+++ b/src/Core/Controls/ExternalLinkItemView.xaml
@@ -21,7 +21,6 @@
             TextColor="{DynamicResource TextColor}"
             HorizontalOptions="End"
             VerticalOptions="Center"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{Binding Title, Mode=OneWay, Source={x:Reference _contentView}}" />
 
     </StackLayout>
diff --git a/src/Core/Controls/SendViewCell/SendViewCell.xaml b/src/Core/Controls/SendViewCell/SendViewCell.xaml
index 5379c0282..6a55a918d 100644
--- a/src/Core/Controls/SendViewCell/SendViewCell.xaml
+++ b/src/Core/Controls/SendViewCell/SendViewCell.xaml
@@ -73,7 +73,6 @@
             Margin="5, 0, 0, 0"
             Text="{Binding Source={x:Static core:BitwardenIcons.ExclamationTriangle}}"
             IsVisible="{Binding Send.Disabled, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Disabled}"
             AutomationId="DisabledSendLabel" />
         <controls:IconLabel
@@ -85,7 +84,6 @@
             Margin="5, 0, 0, 0"
             Text="{Binding Source={x:Static core:BitwardenIcons.Key}}"
             IsVisible="{Binding Send.HasPassword, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Password}"
             AutomationId="PasswordProtectedSendLabel" />
         <controls:IconLabel
@@ -97,7 +95,6 @@
             Margin="5, 0, 0, 0"
             Text="{Binding Source={x:Static core:BitwardenIcons.Ban}}"
             IsVisible="{Binding Send.MaxAccessCountReached, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n MaxAccessCountReached}"
             AutomationId="SendMaxAccessCountReachedLabel" />
         <controls:IconLabel
@@ -109,7 +106,6 @@
             Margin="5, 0, 0, 0"
             Text="{Binding Source={x:Static core:BitwardenIcons.Clock}}"
             IsVisible="{Binding Send.Expired, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Expired}"
             AutomationId="ExpiredSendLabel" />
         <controls:IconLabel
@@ -121,7 +117,6 @@
             Margin="5, 0, 0, 0"
             Text="{Binding Source={x:Static core:BitwardenIcons.Trash}}"
             IsVisible="{Binding Send.PendingDelete, Mode=OneTime}"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n PendingDelete}"
             AutomationId="SendWithPendingDeletionLabel" />
     </Grid>
@@ -135,7 +130,6 @@
         Clicked="MoreButton_Clicked"
         VerticalOptions="CenterAndExpand"
         HorizontalOptions="EndAndExpand"
-        AutomationProperties.IsInAccessibleTree="True"
         SemanticProperties.Description="{u:I18n Options}"
         AutomationId="SendOptionsButton" />
 
diff --git a/src/Core/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml b/src/Core/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml
index 27a57a487..e24800905 100644
--- a/src/Core/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml
+++ b/src/Core/Lists/ItemLayouts/CustomFields/BooleanCustomFieldItemLayout.xaml
@@ -67,7 +67,6 @@
             Grid.Row="0"
             Grid.Column="2"
             Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Options}" />
     </Grid>
     <BoxView StyleClass="box-row-separator" />
diff --git a/src/Core/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml b/src/Core/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml
index 47cf279c9..d1da7f176 100644
--- a/src/Core/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml
+++ b/src/Core/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml
@@ -57,7 +57,6 @@
             IsEnabled="{Binding ShowViewHidden}"
             IsSpellCheckEnabled="False"
             IsTextPredictionEnabled="False"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{Binding Field.Name}"
             AutomationId="HiddenCustomFieldValueEntry">
             <Entry.Keyboard>
@@ -76,7 +75,6 @@
             Grid.Row="0"
             Grid.Column="1"
             Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n ToggleVisibility}"
             AutomationId="HiddenCustomFieldShowValueButton" />
         <controls:IconButton
@@ -87,7 +85,6 @@
             Grid.Row="0"
             Grid.Column="2"
             Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Copy}" />
         <controls:IconButton 
             StyleClass="box-row-button, box-row-button-platform"
@@ -97,7 +94,6 @@
             Grid.Row="0"
             Grid.Column="2"
             Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Options}" />
     </Grid>
     <BoxView StyleClass="box-row-separator" IsVisible="{Binding IsEditing, Mode=OneWay, Converter={StaticResource inverseBool}}" />
diff --git a/src/Core/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml b/src/Core/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml
index 084d0f0d2..ed00b0be3 100644
--- a/src/Core/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml
+++ b/src/Core/Lists/ItemLayouts/CustomFields/LinkedCustomFieldItemLayout.xaml
@@ -57,7 +57,6 @@
             Grid.Row="0"
             Grid.Column="1"
             Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Options}"
             AutomationId="LinkedCustomFieldOptionsButton" />
     </Grid>
diff --git a/src/Core/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml b/src/Core/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml
index 8ad28a14e..2b668fb7f 100644
--- a/src/Core/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml
+++ b/src/Core/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml
@@ -44,7 +44,6 @@
             Grid.Row="1"
             Grid.Column="0"
             IsVisible="{Binding IsEditing}"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{Binding Field.Name}"
             AutomationId="TextCustomFieldValueEntry" />
         <controls:IconButton
@@ -55,7 +54,6 @@
             Grid.Row="0"
             Grid.Column="1"
             Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Copy}"
             AutomationId="TextCustomFieldCopyValue" />
         <controls:IconButton 
@@ -66,7 +64,6 @@
             Grid.Row="0"
             Grid.Column="1"
             Grid.RowSpan="2"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Options}"
             AutomationId="TextCustomFieldOptionsButton" />
     </Grid>
diff --git a/src/Core/Pages/Accounts/HomePage.xaml b/src/Core/Pages/Accounts/HomePage.xaml
index 371118940..f149cc2ba 100644
--- a/src/Core/Pages/Accounts/HomePage.xaml
+++ b/src/Core/Pages/Accounts/HomePage.xaml
@@ -22,7 +22,6 @@
             Order="Primary"
             Priority="-1"
             UseOriginalImage="True"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Account}"
             AutomationId="AccountIconButton" />
         <ToolbarItem x:Name="_closeButton" Text="{u:I18n Close}" Command="{Binding CloseCommand}" Order="Primary" Priority="-1"/>
diff --git a/src/Core/Pages/Accounts/LockPage.xaml b/src/Core/Pages/Accounts/LockPage.xaml
index 22459163b..6460303de 100644
--- a/src/Core/Pages/Accounts/LockPage.xaml
+++ b/src/Core/Pages/Accounts/LockPage.xaml
@@ -23,7 +23,6 @@
                 Order="Primary"
                 Priority="-1"
                 UseOriginalImage="True"
-                AutomationProperties.IsInAccessibleTree="True"
                 SemanticProperties.Description="{u:I18n Account}"
                 AutomationId="AccountIconButton" />
     </ContentPage.ToolbarItems>
@@ -33,7 +32,6 @@
             <u:InverseBoolConverter x:Key="inverseBool" />
             <ToolbarItem IconImageSource="more_vert.png" Clicked="More_Clicked" Order="Primary"
                 x:Name="_moreItem" x:Key="moreItem"
-                AutomationProperties.IsInAccessibleTree="True"
                 SemanticProperties.Description="{u:I18n Options}" />
             <ToolbarItem Text="{u:I18n LogOut}"
                 x:Key="logOut"
@@ -81,9 +79,8 @@
                                 Grid.Row="0"
                                 Grid.Column="1"
                                 Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n ToggleVisibility}" 
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                                SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                                 AutomationId="PinVisibilityToggle" />
                         </Grid>
                         <Grid
@@ -123,9 +120,8 @@
                                 Grid.Row="0"
                                 Grid.Column="1"
                                 Grid.RowSpan="2"
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                                SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                                 AutomationId="PasswordVisibilityToggle"
                                 />
                         </Grid>
diff --git a/src/Core/Pages/Accounts/LoginPage.xaml b/src/Core/Pages/Accounts/LoginPage.xaml
index eafaef3d0..97963cdcd 100644
--- a/src/Core/Pages/Accounts/LoginPage.xaml
+++ b/src/Core/Pages/Accounts/LoginPage.xaml
@@ -24,7 +24,6 @@
                 Order="Primary"
                 Priority="-1"
                 UseOriginalImage="True"
-                AutomationProperties.IsInAccessibleTree="True"
                 SemanticProperties.Description="{u:I18n Account}"
                 AutomationId="AccountIconButton" />
     </ContentPage.ToolbarItems>
@@ -34,7 +33,6 @@
             <u:InverseBoolConverter x:Key="inverseBool" />
             <ToolbarItem IconImageSource="more_vert.png" Clicked="More_Clicked" Order="Primary"
                 x:Name="_moreItem" x:Key="moreItem"
-                 AutomationProperties.IsInAccessibleTree="True"
                  SemanticProperties.Description="{u:I18n Options}"
                  AutomationId="OptionsButton" />
             <ToolbarItem Text="{u:I18n GetPasswordHint}"
@@ -87,10 +85,9 @@
                                 Grid.Row="1"
                                 Grid.Column="1"
                                 Grid.RowSpan="1"
-                                AutomationProperties.IsInAccessibleTree="True"
                                 AutomationId="PasswordVisibilityToggle"
                                 SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                                AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"/>
+                                SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"/>
                             <Label
                                 Text="{u:I18n GetMasterPasswordwordHint}"
                                 StyleClass="box-footer-label"
diff --git a/src/Core/Pages/Accounts/RegisterPage.xaml b/src/Core/Pages/Accounts/RegisterPage.xaml
index e41f6f0b4..6a8d74cf6 100644
--- a/src/Core/Pages/Accounts/RegisterPage.xaml
+++ b/src/Core/Pages/Accounts/RegisterPage.xaml
@@ -70,9 +70,8 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}" 
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                         AutomationId="PasswordVisibilityToggle"/>
                 </Grid>
                 <Label
@@ -122,10 +121,9 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
                         AutomationId="ConfirmPasswordVisibilityToggle"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
                     <Label
diff --git a/src/Core/Pages/Accounts/SetPasswordPage.xaml b/src/Core/Pages/Accounts/SetPasswordPage.xaml
index 5c6ef54d9..7ccb686e0 100644
--- a/src/Core/Pages/Accounts/SetPasswordPage.xaml
+++ b/src/Core/Pages/Accounts/SetPasswordPage.xaml
@@ -110,9 +110,8 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                         AutomationId="ToggleMasterPasswordVisibilityButton" />
                 </Grid>
                 <Label
@@ -151,9 +150,8 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                         AutomationId="ToggleRetypePasswordVisibilityButton" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
diff --git a/src/Core/Pages/Accounts/TwoFactorPage.xaml b/src/Core/Pages/Accounts/TwoFactorPage.xaml
index 2c7c6654b..7133744cf 100644
--- a/src/Core/Pages/Accounts/TwoFactorPage.xaml
+++ b/src/Core/Pages/Accounts/TwoFactorPage.xaml
@@ -30,7 +30,6 @@
                 IconImageSource="more_vert.png"
                 Order="Primary"
                 Command="{Binding MoreCommand}"
-                AutomationProperties.IsInAccessibleTree="True"
                 SemanticProperties.Description="{u:I18n Options}" />
             <ToolbarItem Text="{u:I18n UseAnotherTwoStepMethod}" 
                 Clicked="Methods_Clicked" 
diff --git a/src/Core/Pages/Accounts/UpdateTempPasswordPage.xaml b/src/Core/Pages/Accounts/UpdateTempPasswordPage.xaml
index f2efe2b99..800eeef98 100644
--- a/src/Core/Pages/Accounts/UpdateTempPasswordPage.xaml
+++ b/src/Core/Pages/Accounts/UpdateTempPasswordPage.xaml
@@ -108,9 +108,8 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                         AutomationId="ToggleMasterPasswordVisibilityButton" />
                 </Grid>
                 <Grid StyleClass="box-row">
@@ -144,9 +143,8 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                         AutomationId="NewPasswordVisibilityButton" />
                 </Grid>
             </StackLayout>
@@ -182,9 +180,8 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         Grid.RowSpan="2"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                         AutomationId="ToggleRetypePasswordVisibilityButton" />
                 </Grid>
                 <StackLayout StyleClass="box-row">
diff --git a/src/Core/Pages/Accounts/VerificationCodePage.xaml b/src/Core/Pages/Accounts/VerificationCodePage.xaml
index 557906a06..a346a4659 100644
--- a/src/Core/Pages/Accounts/VerificationCodePage.xaml
+++ b/src/Core/Pages/Accounts/VerificationCodePage.xaml
@@ -69,7 +69,6 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="1"
                         Grid.Column="1"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}"/>
                     <Label
                         Text="{u:I18n ConfirmYourIdentity}"
diff --git a/src/Core/Pages/Generator/GeneratorHistoryPage.xaml b/src/Core/Pages/Generator/GeneratorHistoryPage.xaml
index a1e4e79a5..6cc7ca931 100644
--- a/src/Core/Pages/Generator/GeneratorHistoryPage.xaml
+++ b/src/Core/Pages/Generator/GeneratorHistoryPage.xaml
@@ -30,7 +30,6 @@
                          x:Key="clearItem"
                          AutomationId="ClearPasswordList" />
             <ToolbarItem IconImageSource="more_vert.png"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n Options}"
                          Clicked="More_Clicked"
                          x:Name="_moreItem"
@@ -90,7 +89,6 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n CopyPassword}"
                             AutomationId="CopyPasswordValueButton" />
                     </Grid>
diff --git a/src/Core/Pages/Generator/GeneratorPage.xaml b/src/Core/Pages/Generator/GeneratorPage.xaml
index f368e712b..ecc067ced 100644
--- a/src/Core/Pages/Generator/GeneratorPage.xaml
+++ b/src/Core/Pages/Generator/GeneratorPage.xaml
@@ -36,7 +36,6 @@
                      x:Name="_historyItem"
                      x:Key="historyItem" />
             <ToolbarItem IconImageSource="more_vert.png"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n Options}"
                          Clicked="More_Clicked"
                          x:Name="_moreItem"
@@ -91,7 +90,6 @@
                         Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                         Command="{Binding CopyCommand}"
                         Grid.Column="1"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n CopyPassword}"
                         AutomationId="CopyValueButton" />
                     <controls:IconButton 
@@ -99,7 +97,6 @@
                         Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
                         Command="{Binding RegenerateCommand}"
                         Grid.Column="2"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n GeneratePassword}"
                         AutomationId="RegenerateValueButton" />
                 </Grid>
@@ -119,7 +116,6 @@
                         Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                         Command="{Binding CopyCommand}"
                         Grid.Column="1"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n CopyUsername}"
                         AutomationId="CopyValueButton" />
                     <controls:IconButton 
@@ -127,7 +123,6 @@
                         Text="{Binding Source={x:Static core:BitwardenIcons.Generate}}"
                         Command="{Binding RegenerateUsernameCommand}"
                         Grid.Column="2"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n GenerateUsername}"
                         AutomationId="RegenerateValueButton" />
                 </Grid>
@@ -161,7 +156,6 @@
                             Text="{Binding Source={x:Static core:BitwardenIcons.QuestionCircle}}"
                             Command="{Binding UsernameTypePromptHelpCommand}"
                             TextColor="{DynamicResource HyperlinkColor}"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n UsernamePromptHelpLink}"
                             VerticalOptions="Center"/>
                     </StackLayout>
@@ -414,7 +408,7 @@
                             <controls:ExtendedSlider
                                 DragCompleted="LengthSlider_DragCompleted"
                                 Value="{Binding Length}"
-                                AutomationProperties.HelpText="{Binding Length}"
+                                SemanticProperties.Hint="{Binding Length}"
                                 StyleClass="box-value"
                                 VerticalOptions="CenterAndExpand"
                                 HorizontalOptions="FillAndExpand"
@@ -428,7 +422,6 @@
                                 Text="A-Z"
                                 StyleClass="box-label-regular"
                                 HorizontalOptions="StartAndExpand" 
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n UppercaseAtoZ}"/>
                             <Switch
                                 IsToggled="{Binding Uppercase}"
@@ -436,7 +429,6 @@
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
                                 HorizontalOptions="End" 
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n UppercaseAtoZ}"
                                 AutomationId="UppercaseAtoZToggle" />
                         </StackLayout>
@@ -446,7 +438,6 @@
                                 Text="a-z"
                                 StyleClass="box-label-regular"
                                 HorizontalOptions="StartAndExpand" 
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n LowercaseAtoZ}"/>
                             <Switch
                                 IsToggled="{Binding Lowercase}"
@@ -454,7 +445,6 @@
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
                                 HorizontalOptions="End"
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n LowercaseAtoZ}"
                                 AutomationId="LowercaseAtoZToggle" />
                         </StackLayout>
@@ -464,7 +454,6 @@
                                 Text="0-9"
                                 StyleClass="box-label-regular"
                                 HorizontalOptions="StartAndExpand" 
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n NumbersZeroToNine}"/>
                             <Switch
                                 IsToggled="{Binding Number}"
@@ -472,7 +461,6 @@
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
                                 HorizontalOptions="End" 
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n NumbersZeroToNine}"
                                 AutomationId="NumbersZeroToNineToggle" />
                         </StackLayout>
@@ -482,7 +470,6 @@
                                 Text="!@#$%^&amp;*"
                                 StyleClass="box-label-regular"
                                 HorizontalOptions="StartAndExpand" 
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n SpecialCharacters}"/>
                             <Switch
                                 IsToggled="{Binding Special}"
@@ -490,7 +477,6 @@
                                     Converter={StaticResource inverseBool}}"
                                 StyleClass="box-value"
                                 HorizontalOptions="End"
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n SpecialCharacters}"
                                 AutomationId="SpecialCharactersToggle" />
                         </StackLayout>
diff --git a/src/Core/Pages/Send/SendAddEditPage.xaml b/src/Core/Pages/Send/SendAddEditPage.xaml
index fb982303d..5d235e287 100644
--- a/src/Core/Pages/Send/SendAddEditPage.xaml
+++ b/src/Core/Pages/Send/SendAddEditPage.xaml
@@ -32,7 +32,6 @@
                          x:Key="closeItem" x:Name="_closeItem" />
             <ToolbarItem IconImageSource="more_vert.png" Clicked="More_Clicked" Order="Primary" x:Name="_moreItem"
                          x:Key="moreItem"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n Options}" />
             <ToolbarItem Text="{u:I18n RemovePassword}"
                          Clicked="RemovePassword_Clicked"
@@ -124,9 +123,8 @@
                                     HeightRequest="{Binding SegmentedButtonHeight}"
                                     FontSize="{Binding SegmentedButtonFontSize}"
                                     Clicked="FileType_Clicked"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n File}"
-                                    AutomationProperties.HelpText="{Binding FileTypeAccessibilityLabel}"
+                                    SemanticProperties.Hint="{Binding FileTypeAccessibilityLabel}"
                                     AutomationId="SendFileButton"
                                     Grid.Column="0">
                                 </Button>
@@ -137,9 +135,8 @@
                                     HeightRequest="{Binding SegmentedButtonHeight}"
                                     FontSize="{Binding SegmentedButtonFontSize}"
                                     Clicked="TextType_Clicked"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n Text}"
-                                    AutomationProperties.HelpText="{Binding TextTypeAccessibilityLabel}"
+                                    SemanticProperties.Hint="{Binding TextTypeAccessibilityLabel}"
                                     AutomationId="SendTextButton"
                                     Grid.Column="1">
                                 </Button>
@@ -255,7 +252,6 @@
                         <StackLayout
                             Orientation="Horizontal"
                             Spacing="0"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{Binding OptionsAccessilibityText}">
                             <StackLayout.GestureRecognizers>
                                 <TapGestureRecognizer Command="{Binding ToggleOptionsCommand}" />
@@ -300,7 +296,6 @@
                                     SelectedIndex="{Binding DeletionDateTypeSelectedIndex}"
                                     IsEnabled="{Binding SendEnabled}"
                                     StyleClass="box-value"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n DeletionTime}"
                                     AutomationId="SendDeletionOptionsPicker" />
                                 <Grid
@@ -315,7 +310,6 @@
                                         NullableDate="{Binding DeletionDateTimeViewModel.Date, Mode=TwoWay}"
                                         Format="d"
                                         IsEnabled="{Binding SendEnabled}"
-                                        AutomationProperties.IsInAccessibleTree="True"
                                         SemanticProperties.Description="{u:I18n DeletionDate}"
                                         Grid.Column="0"
                                         AutomationId="SendCustomDeletionDatePicker" />
@@ -323,7 +317,6 @@
                                         NullableTime="{Binding DeletionDateTimeViewModel.Time, Mode=TwoWay}"
                                         Format="t"
                                         IsEnabled="{Binding SendEnabled}"
-                                        AutomationProperties.IsInAccessibleTree="True"
                                         SemanticProperties.Description="{u:I18n DeletionTime}"
                                         Grid.Column="1"
                                         AutomationId="SendCustomDeletionTimePicker" />
@@ -344,7 +337,6 @@
                                     SelectedIndex="{Binding ExpirationDateTypeSelectedIndex}"
                                     IsEnabled="{Binding SendEnabled}"
                                     StyleClass="box-value"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n ExpirationTime}"
                                     AutomationId="SendExpirationOptionsPicker" />
                                 <Grid
@@ -360,7 +352,6 @@
                                         PlaceHolder="mm/dd/yyyy"
                                         Format="d"
                                         IsEnabled="{Binding SendEnabled}"
-                                        AutomationProperties.IsInAccessibleTree="True"
                                         SemanticProperties.Description="{u:I18n ExpirationDate}"
                                         Grid.Column="0"
                                         AutomationId="SendCustomExpirationDatePicker" />
@@ -369,7 +360,6 @@
                                         PlaceHolder="--:-- --"
                                         Format="t"
                                         IsEnabled="{Binding SendEnabled}"
-                                        AutomationProperties.IsInAccessibleTree="True"
                                         SemanticProperties.Description="{u:I18n ExpirationTime}"
                                         Grid.Column="1"
                                         AutomationId="SendCustomExpirationTimePicker" />
@@ -463,9 +453,8 @@
                                         Text="{Binding ShowPasswordIcon}"
                                         Command="{Binding TogglePasswordCommand}"
                                         Margin="10,0,0,0"
-                                        AutomationProperties.IsInAccessibleTree="True"
                                         SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                                         AutomationId="SendShowHidePasswordButton" />
                                 </StackLayout>
                                 <Label
diff --git a/src/Core/Pages/Send/SendAddOnlyOptionsView.xaml b/src/Core/Pages/Send/SendAddOnlyOptionsView.xaml
index 33a148355..80424f50f 100644
--- a/src/Core/Pages/Send/SendAddOnlyOptionsView.xaml
+++ b/src/Core/Pages/Send/SendAddOnlyOptionsView.xaml
@@ -30,7 +30,6 @@
                     StyleClass="box-value"
                     ItemDisplayBinding="{Binding Key}"
                     ios:Picker.UpdateMode="WhenFinished"
-                    AutomationProperties.IsInAccessibleTree="True"
                     SemanticProperties.Description="{u:I18n DeletionTime}" />
                 <controls:LazyDateTimePicker
                     x:Name="_lazyDeletionDateTimePicker"
@@ -54,7 +53,6 @@
                     ios:Picker.UpdateMode="WhenFinished"
                     IsEnabled="{Binding SendEnabled}"
                     StyleClass="box-value"
-                    AutomationProperties.IsInAccessibleTree="True"
                     SemanticProperties.Description="{u:I18n ExpirationTime}" />
                 <controls:LazyDateTimePicker
                     x:Name="_lazyExpirationDateTimePicker"
@@ -116,9 +114,8 @@
                         Text="{Binding ShowPasswordIcon}"
                         Command="{Binding TogglePasswordCommand}"
                         Margin="10,0,0,0"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}" />
+                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}" />
                 </StackLayout>
                 <Label
                     Text="{u:I18n PasswordInfo}"
diff --git a/src/Core/Pages/Send/SendAddOnlyPage.xaml b/src/Core/Pages/Send/SendAddOnlyPage.xaml
index 5f84a8eaa..8dd6d6d02 100644
--- a/src/Core/Pages/Send/SendAddOnlyPage.xaml
+++ b/src/Core/Pages/Send/SendAddOnlyPage.xaml
@@ -25,7 +25,6 @@
             Order="Primary"
             Priority="-2"
             UseOriginalImage="True"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Account}"
             AutomationId="AccountIconButton" />
         <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" x:Name="_closeItem" />
diff --git a/src/Core/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml b/src/Core/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml
index 48cdabfaa..84b32bd04 100644
--- a/src/Core/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml
+++ b/src/Core/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml
@@ -16,7 +16,6 @@
 
     <ContentPage.ToolbarItems>
         <ToolbarItem IconImageSource="search.png" Clicked="Search_Clicked"
-                     AutomationProperties.IsInAccessibleTree="True"
                      SemanticProperties.Description="{u:I18n Search}" />
     </ContentPage.ToolbarItems>
 
@@ -26,7 +25,6 @@
 
             <ToolbarItem x:Name="_aboutIconItem" x:Key="aboutIconItem" IconImageSource="info.png"
                          Clicked="About_Clicked" Order="Primary" Priority="-1"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n AboutSend}" />
             <ToolbarItem x:Name="_syncItem" x:Key="syncItem" Text="{u:I18n Sync}"
                          Clicked="Sync_Clicked" Order="Secondary" />
@@ -36,7 +34,6 @@
                          Clicked="About_Clicked" Order="Secondary" />
             <ToolbarItem x:Name="_addItem" x:Key="addItem" IconImageSource="plus.png"
                          Clicked="AddButton_Clicked" Order="Primary"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n AddItem}" />
 
             <DataTemplate x:Key="sendTemplate"
@@ -165,7 +162,6 @@
             Style="{StaticResource btn-fab}"
             AbsoluteLayout.LayoutFlags="PositionProportional"
             AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n AddItem}"/>
     </AbsoluteLayout>
 
diff --git a/src/Core/Pages/Settings/AboutSettingsPage.xaml b/src/Core/Pages/Settings/AboutSettingsPage.xaml
index 335dbc0c6..9c141d092 100644
--- a/src/Core/Pages/Settings/AboutSettingsPage.xaml
+++ b/src/Core/Pages/Settings/AboutSettingsPage.xaml
@@ -73,7 +73,6 @@
                 TextColor="Black"
                 HorizontalOptions="End"
                 VerticalOptions="Center"
-                AutomationProperties.IsInAccessibleTree="True"
                 SemanticProperties.Description="{u:I18n CopyAppInformation}">
                 <controls:IconLabel.GestureRecognizers>
                     <TapGestureRecognizer Command="{Binding CopyAppInfoCommand}" />
diff --git a/src/Core/Pages/Settings/BlockAutofillUrisPage.xaml b/src/Core/Pages/Settings/BlockAutofillUrisPage.xaml
index 0c62934f4..c9f956cf2 100644
--- a/src/Core/Pages/Settings/BlockAutofillUrisPage.xaml
+++ b/src/Core/Pages/Settings/BlockAutofillUrisPage.xaml
@@ -25,7 +25,6 @@
             HeightRequest="120"
             Margin="0,100,0,0"
             IsVisible="{Binding ShowList, Converter={StaticResource inverseBool}}"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n ThereAreNoBlockedURIs}" />
         <controls:CustomLabel
             StyleClass="box-label-regular"
@@ -63,7 +62,6 @@
                                 Text="{Binding Source={x:Static core:BitwardenIcons.PencilSquare}}"
                                 Command="{Binding EditUriCommand}"
                                 Margin="5,0,15,0"
-                                AutomationProperties.IsInAccessibleTree="True"
                                 SemanticProperties.Description="{u:I18n EditURI}"
                                 AutomationId="EditUriButton" />
                         </StackLayout>
@@ -79,7 +77,6 @@
             HeightRequest="40"
             Opacity="0.8"
             Margin="14,5,14,10"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n NewBlockedURI}"
             AutomationId="NewBlockedUriButton" />
     </StackLayout>
diff --git a/src/Core/Pages/Settings/ExportVaultPage.xaml b/src/Core/Pages/Settings/ExportVaultPage.xaml
index 65a457f9e..d1647aa54 100644
--- a/src/Core/Pages/Settings/ExportVaultPage.xaml
+++ b/src/Core/Pages/Settings/ExportVaultPage.xaml
@@ -108,9 +108,8 @@
                         Command="{Binding TogglePasswordCommand}"
                         Grid.Row="1"
                         Grid.Column="1"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                        AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                        SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                         IsVisible="{Binding UseOTPVerification, Converter={StaticResource inverseBool}}"
                         AutomationId="TogglePasswordVisibilityButton" />
                     <Label
diff --git a/src/Core/Pages/Settings/FolderAddEditPage.xaml b/src/Core/Pages/Settings/FolderAddEditPage.xaml
index 1376c79d5..28bf8ef73 100644
--- a/src/Core/Pages/Settings/FolderAddEditPage.xaml
+++ b/src/Core/Pages/Settings/FolderAddEditPage.xaml
@@ -32,7 +32,6 @@
         <ResourceDictionary>
             <ToolbarItem IconImageSource="more_vert.png" Clicked="More_Clicked" Order="Primary" x:Name="_moreItem"
                          x:Key="moreItem"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n Options}" />
         </ResourceDictionary>
     </ContentPage.Resources>
diff --git a/src/Core/Pages/Settings/FoldersPage.xaml b/src/Core/Pages/Settings/FoldersPage.xaml
index 19873ad1f..8614e9642 100644
--- a/src/Core/Pages/Settings/FoldersPage.xaml
+++ b/src/Core/Pages/Settings/FoldersPage.xaml
@@ -23,7 +23,6 @@
                          Clicked="Close_Clicked" Order="Primary" Priority="-1" />
             <ToolbarItem x:Name="_addItem" x:Key="addItem" IconImageSource="plus.png"
                          Clicked="AddButton_Clicked" Order="Primary"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n AddItem}" />
             <StackLayout x:Name="_mainLayout" x:Key="mainLayout">
                 <Label IsVisible="{Binding ShowNoData}"
@@ -75,7 +74,6 @@
             Style="{StaticResource btn-fab}"
             AbsoluteLayout.LayoutFlags="PositionProportional"
             AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n AddFolder}"/>
     </AbsoluteLayout>
 
diff --git a/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml b/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
index e1015f8e4..a61176efb 100644
--- a/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
+++ b/src/Core/Pages/Settings/LoginPasswordlessRequestsListPage.xaml
@@ -89,7 +89,6 @@
                             HeightRequest="160"
                             Margin="0,70,0,0"
                             IsVisible="{Binding HasLoginRequests, Converter={StaticResource inverseBool}}"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n NoPendingRequests}" />
                         <controls:CustomLabel
                             StyleClass="box-label-regular"
diff --git a/src/Core/Pages/Settings/SecuritySettingsPage.xaml b/src/Core/Pages/Settings/SecuritySettingsPage.xaml
index 3a11a32db..3d0147cf4 100644
--- a/src/Core/Pages/Settings/SecuritySettingsPage.xaml
+++ b/src/Core/Pages/Settings/SecuritySettingsPage.xaml
@@ -104,7 +104,6 @@
                             HorizontalOptions="End"
                             ios:TimePicker.UpdateMode="WhenFinished"
                             AutomationId="SettingCustomVaultTimeoutPicker"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{Binding CustomVaultTimeoutTimeVerbalized}"/>
             </controls:BaseSettingItemView>
             
diff --git a/src/Core/Pages/Vault/AttachmentsPage.xaml b/src/Core/Pages/Vault/AttachmentsPage.xaml
index b42c599d6..fb4127728 100644
--- a/src/Core/Pages/Vault/AttachmentsPage.xaml
+++ b/src/Core/Pages/Vault/AttachmentsPage.xaml
@@ -58,7 +58,6 @@
                                         Command="{Binding BindingContext.DeleteAttachmentCommand, Source={x:Reference _page}}"
                                         CommandParameter="{Binding .}"
                                         VerticalOptions="Center"
-                                        AutomationProperties.IsInAccessibleTree="True"
                                         SemanticProperties.Description="{u:I18n Delete}"
                                         AutomationId="AttachmentDeleteButton" />
                                 </StackLayout>
diff --git a/src/Core/Pages/Vault/CipherAddEditPage.xaml b/src/Core/Pages/Vault/CipherAddEditPage.xaml
index 38d9f5da0..0840a6188 100644
--- a/src/Core/Pages/Vault/CipherAddEditPage.xaml
+++ b/src/Core/Pages/Vault/CipherAddEditPage.xaml
@@ -46,7 +46,6 @@
                          Order="Secondary" />
             <ToolbarItem IconImageSource="more_vert.png" Clicked="More_Clicked" Order="Primary" x:Name="_moreItem"
                          x:Key="moreItem"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n Options}" />
             <ToolbarItem Text="{u:I18n Attachments}"
                          Clicked="Attachments_Clicked"
@@ -132,7 +131,6 @@
                         x:Name="_nameEntry"
                         Text="{Binding Cipher.Name, FallbackValue=''}"
                         StyleClass="box-value"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n Name}"
                         AutomationId="ItemNameEntry" />
                 </StackLayout>
@@ -148,7 +146,6 @@
                             Text="{Binding Cipher.Login.Username, FallbackValue=''}"
                             StyleClass="box-value" 
                             Grid.Row="1"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Username}"
                             AutomationId="LoginUsernameEntry" />
                         <controls:IconButton 
@@ -157,7 +154,6 @@
                             Command="{Binding GenerateUsernameCommand}"
                             Grid.Column="1"
                             Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n GenerateUsername}"
                             AutomationId="GenerateUsernameButton" />
                     </Grid>
@@ -188,7 +184,6 @@
                             IsSpellCheckEnabled="False"
                             IsTextPredictionEnabled="False"
                             IsEnabled="{Binding Cipher.ViewPassword, FallbackValue=False}"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Password}"
                             AutomationId="LoginPasswordEntry" />
                         <controls:IconButton 
@@ -198,7 +193,6 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n CheckPassword}"
                             IsVisible="{Binding Cipher.ViewPassword, FallbackValue=False}"
                             AutomationId="CheckPasswordButton" />
@@ -209,9 +203,8 @@
                             Grid.Row="0"
                             Grid.Column="2"
                             Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                            AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                            SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                             IsVisible="{Binding Cipher.ViewPassword, FallbackValue=False}"
                             AutomationId="ViewPasswordButton" />
                         <controls:IconButton 
@@ -221,7 +214,6 @@
                             Grid.Row="0"
                             Grid.Column="3"
                             Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n GeneratePassword}"
                             IsVisible="{Binding Cipher.ViewPassword, FallbackValue=False}"
                             AutomationId="RegeneratePasswordButton" />
@@ -284,7 +276,6 @@
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="{Binding TotpColumnSpan}"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n AuthenticatorKey}"
                             AutomationId="LoginTotpEntry" />
                         <controls:IconButton 
@@ -295,7 +286,6 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n CopyTotp}"
                             AutomationId="CopyTotpValueButton" />
                         <controls:IconButton 
@@ -306,7 +296,6 @@
                             Grid.Column="2"
                             Grid.RowSpan="2"
                             IsVisible="{Binding HasTotpValue}"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n ScanQrTitle}"
                             />
                     </Grid>
@@ -345,7 +334,6 @@
                             IsPassword="{Binding ShowCardNumber, Converter={StaticResource inverseBool}}"
                             IsSpellCheckEnabled="False"
                             IsTextPredictionEnabled="False"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Number}"
                             AutomationId="CardNumberEntry" />
                         <controls:IconButton 
@@ -355,7 +343,6 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n ToggleVisibility}"
                             AutomationId="ShowCardNumberButton" />
                     </Grid>
@@ -390,7 +377,6 @@
                             Text="{Binding Cipher.Card.ExpYear, FallbackValue=''}"
                             StyleClass="box-value"
                             Keyboard="Numeric"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n ExpirationYear}"
                             AutomationId="CardExpirationYearEntry" />
                     </StackLayout>
@@ -418,7 +404,6 @@
                             IsPassword="{Binding ShowCardCode, Converter={StaticResource inverseBool}}"
                             IsSpellCheckEnabled="False"
                             IsTextPredictionEnabled="False"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n SecurityCode}"
                             AutomationId="CardSecurityCodeEntry" />
                         <controls:IconButton 
@@ -428,7 +413,6 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n ToggleVisibility}"
                             AutomationId="CardShowSecurityCodeButton" />
                     </Grid>
@@ -453,7 +437,6 @@
                             x:Name="_identityFirstNameEntry"
                             Text="{Binding Cipher.Identity.FirstName, FallbackValue=''}"
                             StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n FirstName}"
                             AutomationId="IdentityFirstNameEntry" />
                     </StackLayout>
@@ -465,7 +448,6 @@
                             x:Name="_identityMiddleNameEntry"
                             Text="{Binding Cipher.Identity.MiddleName, FallbackValue=''}"
                             StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n MiddleName}"
                             AutomationId="IdentityMiddleNameEntry" />
                     </StackLayout>
@@ -477,7 +459,6 @@
                             x:Name="_identityLastNameEntry"
                             Text="{Binding Cipher.Identity.LastName, FallbackValue=''}"
                             StyleClass="box-value,capitalize-word-input"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n LastName}"
                             AutomationId="IdentityLastNameEntry" />
                     </StackLayout>
@@ -489,7 +470,6 @@
                             x:Name="_identityUsernameEntry"
                             Text="{Binding Cipher.Identity.Username, FallbackValue=''}"
                             StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Username}"
                             AutomationId="IdentityUsernameEntry" />
                     </StackLayout>
@@ -501,7 +481,6 @@
                             x:Name="_identityCompanyEntry"
                             Text="{Binding Cipher.Identity.Company, FallbackValue=''}"
                             StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Company}"
                             AutomationId="IdentityCompanyEntry" />
                     </StackLayout>
@@ -513,7 +492,6 @@
                             x:Name="_identitySsnEntry"
                             Text="{Binding Cipher.Identity.SSN, FallbackValue=''}"
                             StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n SSN}"
                             AutomationId="IdentitySsnEntry" />
                     </StackLayout>
@@ -525,7 +503,6 @@
                             x:Name="_identityPassportNumberEntry"
                             Text="{Binding Cipher.Identity.PassportNumber, FallbackValue=''}"
                             StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n PassportNumber}"
                             AutomationId="IdentityPassportNumberEntry" />
                     </StackLayout>
@@ -537,7 +514,6 @@
                             x:Name="_identityLicenseNumberEntry"
                             Text="{Binding Cipher.Identity.LicenseNumber, FallbackValue=''}"
                             StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n LicenseNumber}"
                             AutomationId="IdentityLicenseNumberEntry" />
                     </StackLayout>
@@ -550,7 +526,6 @@
                             Keyboard="Email"
                             Text="{Binding Cipher.Identity.Email, FallbackValue=''}"
                             StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Email}"
                             AutomationId="IdentityEmailEntry" />
                     </StackLayout>
@@ -563,7 +538,6 @@
                             Text="{Binding Cipher.Identity.Phone, FallbackValue=''}"
                             Keyboard="Telephone"
                             StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Phone}"
                             AutomationId="IdentityPhoneEntry" />
                     </StackLayout>
@@ -575,7 +549,6 @@
                             x:Name="_identityAddress1Entry"
                             Text="{Binding Cipher.Identity.Address1, FallbackValue=''}"
                             StyleClass="box-value" 
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Address1}"
                             AutomationId="IdentityAddressOneEntry" />
                     </StackLayout>
@@ -587,7 +560,6 @@
                             x:Name="_identityAddress2Entry"
                             Text="{Binding Cipher.Identity.Address2, FallbackValue=''}"
                             StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Address2}"
                             AutomationId="IdentityAddressTwoEntry" />
                     </StackLayout>
@@ -599,7 +571,6 @@
                             x:Name="_identityAddress3Entry"
                             Text="{Binding Cipher.Identity.Address3, FallbackValue=''}"
                             StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Address3}"
                             AutomationId="IdentityAddressThreeEntry" />
                     </StackLayout>
@@ -611,7 +582,6 @@
                             x:Name="_identityCityEntry"
                             Text="{Binding Cipher.Identity.City, FallbackValue=''}"
                             StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n CityTown}"
                             AutomationId="IdentityCityEntry" />
                     </StackLayout>
@@ -623,7 +593,6 @@
                             x:Name="_identityStateEntry"
                             Text="{Binding Cipher.Identity.State, FallbackValue=''}"
                             StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n StateProvince}"
                             AutomationId="IdentityStateEntry" />
                     </StackLayout>
@@ -635,7 +604,6 @@
                             x:Name="_identityPostalCodeEntry"
                             Text="{Binding Cipher.Identity.PostalCode, FallbackValue=''}"
                             StyleClass="box-value"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n ZipPostalCode}"
                             AutomationId="IdentityPostalCodeEntry" />
                     </StackLayout>
@@ -647,7 +615,6 @@
                             x:Name="_identityCountryEntry"
                             Text="{Binding Cipher.Identity.Country, FallbackValue=''}"
                             StyleClass="box-value,capitalize-sentence-input"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n Country}"
                             AutomationId="IdentityCountryEntry" />
                     </StackLayout>
@@ -681,7 +648,6 @@
                                     StyleClass="box-value"
                                     Grid.Row="1"
                                     Grid.Column="0"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n URI}"
                                     AutomationId="LoginUriEntry" />
                                 <controls:IconButton
@@ -692,7 +658,6 @@
                                     Grid.Row="0"
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n Options}"
                                     AutomationId="LoginUriOptionsButton" />
                             </Grid>
@@ -739,7 +704,6 @@
                         Text="{Binding Source={x:Static core:BitwardenIcons.QuestionCircle}}"
                         Command="{Binding PasswordPromptHelpCommand}"
                         TextColor="{DynamicResource MutedColor}"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n MasterPasswordRePromptHelp}"
                         HorizontalOptions="StartAndExpand" />
                     <Switch
@@ -763,7 +727,6 @@
                         StyleClass="box-value"
                         effects:ScrollEnabledEffect.IsScrollEnabled="false"
                         Text="{Binding Cipher.Notes, FallbackValue=''}"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n Notes}"
                         AutomationId="ItemNotesEntry">
                         <Editor.Behaviors>
diff --git a/src/Core/Pages/Vault/CipherDetailsPage.xaml b/src/Core/Pages/Vault/CipherDetailsPage.xaml
index 6d30ca448..dd0eb2e1c 100644
--- a/src/Core/Pages/Vault/CipherDetailsPage.xaml
+++ b/src/Core/Pages/Vault/CipherDetailsPage.xaml
@@ -41,7 +41,6 @@
                          x:Name="_editItem" x:Key="editItem" />
             <ToolbarItem IconImageSource="more_vert.png" Clicked="More_Clicked" Order="Primary"
                          x:Name="_moreItem" x:Key="moreItem"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n Options}" />
             <ToolbarItem Text="{u:I18n Attachments}" Clicked="Attachments_Clicked" Order="Secondary"
                          x:Name="_attachmentsItem" x:Key="attachmentsItem" />
@@ -119,7 +118,6 @@
                                     Grid.Row="0"
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n CopyUsername}"
                                     AutomationId="CopyValueButton" />
                             </Grid>
@@ -166,7 +164,6 @@
                                     Grid.Row="0"
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n CheckPassword}"
                                     IsVisible="{Binding Cipher.ViewPassword}"
                                     AutomationId="CheckPasswordButton" />
@@ -177,9 +174,8 @@
                                     Grid.Row="0"
                                     Grid.Column="2"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n ToggleVisibility}"
-                                    AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
+                                    SemanticProperties.Hint="{Binding PasswordVisibilityAccessibilityText}"
                                     IsVisible="{Binding Cipher.ViewPassword}"
                                     AutomationId="ShowValueButton" />
                                 <controls:IconButton
@@ -190,7 +186,6 @@
                                     Grid.Row="0"
                                     Grid.Column="3"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n CopyPassword}"
                                     IsVisible="{Binding Cipher.ViewPassword}"
                                     AutomationId="CopyValueButton" />
@@ -263,7 +258,6 @@
                                     Grid.Row="0"
                                     Grid.Column="2"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n CopyTotp}"
                                     AutomationId="CopyValueButton" />
                                 <Label
@@ -332,7 +326,6 @@
                                     Grid.Row="0"
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n ToggleVisibility}"
                                     AutomationId="ShowValueButton" />
                                 <controls:IconButton
@@ -343,7 +336,6 @@
                                     Grid.Row="0"
                                     Grid.Column="2"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n CopyNumber}"
                                     AutomationId="CopyValueButton" />
                             </Grid>
@@ -416,7 +408,6 @@
                                     Grid.Row="0"
                                     Grid.Column="1"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n ToggleVisibility}"
                                     AutomationId="ShowValueButton" />
                                 <controls:IconButton
@@ -427,7 +418,6 @@
                                     Grid.Row="0"
                                     Grid.Column="2"
                                     Grid.RowSpan="2"
-                                    AutomationProperties.IsInAccessibleTree="True"
                                     SemanticProperties.Description="{u:I18n CopySecurityCode}"
                                     AutomationId="CopyValueButton" />
                             </Grid>
@@ -628,7 +618,6 @@
                                                 Grid.Column="1"
                                                 Grid.RowSpan="2"
                                                 IsVisible="{Binding CanLaunch, Mode=OneWay}"
-                                                AutomationProperties.IsInAccessibleTree="True"
                                                 SemanticProperties.Description="{u:I18n Launch}"
                                                 AutomationId="LaunchUriButton" />
                                             <controls:IconButton
@@ -639,7 +628,6 @@
                                                 Grid.Row="0"
                                                 Grid.Column="2"
                                                 Grid.RowSpan="2"
-                                                AutomationProperties.IsInAccessibleTree="True"
                                                 SemanticProperties.Description="{u:I18n Copy}"
                                                 AutomationId="CopyUriButton" />
                                         </Grid>
@@ -701,7 +689,6 @@
                                                 Command="{Binding BindingContext.DownloadAttachmentCommand, Source={x:Reference _page}}"
                                                 CommandParameter="{Binding .}"
                                                 VerticalOptions="Center"
-                                                AutomationProperties.IsInAccessibleTree="True"
                                                 SemanticProperties.Description="{u:I18n Download}"
                                                 AutomationId="CipherAttachmentDownloadButton" />
                                         </StackLayout>
@@ -754,7 +741,6 @@
             Style="{StaticResource btn-fab}"
             AbsoluteLayout.LayoutFlags="PositionProportional"
             AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n EditItem}"
             AutomationId="CipherEditButton"
             IsVisible="{Binding CanEdit}"/>
diff --git a/src/Core/Pages/Vault/CipherSelectionPage.xaml b/src/Core/Pages/Vault/CipherSelectionPage.xaml
index 1f73e4318..d53648872 100644
--- a/src/Core/Pages/Vault/CipherSelectionPage.xaml
+++ b/src/Core/Pages/Vault/CipherSelectionPage.xaml
@@ -18,11 +18,9 @@
             Order="Primary"
             Priority="-1"
             UseOriginalImage="True"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Account}"
             AutomationId="AccountIconButton" />
         <ToolbarItem IconImageSource="search.png" Clicked="Search_Clicked"
-                     AutomationProperties.IsInAccessibleTree="True"
                      SemanticProperties.Description="{u:I18n Search}" />
     </ContentPage.ToolbarItems>
 
@@ -42,7 +40,6 @@
                          IconImageSource="plus.png"
                          Command="{Binding AddCipherCommand}"
                          Order="Primary"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n AddItem}" />
 
             <DataTemplate x:Key="cipherTemplate"
diff --git a/src/Core/Pages/Vault/CiphersPage.xaml b/src/Core/Pages/Vault/CiphersPage.xaml
index 444f8e65d..ec0565c50 100644
--- a/src/Core/Pages/Vault/CiphersPage.xaml
+++ b/src/Core/Pages/Vault/CiphersPage.xaml
@@ -34,7 +34,6 @@
                     VerticalOptions="CenterAndExpand"
                     Clicked="BackButton_Clicked"
                     x:Name="_backButton"
-                    AutomationProperties.IsInAccessibleTree="True"
                     SemanticProperties.Description="{u:I18n TapToGoBack}"/>
                 <controls:ExtendedSearchBar
                     x:Name="_searchBar"
@@ -62,7 +61,6 @@
                 StyleClass="text-md, text-muted"
                 VerticalOptions="Center"
                 HorizontalOptions="StartAndExpand"
-                AutomationProperties.IsInAccessibleTree="True"
                 SemanticProperties.Description="{u:I18n Filter}" />
             <controls:MiButton
                 Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
@@ -70,7 +68,6 @@
                 Command="{Binding VaultFilterCommand}"
                 VerticalOptions="Center"
                 HorizontalOptions="End"
-                AutomationProperties.IsInAccessibleTree="True"
                 SemanticProperties.Description="{u:I18n Filter}" />
         </StackLayout>
         <BoxView StyleClass="box-row-separator" />
diff --git a/src/Core/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/Core/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index f1b6758a1..1fac9c61f 100644
--- a/src/Core/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/Core/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -24,11 +24,9 @@
             Order="Primary"
             Priority="-1"
             UseOriginalImage="True"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n Account}"
             AutomationId="AccountIconButton" />
         <ToolbarItem IconImageSource="search.png" Clicked="Search_Clicked"
-                     AutomationProperties.IsInAccessibleTree="True"
                      SemanticProperties.Description="{u:I18n Search}" />
     </ContentPage.ToolbarItems>
 
@@ -44,7 +42,6 @@
                          Clicked="Exit_Clicked" Order="Secondary" />
             <ToolbarItem x:Name="_addItem" x:Key="addItem" IconImageSource="plus.png"
                          Clicked="AddButton_Clicked" Order="Primary"
-                         AutomationProperties.IsInAccessibleTree="True"
                          SemanticProperties.Description="{u:I18n AddItem}" />
 
             <DataTemplate x:Key="cipherTemplate"
@@ -135,7 +132,6 @@
                         StyleClass="text-md, text-muted"
                         VerticalOptions="Center"
                         HorizontalOptions="StartAndExpand"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n Filter}" />
                     <controls:MiButton
                         Text="{Binding Source={x:Static core:BitwardenIcons.ViewCellMenu}}"
@@ -143,7 +139,6 @@
                         Command="{Binding VaultFilterCommand}"
                         VerticalOptions="Center"
                         HorizontalOptions="End"
-                        AutomationProperties.IsInAccessibleTree="True"
                         SemanticProperties.Description="{u:I18n Filter}" />
                 </StackLayout>
                 <StackLayout
@@ -196,7 +191,6 @@
             Style="{StaticResource btn-fab}"
             AbsoluteLayout.LayoutFlags="PositionProportional"
             AbsoluteLayout.LayoutBounds="1, 1, AutoSize, AutoSize"
-            AutomationProperties.IsInAccessibleTree="True"
             SemanticProperties.Description="{u:I18n AddItem}"/>
 
         <controls:AccountSwitchingOverlayView
diff --git a/src/Core/Pages/Vault/PasswordHistoryPage.xaml b/src/Core/Pages/Vault/PasswordHistoryPage.xaml
index bde6601d0..4a65063f4 100644
--- a/src/Core/Pages/Vault/PasswordHistoryPage.xaml
+++ b/src/Core/Pages/Vault/PasswordHistoryPage.xaml
@@ -76,7 +76,6 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Grid.RowSpan="2"
-                            AutomationProperties.IsInAccessibleTree="True"
                             SemanticProperties.Description="{u:I18n CopyPassword}" />
                     </Grid>
                 </DataTemplate>