diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 70cd36cbf..9a2d4657c 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <ArcGISRuntimeToolkitPackageVersion Condition="'$(ArcGISRuntimeToolkitPackageVersion)'==''">200.4.0</ArcGISRuntimeToolkitPackageVersion>
-    <ArcGISRuntimePackageVersion Condition="'$(ArcGISRuntimePackageVersion)'==''">200.4.0</ArcGISRuntimePackageVersion>
+    <ArcGISRuntimeToolkitPackageVersion Condition="'$(ArcGISRuntimeToolkitPackageVersion)'==''">200.5.0</ArcGISRuntimeToolkitPackageVersion>
+    <ArcGISRuntimePackageVersion Condition="'$(ArcGISRuntimePackageVersion)'==''">200.5.0</ArcGISRuntimePackageVersion>
 
     <!--Common package properties-->
     <Authors>Esri Inc.</Authors>
diff --git a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs
index 83a514067..43de1fed1 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.Maui/MainPage.xaml.cs
@@ -1,5 +1,6 @@
 using Esri.ArcGISRuntime;
 using Esri.ArcGISRuntime.Mapping;
+using Microsoft.Maui.ApplicationModel;
 
 namespace Toolkit.SampleApp.Maui;
 
@@ -8,6 +9,13 @@ public partial class MainPage : ContentPage
     public MainPage()
     {
         InitializeComponent();
+        ToolbarItems.Add(new ToolbarItem("Toggle Theme", null, () =>
+        {
+            if (App.Current!.RequestedTheme == AppTheme.Dark)
+                App.Current.UserAppTheme = AppTheme.Light;
+            else
+                App.Current.UserAppTheme = AppTheme.Dark;
+        }));
         SamplesList.ItemsSource = SampleDatasource.Current.Samples;
         CheckAPIKey();
     }
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Platforms/Android/AndroidManifest.xml b/src/Samples/Toolkit.SampleApp.Maui/Platforms/Android/AndroidManifest.xml
index e9937ad77..e360d87b0 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Platforms/Android/AndroidManifest.xml
+++ b/src/Samples/Toolkit.SampleApp.Maui/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
-	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.INTERNET" />
+    <application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true"></application>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
 </manifest>
\ No newline at end of file
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Platforms/iOS/Info.plist b/src/Samples/Toolkit.SampleApp.Maui/Platforms/iOS/Info.plist
index 0004a4fde..343c80563 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Platforms/iOS/Info.plist
+++ b/src/Samples/Toolkit.SampleApp.Maui/Platforms/iOS/Info.plist
@@ -28,5 +28,7 @@
 	</array>
 	<key>XSAppIconAssets</key>
 	<string>Assets.xcassets/appicon.appiconset</string>
+    <key>NSCameraUsageDescription</key>
+    <string>Adding attachments</string>
 </dict>
 </plist>
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml b/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml
index 1375e0bd4..a827b7527 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml
+++ b/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml
@@ -14,19 +14,21 @@
                           Map="https://www.arcgis.com/home/item.html?id=f72207ac170a40d8992b7a3507b44fad"
                           GeoViewTapped="mapView_GeoViewTapped" />
 
-            <Border HorizontalOptions="Center" VerticalOptions="Start" Background="#99ffffff" Padding="5" Margin="10" StrokeThickness="1" Stroke="Black">
+            <Border HorizontalOptions="Center" VerticalOptions="Start" Background="{AppThemeBinding Dark=#99000000, Light=#99ffffff}" Padding="5" Margin="10" StrokeThickness="1" Stroke="Black">
                 <Label Text="Click a feature to open its FeatureFormView" FontSize="18" />
             </Border>
 
             <Border x:Name="SidePanel" IsVisible="False" Grid.Column="1" WidthRequest="300">
-                <Border Background="{AppThemeBinding Dark=Black, Light=White}">
+                <Border Background="{AppThemeBinding Dark=#333333, Light=White}">
                     <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <esri:FeatureFormView Background="Transparent" x:Name="formViewer" Padding="12" Grid.ColumnSpan="2" VerticalScrollBarVisibility="Default"/>
-                        <Border Grid.Row="1" StrokeThickness="0" Padding="5" Background="#eeeeee">
+                        <esri:FeatureFormView Background="Transparent" x:Name="formViewer" Padding="12" Grid.ColumnSpan="2" VerticalScrollBarVisibility="Default"
+                                              BarcodeButtonClicked="BarcodeButtonClicked" FormAttachmentClicked="FormAttachmentClicked"
+                                              />
+                        <Border Grid.Row="1" StrokeThickness="0" Padding="5" Background="{AppThemeBinding Dark=Black, Light=White}">
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition />
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml.cs
index 3164fc311..cc12351e1 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.Maui/Samples/FeatureFormViewSample.xaml.cs
@@ -1,4 +1,5 @@
-using Esri.ArcGISRuntime.Data;
+using System.Diagnostics;
+using Esri.ArcGISRuntime.Data;
 using Esri.ArcGISRuntime.Mapping;
 using Esri.ArcGISRuntime.Mapping.FeatureForms;
 using Esri.ArcGISRuntime.Portal;
@@ -54,13 +55,45 @@ private async void mapView_GeoViewTapped(object sender, Esri.ArcGISRuntime.Maui.
             return null;
         }
 
+        private async void BarcodeButtonClicked(object sender, Esri.ArcGISRuntime.Toolkit.Maui.BarcodeButtonClickedEventArgs e)
+        {
+            // If user clicks the barcode button in a barcode input element, use ZXing library (https://github.com/Redth/ZXing.Net.Maui)
+            // to scan a barcode using the device camera
+            ZXing.Net.Maui.Controls.CameraBarcodeReaderView view = new ZXing.Net.Maui.Controls.CameraBarcodeReaderView();
+            TaskCompletionSource<string?> tcs = new TaskCompletionSource<string?>();
+            view.BarcodesDetected += (s, e) =>
+            {
+                if (tcs.TrySetResult(e.Results.FirstOrDefault()?.Value))
+                    Dispatcher.Dispatch(() => _ = Navigation.PopModalAsync());
+            };
+            ContentPage p = new ContentPage() { Content = view };
+            await Navigation.PushModalAsync(p);
+            p.NavigatedFrom += (s, e) => tcs.TrySetResult(null);
+            var barcode = await tcs.Task;
+            if (!string.IsNullOrEmpty(barcode))
+                e.FormElement.UpdateValue(barcode);
+        }
+
+        private void FormAttachmentClicked(object sender, Esri.ArcGISRuntime.Toolkit.Maui.FormAttachmentClickedEventArgs e)
+        {
+            // User clicked an attachment,
+            // e.Handled = true; // Uncomment to override default open attachment action
+            Debug.WriteLine("Attachment clicked: " + e.Attachment.Name);
+        }
 
         private async void DiscardButton_Click(object sender, EventArgs e)
         {
             var result = await DisplayAlert("Confirm", "Discard edits?", "Yes", "Cancel");
             if (result)
             {
-                formViewer.FeatureForm?.DiscardEdits();
+
+                ((Button)sender).IsEnabled = false;
+                try
+                {
+                    await formViewer.DiscardEditsAsync();
+                } catch { }
+
+                ((Button)sender).IsEnabled = true;
             }
         }
 
@@ -84,7 +117,7 @@ private async void UpdateButton_Click(object sender, EventArgs e)
             }
             try
             {
-                await formViewer.FeatureForm!.Feature.FeatureTable!.UpdateFeatureAsync(formViewer.FeatureForm.Feature);
+                await formViewer.FinishEditingAsync();
             }
             catch (Exception ex)
             {
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml b/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml
index ef425da95..0257a6d20 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml
+++ b/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml
@@ -12,7 +12,7 @@
             <Border Background="#99ffffff" x:Name="popupPanel" IsVisible="False">
                 <Border HorizontalOptions="Center" VerticalOptions="Center" Background="{AppThemeBinding Dark=Black, Light=White}" Margin="0,32" Padding="12">
                     <Grid>
-                        <esriTK:PopupViewer x:Name="popupViewer" Padding="12" MaximumWidthRequest="400" MaximumHeightRequest="400" PopupAttachmentClicked="popupViewer_PopupAttachmentClicked" />
+                        <esriTK:PopupViewer x:Name="popupViewer" Padding="12" MaximumWidthRequest="400" MaximumHeightRequest="400" PopupAttachmentClicked="popupViewer_PopupAttachmentClicked" HyperlinkClicked="popupViewer_HyperlinkClicked" />
                         <Button BorderWidth="0" Text="X" HorizontalOptions="End" VerticalOptions="Start" Clicked="CloseButton_Click" BackgroundColor="Transparent" TextColor="{AppThemeBinding Dark=White, Light=Black}" Margin="5" />
                     </Grid>
                 </Border>
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml.cs
index 4abe4e9c4..4643739b9 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.Maui/Samples/PopupViewerSample.xaml.cs
@@ -1,9 +1,7 @@
 using Esri.ArcGISRuntime.Data;
 using Esri.ArcGISRuntime.Mapping.Popups;
 using Esri.ArcGISRuntime.Maui;
-using Esri.ArcGISRuntime.Security;
-using Esri.ArcGISRuntime.UI;
-using Microsoft.Maui.Controls.Shapes;
+using System.Diagnostics;
 
 namespace Toolkit.SampleApp.Maui.Samples
 {
@@ -117,5 +115,14 @@ private void popupViewer_PopupAttachmentClicked(object sender, Esri.ArcGISRuntim
             _ = Microsoft.Maui.ApplicationModel.Launcher.Default.OpenAsync(
                  new Microsoft.Maui.ApplicationModel.OpenFileRequest(e.Attachment.Name, new ReadOnlyFile(e.Attachment.Filename!, e.Attachment.ContentType)));
         }
+
+        private void popupViewer_HyperlinkClicked(object sender, Esri.ArcGISRuntime.Toolkit.Maui.HyperlinkClickedEventArgs e)
+        {
+            // Include below line if you want to prevent the default action
+            // e.Handled = true;
+
+            // Perform custom action when a link is clicked
+            Debug.WriteLine(e.Uri);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj
index 107fc4dc0..0da3da16e 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj
+++ b/src/Samples/Toolkit.SampleApp.Maui/Toolkit.SampleApp.Maui.csproj
@@ -58,6 +58,7 @@
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Maui" Version="7.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="ZXing.Net.Maui.Controls" Version="0.4.0" />
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net8.0'))">
diff --git a/src/Samples/Toolkit.SampleApp.WPF/Samples/Forms/FeatureFormViewSample.xaml.cs b/src/Samples/Toolkit.SampleApp.WPF/Samples/Forms/FeatureFormViewSample.xaml.cs
index 6ab3b5bfa..a1351149a 100644
--- a/src/Samples/Toolkit.SampleApp.WPF/Samples/Forms/FeatureFormViewSample.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.WPF/Samples/Forms/FeatureFormViewSample.xaml.cs
@@ -55,12 +55,18 @@ private ArcGISFeature GetFeature(IEnumerable<IdentifyLayerResult> results, out F
             return null;
         }
 
-        private void DiscardButton_Click(object sender, RoutedEventArgs e)
+        private async void DiscardButton_Click(object sender, RoutedEventArgs e)
         {
             var result = MessageBox.Show("Discard edits?", "Confirm", MessageBoxButton.YesNo);
             if (result == MessageBoxResult.Yes)
             {
-                formViewer.FeatureForm.DiscardEdits();
+                ((Button)sender).IsEnabled = false;
+                try
+                {
+                    await formViewer.DiscardEditsAsync();
+                }
+                catch { }
+                ((Button)sender).IsEnabled = true;
             }
         }
 
@@ -83,7 +89,7 @@ private async void UpdateButton_Click(object sender, RoutedEventArgs e)
             }
             try
             {
-                await formViewer.FeatureForm.Feature.FeatureTable.UpdateFeatureAsync(formViewer.FeatureForm.Feature);
+                await formViewer.FinishEditingAsync();
             }
             catch (Exception ex)
             {
diff --git a/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml b/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml
index b1ba464ba..ea07d0942 100644
--- a/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml
+++ b/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml
@@ -14,7 +14,7 @@
 
         <Grid Background="#AA333333" Visibility="Collapsed" x:Name="PopupBackground" MouseDown="PopupBackground_MouseDown">
             <Border  BorderBrush="Black" BorderThickness="1" Background="White" HorizontalAlignment="Center" VerticalAlignment="Center" >
-                    <esri:PopupViewer x:Name="popupViewer" Margin="5" Width="400" MaxHeight="400" PopupAttachmentClicked="popupViewer_PopupAttachmentClicked" />
+                    <esri:PopupViewer x:Name="popupViewer" Margin="5" Width="400" MaxHeight="400" PopupAttachmentClicked="popupViewer_PopupAttachmentClicked" HyperlinkClicked="popupViewer_LinkClicked" />
             </Border>
         </Grid>
     </Grid>
diff --git a/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml.cs b/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml.cs
index 7dc8f9fad..7fd7b19cb 100644
--- a/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.WPF/Samples/PopupViewer/PopupViewerSample.xaml.cs
@@ -5,6 +5,7 @@
 using Esri.ArcGISRuntime.UI.Controls;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -154,5 +155,14 @@ private async void popupViewer_PopupAttachmentClicked(object sender, UI.Controls
                 }
             }
         }
+
+        private void popupViewer_LinkClicked(object sender, UI.Controls.HyperlinkClickedEventArgs e)
+        {
+            // Include below line if you want to prevent the default action
+            // e.Handled = true;
+
+            // Perform custom action when a link is clicked
+            Debug.WriteLine(e.Uri);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit.Maui/Internal/CalciteImageButton.cs b/src/Toolkit/Toolkit.Maui/Internal/CalciteImageButton.cs
new file mode 100644
index 000000000..a82ef9cb8
--- /dev/null
+++ b/src/Toolkit/Toolkit.Maui/Internal/CalciteImageButton.cs
@@ -0,0 +1,43 @@
+// /*******************************************************************************
+//  * Copyright 2012-2018 Esri
+//  *
+//  *  Licensed under the Apache License, Version 2.0 (the "License");
+//  *  you may not use this file except in compliance with the License.
+//  *  You may obtain a copy of the License at
+//  *
+//  *  http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  *   Unless required by applicable law or agreed to in writing, software
+//  *   distributed under the License is distributed on an "AS IS" BASIS,
+//  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  *   See the License for the specific language governing permissions and
+//  *   limitations under the License.
+//  ******************************************************************************/
+
+namespace Esri.ArcGISRuntime.Toolkit.Maui.Internal
+{
+    internal sealed class CalciteImageButton : ImageButton
+    {
+        private readonly string _glyph;
+        public CalciteImageButton(string glyph)
+        {
+            _glyph = glyph;
+            Source = new FontImageSource() { Glyph = _glyph, FontFamily = "calcite-ui-icons-24", Color = Color };
+            this.SetAppThemeColor(ColorProperty, Colors.Black, Colors.White);
+        }
+
+        public Color Color
+        {
+            get { return (Color)GetValue(ColorProperty); }
+            set { SetValue(ColorProperty, value); }
+        }
+
+        public static readonly BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(CalciteImageButton), Colors.Black,
+            propertyChanged: (s, oldValue, newValue) => ((CalciteImageButton)s).SetColor());
+
+        private void SetColor()
+        {
+            ((FontImageSource)Source).Color = Color;
+        }
+    }
+}
diff --git a/src/Toolkit/Toolkit.UI.Controls/BasemapGallery/BasemapGallery.Windows.cs b/src/Toolkit/Toolkit.UI.Controls/BasemapGallery/BasemapGallery.Windows.cs
index 66ecfb5f8..314bef103 100644
--- a/src/Toolkit/Toolkit.UI.Controls/BasemapGallery/BasemapGallery.Windows.cs
+++ b/src/Toolkit/Toolkit.UI.Controls/BasemapGallery/BasemapGallery.Windows.cs
@@ -34,6 +34,7 @@ namespace Esri.ArcGISRuntime.Toolkit.UI.Controls
     public partial class BasemapGallery : Control
     {
         private readonly BasemapGalleryController _controller;
+        private bool isAvailableBasemapCollectionInitialized;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="BasemapGallery"/> class.
@@ -44,6 +45,7 @@ public BasemapGallery()
             DefaultStyleKey = typeof(BasemapGallery);
             SizeChanged += BasemapGallerySizeChanged;
             AvailableBasemaps = new ObservableCollection<BasemapGalleryItem>();
+            isAvailableBasemapCollectionInitialized = true;
             _controller.PropertyChanged += HandleControllerPropertyChanged;
             Loaded += BasemapGallery_Loaded;
         }
@@ -52,8 +54,8 @@ private async void BasemapGallery_Loaded(object? sender, RoutedEventArgs e)
         {
             // Unsubscribe from the Loaded event to ensure this only runs once.
             Loaded -= BasemapGallery_Loaded;
-            
-            if (AvailableBasemaps is null)
+
+            if ((AvailableBasemaps is null || !AvailableBasemaps.Any()) && isAvailableBasemapCollectionInitialized)
             {
                 await _controller.LoadFromDefaultPortal();
             }
@@ -141,6 +143,7 @@ private static void AvailableBasemapsChanged(DependencyObject d, DependencyPrope
         {
             if (d is BasemapGallery gallery)
             {
+                gallery.isAvailableBasemapCollectionInitialized = false;
                 if (e.NewValue != gallery._controller.AvailableBasemaps)
                 {
                     gallery._controller.AvailableBasemaps = e.NewValue as IList<BasemapGalleryItem>;
diff --git a/src/Toolkit/Toolkit.WPF/UI/Controls/FeatureForm/FeatureFormView.Theme.xaml b/src/Toolkit/Toolkit.WPF/UI/Controls/FeatureForm/FeatureFormView.Theme.xaml
index b4155078b..4702f6288 100644
--- a/src/Toolkit/Toolkit.WPF/UI/Controls/FeatureForm/FeatureFormView.Theme.xaml
+++ b/src/Toolkit/Toolkit.WPF/UI/Controls/FeatureForm/FeatureFormView.Theme.xaml
@@ -10,6 +10,7 @@
   <SolidColorBrush x:Key="FeatureFormAccentBrush" Color="#007AC2" />
   <Thickness x:Key="FeatureFormElementInputMargin">0,0,0,5</Thickness>
   <internal:VisibilityConverter x:Key="FeatureFormViewVisibilityConverter"/>
+  <internal:FileSizeConverter x:Key="FeatureFormFileSizeConverter" />
   <Style TargetType="TextBlock" x:Key="FeatureFormViewHeaderStyle">
      <Setter Property="FontSize" Value="16" />
      <Setter Property="FontWeight" Value="Bold" />
@@ -118,6 +119,8 @@
     <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
   </Style>
   <Style TargetType="{x:Type primitives:TextFormInputView}">
+    <Setter Property="BorderThickness" Value="1" />
+    <Setter Property="BorderBrush" Value="Black" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type primitives:TextFormInputView}">
@@ -155,14 +158,29 @@
               <TextBlock Text="/" />
               <TextBlock Text="{Binding MaxLength, ElementName=TextInput}" />
             </StackPanel>
-            <TextBox x:Name="TextInput" MaxLines="{TemplateBinding MaxLines}" MinLines="{TemplateBinding MinLines}" /> 
+            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBox x:Name="TextInput" MaxLines="{TemplateBinding MaxLines}" MinLines="{TemplateBinding MinLines}" BorderThickness="0" />
+                    <TextBlock Text="!" Background="Transparent" Width="10" Foreground="Red" Visibility="Collapsed" HorizontalAlignment="Right" VerticalAlignment="Center" x:Name="ErrorInfo" Grid.Column="1" />
+                    <Button Content="&#xED14;" FontFamily="Segoe MDL2 Assets" Background="Transparent" Grid.Column="2"
+                       Padding="8" Margin="-8,-8,-5,-7" BorderThickness="0" Visibility="Collapsed" HorizontalAlignment="Right" VerticalAlignment="Center" x:Name="BarcodeButton" />
+                </Grid>
+            </Border>
             <TextBlock x:Name="ReadOnlyText" Visibility="Collapsed" />
             <Border x:Name="ErrorBorder" BorderThickness="1" BorderBrush="Red" Visibility="Collapsed" />
-            <TextBlock Text="!" Background="Transparent" Width="10" Foreground="Red" Visibility="Collapsed" HorizontalAlignment="Right" VerticalAlignment="Center" x:Name="ErrorInfo" />
           </Grid>
           <ControlTemplate.Triggers>
+            <Trigger Property="ShowBarcodeScanner" Value="true">
+              <Setter TargetName="BarcodeButton" Property="Visibility" Value="Visible"/>
+            </Trigger>
             <Trigger Property="IsEnabled" Value="false">
               <Setter TargetName="TextInput" Property="Visibility" Value="Collapsed"/> 
+              <Setter TargetName="BarcodeButton" Property="Visibility" Value="Collapsed"/> 
               <Setter TargetName="ReadOnlyText" Property="Visibility" Value="Visible"/>
             </Trigger>
             <Trigger Property="IsEnabled" Value="true">
@@ -175,6 +193,7 @@
             <Trigger Property="ShowCharacterCount" Value="true">
               <Setter TargetName="CharacterCountPanel" Property="Visibility" Value="Visible"/>
             </Trigger>
+
           </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
@@ -218,6 +237,13 @@
         </DataTemplate>
       </Setter.Value>
     </Setter>
+    <Setter Property="BarcodeScannerFormInputTemplate">
+      <Setter.Value>
+        <DataTemplate>
+          <primitives:TextFormInputView Element="{Binding}" IsEnabled="{Binding IsEditable}" />
+        </DataTemplate>
+      </Setter.Value>
+    </Setter>
     <Setter Property="DateTimePickerFormInputTemplate">
       <Setter.Value>
         <DataTemplate>
@@ -346,8 +372,117 @@
       </Setter.Value>
     </Setter>
   </Style>
-  
-  <Style TargetType="{x:Type controls:FeatureFormView}" >
+    <Style TargetType="{x:Type primitives:FormAttachmentView}">
+        <Setter Property="Cursor" Value="Hand" />
+        <Setter Property="Width" Value="92" />
+        <Setter Property="Height" Value="75" />
+        <Setter Property="Background" Value="#33000000" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type primitives:FormAttachmentView}">
+                    <Border CornerRadius="4" Background="{TemplateBinding Background}" Margin="4">
+                        <Border.ToolTip>
+                            <StackPanel>
+                                <TextBlock Text="{Binding Name}" />
+                                <TextBlock Text="{Binding Size, Converter={StaticResource FeatureFormFileSizeConverter}}" />
+                            </StackPanel>
+                        </Border.ToolTip>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="LoadedStates">
+                                <VisualState x:Name="NotLoaded">
+                                </VisualState>
+                                <VisualState x:Name="Loading">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LoadingBar" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DownloadIcon" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Loaded">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DownloadIcon" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FileSizeText" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Collapsed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NameBackground" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <SolidColorBrush Color="#33000000" />
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="AttachmentName" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <SolidColorBrush Color="White" />
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Grid>
+                            <Image x:Name="ThumbnailImage" />
+                            <Border x:Name="NameBackground" CornerRadius="0,0,4,4" Background="Transparent" VerticalAlignment="Bottom" Padding="2">
+                                <TextBlock x:Name="AttachmentName" Text="{Binding Name}" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="10" TextTrimming="CharacterEllipsis" />
+                            </Border>
+                            <TextBlock x:Name="FileSizeText" Text="{Binding Size, Converter={StaticResource FeatureFormFileSizeConverter}}" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="10" />
+                            <TextBlock x:Name="DownloadIcon" FontFamily="Segoe MDL2 Assets" Text="&#xE896;" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="2" />
+                            <ProgressBar x:Name="LoadingBar" IsIndeterminate="True" Visibility="Collapsed" VerticalAlignment="Center" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="{x:Type primitives:AttachmentsFormElementView}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type primitives:AttachmentsFormElementView}">
+                    <StackPanel DataContext="{TemplateBinding Element}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Text="{Binding Label}" Visibility="{Binding Label, Converter={StaticResource FeatureFormViewVisibilityConverter}}" Style="{StaticResource FeatureFormViewTitleStyle}" />
+                            <TextBlock Text="{Binding Description}" Visibility="{Binding Description, Converter={StaticResource FeatureFormViewVisibilityConverter}}" Opacity=".7" Style="{StaticResource FeatureFormViewCaptionStyle}" />
+                            <Button x:Name="AddAttachmentButton" BorderThickness="0" Background="Transparent" HorizontalAlignment="Stretch" HorizontalContentAlignment="Left" 
+                                    Visibility="{Binding IsEditable, Converter={StaticResource FeatureFormViewVisibilityConverter}}" Padding="5" Cursor="Hand" Grid.Column="1" Grid.RowSpan="2">
+                                    <TextBlock Text="" FontFamily="Segoe MDL2 Assets" />
+                            </Button>
+                        </Grid>
+                        <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled" x:Name="ItemsScrollView">
+                            <ItemsControl ItemsSource="{Binding Attachments}" IsEnabled="{Binding IsEditable}">
+                                <ItemsControl.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <StackPanel Orientation="Horizontal" />
+                                    </ItemsPanelTemplate>
+                                </ItemsControl.ItemsPanel>
+                                <ItemsControl.ItemTemplate>
+                                    <DataTemplate>
+                                        <primitives:FormAttachmentView Attachment="{Binding}" Element="{Binding Element, RelativeSource={RelativeSource AncestorType=primitives:AttachmentsFormElementView}}" />
+                                    </DataTemplate>
+                                </ItemsControl.ItemTemplate>
+                            </ItemsControl>
+                        </ScrollViewer>
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
+    </Style>
+    <Style TargetType="{x:Type controls:FeatureFormView}" >
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type controls:FeatureFormView}">
@@ -384,34 +519,37 @@
               <TextBlock Text="{Binding Title}" Style="{StaticResource FeatureFormViewHeaderStyle}"
                          Visibility="{Binding Title, Converter={StaticResource FeatureFormViewVisibilityConverter}}" />
               <ScrollViewer VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}"  Grid.Row="1" x:Name="FeatureFormContentScrollViewer">
-                <primitives:FormElementItemsControl ItemsSource="{Binding Elements}" Margin="0,10" x:Name="ItemsView" KeyboardNavigation.IsTabStop="False">
-                  <primitives:FormElementItemsControl.FieldFormElementTemplate>
-                    <DataTemplate>
-                      <primitives:FieldFormElementView Element="{Binding}" FeatureForm="{Binding FeatureForm, RelativeSource={RelativeSource AncestorType=controls:FeatureFormView}}" />
-                    </DataTemplate>
-                  </primitives:FormElementItemsControl.FieldFormElementTemplate>
-                  <primitives:FormElementItemsControl.GroupFormElementTemplate>
-                    <DataTemplate>
-                      <StackPanel Visibility="{Binding IsVisible, Converter={StaticResource FeatureFormViewVisibilityConverter}}" >
-                        <Expander Style="{StaticResource GroupFormElementExpanderStyle}">
-                          <Expander.Header>
-                            <StackPanel VerticalAlignment="Center">
-                              <TextBlock Text="{Binding Label}" Visibility="{Binding Label, Converter={StaticResource FeatureFormViewVisibilityConverter}}" Style="{StaticResource FeatureFormViewTitleStyle}" />
-                              <TextBlock Text="{Binding Description}" Visibility="{Binding Description, Converter={StaticResource FeatureFormViewVisibilityConverter}}" Style="{StaticResource FeatureFormViewCaptionStyle}" />
-                            </StackPanel>
-                          </Expander.Header>
-                          <primitives:FormElementItemsControl ItemsSource="{Binding Elements}" Margin="0,10" KeyboardNavigation.IsTabStop="False">
-                            <primitives:FormElementItemsControl.FieldFormElementTemplate>
-                              <DataTemplate>
-                                <primitives:FieldFormElementView Element="{Binding}" FeatureForm="{Binding FeatureForm, RelativeSource={RelativeSource AncestorType=controls:FeatureFormView}}" />
-                              </DataTemplate>
-                            </primitives:FormElementItemsControl.FieldFormElementTemplate>
-                          </primitives:FormElementItemsControl>
-                        </Expander>
-                      </StackPanel>
-                    </DataTemplate>
-                  </primitives:FormElementItemsControl.GroupFormElementTemplate>
-                </primitives:FormElementItemsControl>
+                 <StackPanel>
+                  <primitives:FormElementItemsControl ItemsSource="{Binding Elements}" Margin="0,10" x:Name="ItemsView" KeyboardNavigation.IsTabStop="False">
+                    <primitives:FormElementItemsControl.FieldFormElementTemplate>
+                      <DataTemplate>
+                        <primitives:FieldFormElementView Element="{Binding}" FeatureForm="{Binding FeatureForm, RelativeSource={RelativeSource AncestorType=controls:FeatureFormView}}" />
+                      </DataTemplate>
+                    </primitives:FormElementItemsControl.FieldFormElementTemplate>
+                    <primitives:FormElementItemsControl.GroupFormElementTemplate>
+                      <DataTemplate>
+                        <StackPanel Visibility="{Binding IsVisible, Converter={StaticResource FeatureFormViewVisibilityConverter}}" >
+                          <Expander Style="{StaticResource GroupFormElementExpanderStyle}">
+                            <Expander.Header>
+                              <StackPanel VerticalAlignment="Center">
+                                <TextBlock Text="{Binding Label}" Visibility="{Binding Label, Converter={StaticResource FeatureFormViewVisibilityConverter}}" Style="{StaticResource FeatureFormViewTitleStyle}" />
+                                <TextBlock Text="{Binding Description}" Visibility="{Binding Description, Converter={StaticResource FeatureFormViewVisibilityConverter}}" Style="{StaticResource FeatureFormViewCaptionStyle}" />
+                              </StackPanel>
+                            </Expander.Header>
+                            <primitives:FormElementItemsControl ItemsSource="{Binding Elements}" Margin="0,10" KeyboardNavigation.IsTabStop="False">
+                              <primitives:FormElementItemsControl.FieldFormElementTemplate>
+                                <DataTemplate>
+                                  <primitives:FieldFormElementView Element="{Binding}" FeatureForm="{Binding FeatureForm, RelativeSource={RelativeSource AncestorType=controls:FeatureFormView}}" />
+                                </DataTemplate>
+                              </primitives:FormElementItemsControl.FieldFormElementTemplate>
+                            </primitives:FormElementItemsControl>
+                          </Expander>
+                        </StackPanel>
+                      </DataTemplate>
+                    </primitives:FormElementItemsControl.GroupFormElementTemplate>
+                  </primitives:FormElementItemsControl>
+                  <primitives:AttachmentsFormElementView Element="{Binding DefaultAttachmentsElement}" />
+                </StackPanel>
               </ScrollViewer>
             </Grid>
           </Border>
diff --git a/src/Toolkit/Toolkit/Internal/FileSizeConverter.cs b/src/Toolkit/Toolkit/Internal/FileSizeConverter.cs
new file mode 100644
index 000000000..425795c90
--- /dev/null
+++ b/src/Toolkit/Toolkit/Internal/FileSizeConverter.cs
@@ -0,0 +1,71 @@
+// /*******************************************************************************
+//  * Copyright 2012-2018 Esri
+//  *
+//  *  Licensed under the Apache License, Version 2.0 (the "License");
+//  *  you may not use this file except in compliance with the License.
+//  *  You may obtain a copy of the License at
+//  *
+//  *  http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  *   Unless required by applicable law or agreed to in writing, software
+//  *   distributed under the License is distributed on an "AS IS" BASIS,
+//  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  *   See the License for the specific language governing permissions and
+//  *   limitations under the License.
+//  ******************************************************************************/
+
+#if WPF || WINDOWS_XAML || MAUI
+using System;
+using System.Collections;
+using System.Globalization;
+
+namespace Esri.ArcGISRuntime.Toolkit.Internal
+{
+    /// <summary>
+    /// *FOR INTERNAL USE* Converts an integer number to a readable filesize string.
+    /// </summary>
+    [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
+    internal sealed class FileSizeConverter : IValueConverter
+    {
+        /// <inheritdoc />
+        object IValueConverter.Convert(object? value, Type targetType, object? parameter,
+#if WINDOWS_XAML
+            string language)
+#else
+            CultureInfo culture)
+#endif
+        {
+            long size = -1;
+            if (value is long longsize)
+                size = longsize;
+            else if (value is int intsize)
+                size = intsize;
+            else if (value is short shortsize)
+                size = shortsize;
+            if(size > 1024L*1024*1024*1024)
+                return $"{Math.Round(size / 1024d / 1024 / 1024 / 1024, 2)} TB";
+            else if (size > 1024*1024*1024)
+                return $"{Math.Round(size / 1024d / 1024 / 1024, 2)} GB";
+            else if (size > 1024*1024)
+                return $"{Math.Round(size / 1024d / 1024, 2)} MB";
+            else if (size > 1024)
+                return $"{Math.Round(size / 1024d, 2)} kB";
+            else if (size > 0)
+                return $"{size} B";
+            else
+                return string.Empty;
+        }
+
+        /// <inheritdoc />
+        object IValueConverter.ConvertBack(object? value, Type targetType, object? parameter,
+#if WINDOWS_XAML
+            string language)
+#else
+            CultureInfo culture)
+#endif
+        {
+            throw new NotSupportedException();
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/Internal/MimeTypeMap.cs b/src/Toolkit/Toolkit/Internal/MimeTypeMap.cs
new file mode 100644
index 000000000..49a66d41b
--- /dev/null
+++ b/src/Toolkit/Toolkit/Internal/MimeTypeMap.cs
@@ -0,0 +1,118 @@
+// /*******************************************************************************
+//  * Copyright 2012-2018 Esri
+//  *
+//  *  Licensed under the Apache License, Version 2.0 (the "License");
+//  *  you may not use this file except in compliance with the License.
+//  *  You may obtain a copy of the License at
+//  *
+//  *  http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  *   Unless required by applicable law or agreed to in writing, software
+//  *   distributed under the License is distributed on an "AS IS" BASIS,
+//  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  *   See the License for the specific language governing permissions and
+//  *   limitations under the License.
+//  ******************************************************************************/
+
+// Based on https://github.com/samuelneff/MimeTypeMap/blob/master/MimeTypeMap.cs
+// by Samuel Neff, MIT License
+
+namespace Esri.ArcGISRuntime.Toolkit.Internal
+{
+    internal static class MimeTypeMap
+    {
+        private static readonly Lazy<IDictionary<string, string>> _mappings = new Lazy<IDictionary<string, string>>(BuildMappings);
+
+        // Based on the following list: https://doc.arcgis.com/en/arcgis-online/manage-data/edit-tables-mv.htm#ESRI_SECTION2_3C99CF74A5C74A0AA0AD4A619F4457D7
+        // Note: application/octet-stream types are not included, since they'll use the fallback.
+        private static IDictionary<string, string> BuildMappings()
+        {
+            var mappings = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase) {
+                {".7z", "application/x-7z-compressed"},
+                {".aif", "audio/aiff"},
+                {".aifc", "audio/aiff"},
+                {".aiff", "audio/aiff"},
+                {".avi", "video/x-msvideo"},{".avif", "image/avif"},
+                { ".bmp", "image/bmp"},
+                { ".csv", "text/csv"},
+                { ".doc", "application/msword"},
+                { ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"},
+                { ".dot", "application/msword"},
+                { ".ecw", "image/ecw"},
+                { ".emf", "image/emf"},
+                { ".eps", "application/postscript"},
+                { ".geojson", "application/geo+json"},
+                { ".gif", "image/gif"},
+                { ".gml", "application/gml+xml"},
+                { ".gtar", "application/x-gtar"},
+                { ".gz", "application/x-gzip"},
+                { ".j2k", "image/j2k"},
+                { ".jp2", "image/jp2"},
+                { ".jpc", "image/jpc"},
+                { ".jpe", "image/jpeg"},
+                { ".jpeg", "image/jpeg"},
+                { ".jpg", "image/jpeg"},
+                { ".json", "application/json"},
+                { ".m4a", "audio/m4a"},
+                { ".mdb", "application/x-msaccess"},
+                { ".mid", "audio/mid"},
+                { ".midi", "audio/mid"},
+                { ".mov", "video/quicktime"},
+                { ".mp2", "video/mpeg"},
+                { ".mp2v", "video/mpeg"},
+                { ".mp3", "audio/mpeg"},
+                { ".mp4", "video/mp4"},
+                { ".mp4v", "video/mp4"},
+                { ".mpa", "video/mpeg"},
+                { ".mpe", "video/mpeg"},
+                { ".mpeg", "video/mpeg"},
+                { ".mpg", "video/mpeg"},
+                { ".mpv2", "video/mpeg"},
+                { ".pdf", "application/pdf"},
+                { ".png", "image/png"},
+                { ".ppt", "application/vnd.ms-powerpoint"},
+                { ".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"},
+                { ".ps", "application/postscript"},
+                { ".psd", "application/x-photoshop"},
+                { ".qt", "video/quicktime"},
+                { ".ra", "audio/x-pn-realaudio"},
+                { ".ram", "audio/x-pn-realaudio"},
+                { ".rmi", "audio/mid"},
+                { ".tar", "application/x-tar"},
+                { ".tgz", "application/x-compressed"},
+                { ".tif", "image/tiff"},
+                { ".tiff", "image/tiff"},
+                { ".txt", "text/plain"},
+                { ".vrml", "model/x3d-vrml"},
+                { ".wav", "audio/wav"},
+                { ".wma", "audio/x-ms-wma"},
+                { ".wmf", "application/x-msmetafile"},
+                { ".wmv", "video/x-ms-wmv"},
+                { ".wps", "application/vnd.ms-works"},
+                { ".xls", "application/vnd.ms-excel"},
+                { ".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"},
+                { ".xlt", "application/vnd.ms-excel"},
+                { ".xml", "text/xml"},
+                { ".zip", "application/zip"},
+
+                };
+
+            return mappings;
+        }
+
+        public static string GetMimeType(string extension)
+        {
+            if (!string.IsNullOrEmpty(extension))
+            {
+#if WINDOWS && !WINDOWS_UWP
+                string? mimeType = Microsoft.Win32.Registry.GetValue(@"HKEY_CLASSES_ROOT\" + extension, "Content Type", null) as string;
+                if (!string.IsNullOrEmpty(mimeType))
+                    return mimeType;
+#endif
+                if (_mappings.Value.TryGetValue(extension, out string? result))
+                    return result;
+            }
+            return "application/octet-stream";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/LocalizedStrings/Resources.resx b/src/Toolkit/Toolkit/LocalizedStrings/Resources.resx
index a1dde770f..1fe3ffacd 100644
--- a/src/Toolkit/Toolkit/LocalizedStrings/Resources.resx
+++ b/src/Toolkit/Toolkit/LocalizedStrings/Resources.resx
@@ -117,6 +117,14 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="FeatureFormAddAttachmentMenuFromFile" xml:space="preserve">
+    <value>Add Attachment</value>
+    <comment>Menu text for adding a file attachment</comment>
+  </data>
+  <data name="FeatureFormAddAttachmentMenuWithCamera" xml:space="preserve">
+    <value>Take Photo</value>
+    <comment>Menu text for adding an attachment by taking a photo</comment>
+  </data>
   <data name="FeatureFormExceedsMaximumDateTime" xml:space="preserve">
     <value>Date must be on or before {0}</value>
     <comment>Input validation of entered date must be before or on the maximum allowed date {0}</comment>
@@ -177,6 +185,10 @@
     <value>Less than minimum value</value>
     <comment>Input validation of entered number is below the minimum require value</comment>
   </data>
+  <data name="FeatureFormNoAttachments" xml:space="preserve">
+    <value>No attachments</value>
+    <comment>The text displayed in the attachment list when there are no attachments.</comment>
+  </data>
   <data name="FeatureFormNotInCodedValueDomain" xml:space="preserve">
     <value>Value must be within the domain</value>
     <comment>Input validation of domain values is now any of the required domain values</comment>
@@ -185,10 +197,26 @@
     <value>Value must not be empty</value>
     <comment>Input validation of value was null or empty </comment>
   </data>
+  <data name="FeatureFormOpenAttachmentMenuItem" xml:space="preserve">
+    <value>Open</value>
+    <comment>Menu text for opening a file attachment on the device</comment>
+  </data>
   <data name="FeatureFormOutsideLengthRange" xml:space="preserve">
     <value>Enter {0} to {1} characters</value>
     <comment>Input validation of entered text must be of a length between {0} and {1} characters</comment>
   </data>
+  <data name="FeatureFormRemoveAttachmentMenuItem" xml:space="preserve">
+    <value>Remove</value>
+    <comment>The remove attachment context menu text</comment>
+  </data>
+  <data name="FeatureFormRenameAttachmentMenuItem" xml:space="preserve">
+    <value>Rename</value>
+    <comment>The rename attachment context menu text</comment>
+  </data>
+  <data name="FeatureFormRenameAttachmentWindowTitle" xml:space="preserve">
+    <value>Rename Attachment</value>
+    <comment>The title of the dialog used for renaming feature file attachments</comment>
+  </data>
   <data name="FeatureFormSpecificLength" xml:space="preserve">
     <value>Number of characters required: {0}</value>
     <comment>Input validation of entered text must be exactly {0} characters long</comment>
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs
new file mode 100644
index 000000000..49b73abdf
--- /dev/null
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Maui.cs
@@ -0,0 +1,240 @@
+// /*******************************************************************************
+//  * Copyright 2012-2018 Esri
+//  *
+//  *  Licensed under the Apache License, Version 2.0 (the "License");
+//  *  you may not use this file except in compliance with the License.
+//  *  You may obtain a copy of the License at
+//  *
+//  *  http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  *   Unless required by applicable law or agreed to in writing, software
+//  *   distributed under the License is distributed on an "AS IS" BASIS,
+//  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  *   See the License for the specific language governing permissions and
+//  *   limitations under the License.
+//  ******************************************************************************/
+
+
+#if MAUI
+using Microsoft.Maui.Controls.Internals;
+using Esri.ArcGISRuntime.Data;
+using Esri.ArcGISRuntime.Mapping.FeatureForms;
+using Esri.ArcGISRuntime.Toolkit.Internal;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.ApplicationModel;
+
+namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives
+{
+    public partial class AttachmentsFormElementView : TemplatedView
+    {
+        private static readonly ControlTemplate DefaultControlTemplate;
+        private const string AttachmentsListViewName = "AttachmentsListView";
+        private const string AddAttachmentButtonName = "AddAttachmentButton";
+
+        private Button? _addAttachmentButton;
+
+        static AttachmentsFormElementView()
+        {
+            DefaultControlTemplate = new ControlTemplate(BuildDefaultTemplate);
+        }
+
+        private T? GetParent<T>() where T : Element
+        {
+            var parent = this.Parent;
+            while (parent is not null && parent is not T page)
+            {
+                parent = parent.Parent;
+            }
+            return parent as T;
+        }
+
+        [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.AttachmentsFormElement.Attachments), "Esri.ArcGISRuntime.Mapping.FeatureForms.AttachmentsFormElement", "Esri.ArcGISRuntime")]
+        [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.AttachmentsFormElement.IsEditable), "Esri.ArcGISRuntime.Mapping.FeatureForms.AttachmentsFormElement", "Esri.ArcGISRuntime")]
+        [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.IsVisible), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")]
+        [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Label), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")]
+        [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Description), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")]
+        private static object BuildDefaultTemplate()
+        {
+            var root = new VerticalStackLayout();
+            root.SetBinding(VerticalStackLayout.IsVisibleProperty, nameof(FormElement.IsVisible));
+
+            Grid header = new Grid();
+            header.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star));
+            header.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto));
+            header.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
+            header.RowDefinitions.Add(new RowDefinition(GridLength.Auto));
+
+            var label = new Label();
+            label.SetBinding(Label.TextProperty, new Binding("Element.Label", source: RelativeBindingSource.TemplatedParent));
+            label.SetBinding(View.IsVisibleProperty, new Binding("Element.Label", source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()));
+            label.Style = FeatureFormView.GetFeatureFormTitleStyle();
+            header.Children.Add(label);
+            label = new Label();
+            label.SetBinding(Label.TextProperty, new Binding("Element.Description", source: RelativeBindingSource.TemplatedParent));
+            label.SetBinding(Label.IsVisibleProperty, new Binding("Element.Description", source: RelativeBindingSource.Self, converter: new EmptyStringToBoolConverter()));
+            label.Style = FeatureFormView.GetFeatureFormCaptionStyle();
+            Grid.SetRow(label, 1);
+            header.Children.Add(label);
+            Button addButton = new Button()
+            {
+                Margin = new Thickness(0, -5, 0, 0),
+                Text = "\uE21B",
+                FontFamily = "calcite-ui-icons-24",
+                BorderWidth = 0,
+                FontSize = 24,
+                BackgroundColor = Colors.Transparent,
+                TextColor = Colors.CornflowerBlue,
+                HorizontalOptions = new LayoutOptions(LayoutAlignment.Start, true),
+                VerticalOptions = new LayoutOptions(LayoutAlignment.Start, true),
+                Padding = new Thickness(5)
+            };
+           
+            
+            Grid.SetColumn(addButton, 1);
+            Grid.SetRowSpan(addButton, 2);
+            addButton.SetBinding(VisualElement.IsVisibleProperty, new Binding("Element.IsEditable", source: RelativeBindingSource.TemplatedParent));
+            header.Children.Add(addButton);
+
+            root.Children.Add(header);
+
+            CollectionView itemsView = new CollectionView()
+            {
+                HorizontalScrollBarVisibility = ScrollBarVisibility.Default,
+                EmptyView = new Label() { Text = Properties.Resources.GetString("FeatureFormNoAttachments"), TextColor = Colors.Gray },
+                ItemsLayout = new GridItemsLayout(1, ItemsLayoutOrientation.Horizontal) { HorizontalItemSpacing = 4 },
+                ItemTemplate = new DataTemplate(() =>
+                {
+                    var view = new FormAttachmentView();
+                    view.SetBinding(FormAttachmentView.AttachmentProperty, new Binding());
+                    view.SetBinding(FormAttachmentView.ElementProperty, new Binding("Element", source: RelativeBindingSource.TemplatedParent));
+                    view.SetAppThemeColor(FormAttachmentView.IconColorProperty, Colors.Black, Colors.White);
+                    view.SetBinding(ToolTipProperties.TextProperty, new Binding("Attachment.Name"));
+                    return view;
+                }),
+#if IOS
+                HeightRequest = 75,
+                ItemSizingStrategy = ItemSizingStrategy.MeasureFirstItem,
+#else
+                MinimumHeightRequest = 75,
+#endif
+            };
+            itemsView.SetBinding(CollectionView.ItemsSourceProperty, new Binding("Element.Attachments", source: RelativeBindingSource.TemplatedParent));
+            root.Children.Add(itemsView);
+            
+            INameScope nameScope = new NameScope();
+            NameScope.SetNameScope(root, nameScope);
+            nameScope.RegisterName(AddAttachmentButtonName, addButton);
+            nameScope.RegisterName(AttachmentsListViewName, itemsView);
+            return root;
+        }
+
+        /// <inheritdoc />
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            if (_addAttachmentButton is not null)
+            {
+                _addAttachmentButton.Clicked -= AddAttachmentButton_Click;
+                FlyoutBase.SetContextFlyout(_addAttachmentButton, null);
+            }
+            _addAttachmentButton = GetTemplateChild("AddAttachmentButton") as Button;
+            if (_addAttachmentButton is not null)
+            {
+                _addAttachmentButton.Clicked += AddAttachmentButton_Click;
+            }
+        }
+
+        private async void AddAttachmentButton_Click(object? sender, EventArgs e)
+        {
+            var page = GetParent<Page>();
+            if(page != null && MediaPicker.IsCaptureSupported)
+            {
+#if ANDROID
+                // Check if manifest allows camera access.
+                if (!Permissions.IsDeclaredInManifest("android.permission.CAMERA"))
+                {
+                    Trace.WriteLine("**Microsoft.Maui.ApplicationModel.PermissionException:** 'You need to declare using the permission: `android.permission.CAMERA` in your AndroidManifest.xml'", "ArcGIS Maps SDK Toolkit");
+                    // Fallback to just adding a file
+                    AddAttachmentFromFile();
+                    return;
+                }
+#elif IOS
+                // Check if manifest allows camera access.
+                if (!Permissions.IsKeyDeclaredInInfoPlist("NSCameraUsageDescription"))
+                {
+                    Trace.WriteLine("You must set `NSCameraUsageDescription` in your Info.plist file to use the Permission: Camera.", "ArcGIS Maps SDK Toolkit");
+                    // Fallback to just adding a file
+                    AddAttachmentFromFile();
+                    return;
+                }
+#endif
+                var addAttachment = Properties.Resources.GetString("FeatureFormAddAttachmentMenuFromFile");
+                var camera = Properties.Resources.GetString("FeatureFormAddAttachmentMenuWithCamera");
+                
+                var result = await page.DisplayActionSheet(addAttachment, null, null, camera, addAttachment);
+                if (result == camera)
+                {
+                    try
+                    {
+                        var status = await Permissions.RequestAsync<Permissions.Camera>();
+                        if (status != PermissionStatus.Granted)
+                        {
+                            return;
+                        }
+                        // Note: iOS returns a PNG image. See https://github.com/dotnet/maui/issues/8251
+                        var photo = await MediaPicker.CapturePhotoAsync();
+                        if (photo != null && Element != null)
+                        {
+                            using (var stream = await photo.OpenReadAsync())
+                            {
+                                using var sr = new BinaryReader(stream);
+                                var data = sr.ReadBytes((int)stream.Length);
+                                var contentType = photo.ContentType;
+#if IOS                         // Workaround https://github.com/dotnet/maui/issues/15562
+                                if (!contentType.Contains('/'))
+                                    contentType = "image/" + contentType;
+#endif
+                                Element.AddAttachment(photo.FileName, contentType, data);
+                            }
+                            EvaluateExpressions();
+                            (GetTemplateChild(AttachmentsListViewName) as CollectionView)?.ScrollTo(Element.Attachments.Last());
+                        }
+                    }
+                    catch (System.Exception ex)
+                    {
+                        Trace.WriteLine("Failed to add attachment: " + ex.Message, "ArcGIS Maps SDK Toolkit");
+                    }
+                }
+                if (result == addAttachment)
+                {
+                    AddAttachmentFromFile();
+                }
+            }
+            else
+                AddAttachmentFromFile();
+        }
+
+        private async void AddAttachmentFromFile()
+        {
+            if (Element is null) return;
+            try
+            {
+                var result = await FilePicker.Default.PickAsync(new());
+                if (result != null)
+                {
+                    Element.AddAttachment(result.FileName, MimeTypeMap.GetMimeType(new FileInfo(result.FileName).Extension), File.ReadAllBytes(result.FullPath));
+                    EvaluateExpressions();
+                    (GetTemplateChild(AttachmentsListViewName) as CollectionView)?.ScrollTo(Element.Attachments.Last());
+                }
+            }
+            catch (System.Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine("Failed to add attachment: " + ex.Message);
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Windows.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Windows.cs
new file mode 100644
index 000000000..6f8d67464
--- /dev/null
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.Windows.cs
@@ -0,0 +1,90 @@
+// /*******************************************************************************
+//  * Copyright 2012-2018 Esri
+//  *
+//  *  Licensed under the Apache License, Version 2.0 (the "License");
+//  *  you may not use this file except in compliance with the License.
+//  *  You may obtain a copy of the License at
+//  *
+//  *  http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  *   Unless required by applicable law or agreed to in writing, software
+//  *   distributed under the License is distributed on an "AS IS" BASIS,
+//  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  *   See the License for the specific language governing permissions and
+//  *   limitations under the License.
+//  ******************************************************************************/
+
+
+#if WPF
+using Esri.ArcGISRuntime.Data;
+using Esri.ArcGISRuntime.Mapping.FeatureForms;
+using Esri.ArcGISRuntime.Toolkit.Internal;
+using Esri.ArcGISRuntime.Toolkit.UI.Controls;
+using Microsoft.Win32;
+using System.ComponentModel;
+using System.IO;
+using System.Windows.Controls.Primitives;
+
+namespace Esri.ArcGISRuntime.Toolkit.Primitives
+{
+    [TemplatePart(Name = "AddAttachmentButton", Type = typeof(ButtonBase))]
+    public partial class AttachmentsFormElementView : Control
+    {
+        private ButtonBase? _addAttachmentButton;
+        private bool _scrollToEnd;
+
+        /// <inheritdoc />
+#if WINDOWS_XAML
+        protected override void OnApplyTemplate()
+#else
+        public override void OnApplyTemplate()
+#endif
+        {
+            base.OnApplyTemplate();
+            if (_addAttachmentButton is not null)
+            {
+                _addAttachmentButton.Click -= AddAttachmentButton_Click;
+            }
+            _addAttachmentButton = GetTemplateChild("AddAttachmentButton") as ButtonBase;
+            if(_addAttachmentButton is not null)
+            {
+                _addAttachmentButton.Click += AddAttachmentButton_Click;
+            }
+            if(GetTemplateChild("ItemsScrollView") is ScrollViewer scrollViewer)
+                scrollViewer.ScrollChanged += ScrollViewer_ScrollChanged;
+        }
+
+        private void ScrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e)
+        {
+            if(_scrollToEnd)
+            {
+                (sender as ScrollViewer)?.ScrollToRightEnd();
+                _scrollToEnd = false;
+            }
+        }
+
+        private void AddAttachmentButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (Element is null || !Element.IsEditable) return;
+            try
+            {
+                OpenFileDialog openFileDialog = new OpenFileDialog();
+                if (openFileDialog.ShowDialog() == true)
+                {
+                    var fileInfo = new FileInfo(openFileDialog.FileName);
+                    if (fileInfo.Exists)
+                    {
+                        _scrollToEnd = true;
+                        Element.AddAttachment(fileInfo.Name, MimeTypeMap.GetMimeType(fileInfo.Extension), File.ReadAllBytes(fileInfo.FullName));
+                        EvaluateExpressions();
+                    }
+                }
+            }
+            catch(System.Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine("Failed to add attachment: " + ex.Message);
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.cs
new file mode 100644
index 000000000..e470a33ce
--- /dev/null
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/AttachmentsFormElementView.cs
@@ -0,0 +1,126 @@
+// /*******************************************************************************
+//  * Copyright 2012-2018 Esri
+//  *
+//  *  Licensed under the Apache License, Version 2.0 (the "License");
+//  *  you may not use this file except in compliance with the License.
+//  *  You may obtain a copy of the License at
+//  *
+//  *  http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  *   Unless required by applicable law or agreed to in writing, software
+//  *   distributed under the License is distributed on an "AS IS" BASIS,
+//  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  *   See the License for the specific language governing permissions and
+//  *   limitations under the License.
+//  ******************************************************************************/
+
+
+#if WPF || MAUI
+using Esri.ArcGISRuntime.Data;
+using Esri.ArcGISRuntime.Mapping.FeatureForms;
+using Esri.ArcGISRuntime.Toolkit.Internal;
+using System.ComponentModel;
+#if WPF
+using Esri.ArcGISRuntime.Toolkit.UI.Controls;
+#elif MAUI
+using Esri.ArcGISRuntime.Toolkit.Maui;
+#endif
+
+
+#if MAUI
+namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives
+#else
+namespace Esri.ArcGISRuntime.Toolkit.Primitives
+#endif
+{
+    /// <summary>
+    /// Displays the list of Attachments in an <see cref="AttachmentsFormElement"/> object.
+    /// </summary>
+    public partial class AttachmentsFormElementView
+    {
+        private WeakEventListener<AttachmentsFormElementView, INotifyPropertyChanged, object?, PropertyChangedEventArgs>? _elementPropertyChangedListener;
+
+        /// <summary>
+        /// Initializes an instance of the <see cref="AttachmentsFormElementView"/> class.
+        /// </summary>
+        public AttachmentsFormElementView()
+        {
+#if MAUI
+            ControlTemplate = DefaultControlTemplate;
+#else
+            DefaultStyleKey = typeof(AttachmentsFormElementView);
+#endif
+        }
+
+        private void EvaluateExpressions()
+        {
+            var parent = FeatureFormView.GetFeatureFormViewParent(this);
+            _ = parent?.EvaluateExpressions(parent?.FeatureForm);
+        }
+
+        /// <summary>
+        /// Gets or sets the AttachmentsFormElement.
+        /// </summary>
+        public AttachmentsFormElement? Element
+        {
+            get { return (AttachmentsFormElement)GetValue(ElementProperty); }
+            set { SetValue(ElementProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Element"/> dependency property.
+        /// </summary>
+#if MAUI
+        public static readonly BindableProperty ElementProperty =
+            BindableProperty.Create(nameof(Element), typeof(AttachmentsFormElement), typeof(AttachmentsFormElementView), null, propertyChanged: (s, oldValue, newValue) => ((AttachmentsFormElementView)s).OnElementPropertyChanged(oldValue as AttachmentsFormElement, newValue as AttachmentsFormElement));
+#else
+        public static readonly DependencyProperty ElementProperty =
+            DependencyProperty.Register(nameof(Element), typeof(AttachmentsFormElement), typeof(AttachmentsFormElementView), new PropertyMetadata(null, (s, e) => ((AttachmentsFormElementView)s).OnElementPropertyChanged(e.OldValue as AttachmentsFormElement, e.NewValue as AttachmentsFormElement)));
+#endif
+
+        private async void OnElementPropertyChanged(AttachmentsFormElement? oldValue, AttachmentsFormElement? newValue)
+        {
+            if (oldValue is INotifyPropertyChanged inpcOld)
+            {
+                _elementPropertyChangedListener?.Detach();
+                _elementPropertyChangedListener = null;
+            }
+            if (newValue is INotifyPropertyChanged inpcNew)
+            {
+                _elementPropertyChangedListener = new WeakEventListener<AttachmentsFormElementView, INotifyPropertyChanged, object?, PropertyChangedEventArgs>(this, inpcNew)
+                {
+                    OnEventAction = static (instance, source, eventArgs) => instance.Element_PropertyChanged(source, eventArgs),
+                    OnDetachAction = static (instance, source, weakEventListener) => source.PropertyChanged -= weakEventListener.OnEvent,
+                };
+                inpcNew.PropertyChanged += _elementPropertyChangedListener.OnEvent;
+            }
+            UpdateVisibility();
+            if (newValue != null)
+            {
+                try
+                {
+                    await newValue.FetchAttachmentsAsync();
+                }
+                catch (System.Exception) { }
+            }
+        }
+
+        private void Element_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(AttachmentsFormElement.IsVisible))
+            {
+                this.Dispatch(UpdateVisibility);
+            }
+        }
+
+        private void UpdateVisibility()
+        {
+#if MAUI
+            this.IsVisible = Element?.IsVisible == true;
+#else
+            this.Visibility = Element?.IsVisible == true ? Visibility.Visible : Visibility.Collapsed;
+#endif
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs
index 0cd59f942..cf73ab2c6 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Maui.cs
@@ -22,6 +22,30 @@
 
 namespace Esri.ArcGISRuntime.Toolkit.Maui
 {
+    /// <summary>
+    /// A visual feature editor form controlled by a <see cref="FeatureForm"/> definition.
+    /// </summary>
+    /// <remarks>
+    /// <para>To use the camera to capture images for attachments, the corerct permissions must be set on your application.</para>
+    /// <para><b>Android:</b><br/>Add the following to Android's AndroidManifest.xml:</para>
+    /// <code>
+    /// &lt;uses-permission android:name="android.permission.CAMERA" />
+    /// &lt;queries>
+    ///     &lt;intent>
+    ///         &lt;action android:name="android.media.action.IMAGE_CAPTURE" />
+    ///     &lt;/intent>
+    /// &lt;/queries>
+    /// </code>
+    /// <para><b>iOS:</b><br/>Add the following to iOS's Info.plist:</para>
+    /// <code>
+    /// &lt;key>NSCameraUsageDescription&lt;/key>
+    /// &lt;string>Adding attachments&lt;/string>
+    /// </code>
+    /// <para>If these settings are not added, only file browsing will be enabled.</para>
+    /// </remarks>
+    /// <seealso href="https://learn.microsoft.com/en-us/dotnet/maui/platform-integration/device-media/picker?#get-started">MAUI: Media picker for photos and videos</seealso>
+    /// <seealso cref="Esri.ArcGISRuntime.Data.ArcGISFeatureTable.FeatureFormDefinition"/>
+    /// <seealso cref="Esri.ArcGISRuntime.Mapping.FeatureLayer.FeatureFormDefinition"/>
     public partial class FeatureFormView : TemplatedView
     {
         private static readonly ControlTemplate DefaultControlTemplate;
@@ -64,6 +88,7 @@ static FeatureFormView()
 
         [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm.Title), "Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm", "Esri.ArcGISRuntime")]
         [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm.Elements), "Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm", "Esri.ArcGISRuntime")]
+        [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm.DefaultAttachmentsElement), "Esri.ArcGISRuntime.Mapping.FeatureForms.FeatureForm", "Esri.ArcGISRuntime")]
         private static object BuildDefaultTemplate()
         {
             Grid root = new Grid();
@@ -79,12 +104,19 @@ private static object BuildDefaultTemplate()
             scrollView.Padding = new Thickness(0, 0, 10, 0);
 #endif
             scrollView.SetBinding(ScrollView.VerticalScrollBarVisibilityProperty, new Binding(nameof(VerticalScrollBarVisibility), source: RelativeBindingSource.TemplatedParent));
+            var scrollableContent = new VerticalStackLayout();
+            scrollView.Content = scrollableContent;
             Grid.SetRow(scrollView, 1);
             root.Add(scrollView);
-            VerticalStackLayout itemsView = new VerticalStackLayout();            
+            VerticalStackLayout itemsView = new VerticalStackLayout();
             BindableLayout.SetItemTemplateSelector(itemsView, new FeatureFormElementTemplateSelector());
             itemsView.SetBinding(BindableLayout.ItemsSourceProperty, new Binding("FeatureForm.Elements", source: RelativeBindingSource.TemplatedParent));
-            scrollView.Content = itemsView;
+            scrollableContent.Add(itemsView);
+
+            AttachmentsFormElementView attachmentsView = new AttachmentsFormElementView();
+            attachmentsView.SetBinding(AttachmentsFormElementView.ElementProperty, new Binding("FeatureForm.DefaultAttachmentsElement", source: RelativeBindingSource.TemplatedParent));
+            scrollableContent.Add(attachmentsView);
+
             INameScope nameScope = new NameScope();
             NameScope.SetNameScope(root, nameScope);
             nameScope.RegisterName(FeatureFormContentScrollViewerName, scrollView);
@@ -125,6 +157,18 @@ internal static Style GetStyle(string resourceKey, Style defaultStyle)
         internal static Style GetFeatureFormTitleStyle() => GetStyle(FeatureFormTitleStyleName, DefaultFeatureFormTitleStyle);
 
         internal static Style GetFeatureFormCaptionStyle() => GetStyle(FeatureFormCaptionStyleName, DefaultFeatureFormCaptionStyle);
+
+        internal static FeatureFormView? GetFeatureFormViewParent(Element child) => GetParent<FeatureFormView>(child);
+
+        private static T? GetParent<T>(Element child) where T : Element
+        {
+            var parent = child?.Parent;
+            while (parent is not null && parent is not T page)
+            {
+                parent = parent.Parent;
+            }
+            return parent as T;
+        }
     }
 }
 #endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Windows.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Windows.cs
index 61a0cdb8b..50efd09c3 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Windows.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.Windows.cs
@@ -22,6 +22,11 @@
 
 namespace Esri.ArcGISRuntime.Toolkit.UI.Controls
 {
+    /// <summary>
+    /// A visual feature editor form controlled by a <see cref="FeatureForm"/> definition.
+    /// </summary>
+    /// <seealso cref="Esri.ArcGISRuntime.Data.ArcGISFeatureTable.FeatureFormDefinition"/>
+    /// <seealso cref="Esri.ArcGISRuntime.Mapping.FeatureLayer.FeatureFormDefinition"/>
     [TemplatePart(Name = FeatureFormContentScrollViewerName, Type = typeof(ScrollViewer))]
     [TemplatePart(Name = ItemsViewName, Type = typeof(ItemsControl))]
     public partial class FeatureFormView : Control
@@ -46,6 +51,16 @@ public bool IsValid
             get { return (bool)GetValue(IsValidProperty); }
             private set { SetValue(IsValidPropertyKey, value); }
         }
+
+        internal static UI.Controls.FeatureFormView? GetFeatureFormViewParent(DependencyObject child)
+        {
+            var parent = VisualTreeHelper.GetParent(child);
+            while (parent is not null && parent is not UI.Controls.FeatureFormView view)
+            {
+                parent = VisualTreeHelper.GetParent(parent);
+            }
+            return parent as UI.Controls.FeatureFormView;
+        }
     }
 }
 #endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs
index c9595593c..02c031d0d 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FeatureFormView.cs
@@ -35,11 +35,6 @@ namespace Esri.ArcGISRuntime.Toolkit.Maui
 namespace Esri.ArcGISRuntime.Toolkit.UI.Controls
 #endif
 {
-    /// <summary>
-    /// A visual feature editor form controlled by a <see cref="FeatureForm"/> definition.
-    /// </summary>
-    /// <seealso cref="Esri.ArcGISRuntime.Data.ArcGISFeatureTable.FeatureFormDefinition"/>
-    /// <seealso cref="Esri.ArcGISRuntime.Mapping.FeatureLayer.FeatureFormDefinition"/>
     public partial class FeatureFormView
     {
         private WeakEventListener<FeatureFormView, INotifyPropertyChanged, object?, PropertyChangedEventArgs>? _elementPropertyChangedListener;
@@ -119,10 +114,11 @@ private void InvalidateForm()
 
         private static object pendingExpressionsLock = new object();
         private static List<FeatureForm> pendingExpressions = new List<FeatureForm>();
+        private bool _isDiscarding = false;
 
-        internal static async Task EvaluateExpressions(FeatureForm? form)
+        internal async Task EvaluateExpressions(FeatureForm? form)
         {
-            if (form is null)
+            if (form is null || _isDiscarding)
                 return;
             // Don't evaluate expressions if we're already in the process of evaluating
             // If that's the case, the value changed event triggering this code was
@@ -162,17 +158,15 @@ public FeatureForm? FeatureForm
         /// </summary>
 #if MAUI
         public static readonly BindableProperty FeatureFormProperty =
-            BindableProperty.Create(nameof(FeatureForm), typeof(FeatureForm), typeof(FeatureFormView), null, propertyChanged: (s, oldValue, newValue) => ((FeatureFormView)s).OnFeatureFormPropertyChanged(oldValue, newValue));
+            BindableProperty.Create(nameof(FeatureForm), typeof(FeatureForm), typeof(FeatureFormView), null, propertyChanged: (s, oldValue, newValue) => ((FeatureFormView)s).OnFeatureFormPropertyChanged(oldValue as FeatureForm, newValue as FeatureForm));
 #else
         public static readonly DependencyProperty FeatureFormProperty =
             DependencyProperty.Register(nameof(FeatureForm), typeof(FeatureForm), typeof(FeatureFormView),
-                new PropertyMetadata(null, (s, e) => ((FeatureFormView)s).OnFeatureFormPropertyChanged(e.OldValue, e.NewValue)));
+                new PropertyMetadata(null, (s, e) => ((FeatureFormView)s).OnFeatureFormPropertyChanged(e.OldValue as FeatureForm, e.NewValue as FeatureForm)));
 #endif
 
-        private void OnFeatureFormPropertyChanged(object oldValue, object newValue)
+        private void OnFeatureFormPropertyChanged(FeatureForm? oldForm, FeatureForm? newForm)
         {
-            var oldForm = oldValue as FeatureForm;
-            var newForm = newValue as FeatureForm;
             if (newForm is not null)
             {
                 InvalidateForm();
@@ -184,12 +178,12 @@ private void OnFeatureFormPropertyChanged(object oldValue, object newValue)
             (GetTemplateChild(FeatureFormContentScrollViewerName) as ScrollViewer)?.ScrollToHome();
 #endif
 
-            if (oldValue is INotifyPropertyChanged inpcOld)
+            if (oldForm is INotifyPropertyChanged inpcOld)
             {
                 _elementPropertyChangedListener?.Detach();
                 _elementPropertyChangedListener = null;
             }
-            if (newValue is INotifyPropertyChanged inpcNew)
+            if (newForm is INotifyPropertyChanged inpcNew)
             {
                 _elementPropertyChangedListener = new WeakEventListener<FeatureFormView, INotifyPropertyChanged, object?, PropertyChangedEventArgs>(this, inpcNew)
                 {
@@ -214,6 +208,37 @@ private void UpdateIsValidProperty()
             IsValid = FeatureForm?.ValidationErrors?.Any() != true;
         }
 
+        /// <summary>
+        /// Discards edits to all elements, refreshes any pending expressions and restores attachment list.
+        /// </summary>
+        /// <seealso cref="FeatureForm.DiscardEdits"/>
+        /// <seealso cref="FeatureForm.EvaluateExpressionsAsync"/>
+        public async Task DiscardEditsAsync()
+        {
+            var form = FeatureForm;
+            if (form is not null)
+            {
+                _isDiscarding = true;
+                form.DiscardEdits();
+                _isDiscarding = false;
+                if (form.DefaultAttachmentsElement is not null)
+                    await form.DefaultAttachmentsElement.FetchAttachmentsAsync();
+                await EvaluateExpressions(form).ConfigureAwait(false);
+            }
+        }
+
+        /// <summary>
+        ///  Saves edits made using the <see cref="FeatureForm"/> to the database.
+        /// </summary>
+        /// <seealso cref="FeatureForm.FinishEditingAsync"/>
+        public async Task FinishEditingAsync()
+        {
+            if (FeatureForm is not null)
+            {
+                await FeatureForm.FinishEditingAsync().ConfigureAwait(false);
+            }
+        }
+
         /// <summary>
         /// Gets or sets the vertical scrollbar visibility of the scrollviewer below the title.
         /// </summary>
@@ -279,6 +304,7 @@ public ScrollBarVisibility VerticalScrollBarVisibility
                 uint min = 0;
                 if (element.Input is TextAreaFormInput area) { max = area.MaxLength; min = area.MinLength; }
                 else if (element.Input is TextBoxFormInput tb) { max = tb.MaxLength; min = tb.MinLength; }
+                else if (element.Input is BarcodeScannerFormInput bar) { max = bar.MaxLength; min = bar.MinLength; }
                 if (max > 0 && min > 0)
                     return string.Format(Properties.Resources.GetString("FeatureFormOutsideLengthRange")!, min, max);
                 if (max > 0)
@@ -332,6 +358,102 @@ public ScrollBarVisibility VerticalScrollBarVisibility
                 return Properties.Resources.GetString("FeatureFormFieldIsRequired");
             return exception.Message;
         }
+
+        /// <summary>
+        /// Raised when a feature form attachment is clicked
+        /// </summary>
+        /// <remarks>
+        /// <para>By default, when an attachment is clicked, the default application for the file type (if any) is launched. To override this,
+        /// listen to this event, set the <see cref="FormAttachmentClickedEventArgs.Handled"/> property to <c>true</c> and perform
+        /// your own logic. </para>
+        /// <example>
+        /// Example: Use the .NET MAUI share API for the attachment:
+        /// <code language="csharp">
+        /// private async void FormAttachmentClicked(object sender, FormAttachmentClickedEventArgs e)
+        /// {
+        ///     e.Handled = true; // Prevent default launch action
+        ///     await Share.Default.RequestAsync(new ShareFileRequest(new ReadOnlyFile(e.FilePath!, e.ContentType)));
+        /// }
+        /// </code>
+        /// </example>
+        /// </remarks>
+        public event EventHandler<FormAttachmentClickedEventArgs>? FormAttachmentClicked;
+
+        internal bool OnFormAttachmentClicked(FormAttachment attachment)
+        {
+            var handler = FormAttachmentClicked;
+            if (handler is not null)
+            {
+                var args = new FormAttachmentClickedEventArgs(attachment);
+                FormAttachmentClicked?.Invoke(this, args);
+                return args.Handled;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Raised when the Barcode Icon in a barcode element is clicked.
+        /// </summary>
+        /// <remarks>
+        /// <para>Set the <see cref="BarcodeButtonClickedEventArgs.Handled"/> property to <c>true</c> to prevent
+        /// any default code and perform your own logic.</para>
+        /// </remarks>
+        public event EventHandler<BarcodeButtonClickedEventArgs>? BarcodeButtonClicked;
+
+        internal bool OnBarcodeButtonClicked(FieldFormElement element)
+        {
+            var handler = BarcodeButtonClicked;
+            if (handler is not null)
+            {
+                var args = new BarcodeButtonClickedEventArgs(element);
+                
+                handler.Invoke(this, args);
+                return args.Handled;
+            }
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Event argument for the <see cref="FeatureFormView.FormAttachmentClicked"/> event.
+    /// </summary>
+    public class FormAttachmentClickedEventArgs : EventArgs
+    {
+        internal FormAttachmentClickedEventArgs(FormAttachment attachment)
+        {
+            Attachment = attachment;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the event handler has handled the event and the default action should be prevented.
+        /// </summary>
+        public bool Handled { get; set; }
+
+        /// <summary>
+        /// Gets the attachment that was clicked.
+        /// </summary>
+        public FormAttachment Attachment { get; }
+    }
+
+    /// <summary>
+    /// Event argument for the <see cref="FeatureFormView.BarcodeButtonClicked"/> event.
+    /// </summary>
+    public class BarcodeButtonClickedEventArgs : EventArgs
+    {
+        internal BarcodeButtonClickedEventArgs(FieldFormElement element)
+        {
+            FormElement = element;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the event handler has handled the event and the default action should be prevented.
+        /// </summary>
+        public bool Handled { get; set; }
+
+        /// <summary>
+        /// Gets the element that was clicked.
+        /// </summary>
+        public FieldFormElement FormElement { get; }
     }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs
index e87b06c7d..6f3572d37 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.Maui.cs
@@ -32,6 +32,7 @@ public partial class FieldFormElementView : TemplatedView
         private static readonly DataTemplate DefaultRadioButtonsFormInputTemplate;
         private static readonly DataTemplate DefaultTextAreaFormInputTemplate;
         private static readonly DataTemplate DefaultTextBoxFormInputTemplate;
+        private static readonly DataTemplate DefaultBarcodeScannerFormInputTemplate;
 
 
         static FieldFormElementView()
@@ -43,6 +44,7 @@ static FieldFormElementView()
             DefaultRadioButtonsFormInputTemplate = new DataTemplate(BuildDefaultRadioButtonsFormInputTemplate);
             DefaultTextAreaFormInputTemplate = new DataTemplate(BuildDefaultTextAreaFormInputTemplate);
             DefaultTextBoxFormInputTemplate = new DataTemplate(BuildDefaultTextBoxFormInputTemplate);
+            DefaultBarcodeScannerFormInputTemplate = new DataTemplate(BuildDefaultBarcodeScannerFormInputTemplate);
         }
 
         private static object BuildDefaultComboBoxFormInputTemplate()
@@ -87,6 +89,13 @@ private static object BuildDefaultTextBoxFormInputTemplate()
             return input;
         }
 
+        private static object BuildDefaultBarcodeScannerFormInputTemplate()
+        {
+            var input = new TextFormInputView();
+            input.SetBinding(TextFormInputView.ElementProperty, Binding.SelfPath);
+            return input;
+        }
+
         [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Label), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")]
         [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement.Description), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormElement", "Esri.ArcGISRuntime")]
         private static object BuildDefaultTemplate()
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.cs
index fd960a8ec..9225f3d7a 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldFormElementView.cs
@@ -54,6 +54,7 @@ public FieldFormElementView()
             RadioButtonsFormInputTemplate = DefaultRadioButtonsFormInputTemplate;
             TextAreaFormInputTemplate = DefaultTextAreaFormInputTemplate;
             TextBoxFormInputTemplate = DefaultTextBoxFormInputTemplate;
+            BarcodeScannerFormInputTemplate = DefaultBarcodeScannerFormInputTemplate;
 #else
             DefaultStyleKey = typeof(FieldFormElementView);
 #endif
@@ -120,7 +121,7 @@ private void OnElementPropertyChanged(FieldFormElement? oldValue, FieldFormEleme
 
         private void OnValuePropertyChanged()
         {
-            _ = FeatureFormView.EvaluateExpressions(FeatureForm);
+            _ = FeatureFormView.GetFeatureFormViewParent(this)?.EvaluateExpressions(FeatureForm);
         }
         
         private void FieldFormElement_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
@@ -148,7 +149,8 @@ Element.Input is SwitchFormInput ||
                 Element.Input is DateTimePickerFormInput ||
                 Element.Input is RadioButtonsFormInput ||
                 Element.Input is TextAreaFormInput ||
-                Element.Input is TextBoxFormInput);
+                Element.Input is TextBoxFormInput ||
+                Element.Input is BarcodeScannerFormInput);
 #if MAUI
             this.IsVisible = isVisible;
 #else
@@ -291,6 +293,25 @@ public DataTemplate? TextBoxFormInputTemplate
 #else
             DependencyProperty.Register(nameof(TextBoxFormInputTemplate), typeof(DataTemplate), typeof(FieldFormElementView), new PropertyMetadata(null));
 #endif
+
+        /// <summary>
+        /// Gets or sets the template for the <see cref="BarcodeScannerFormInputTemplate"/> element.
+        /// </summary>
+        public DataTemplate? BarcodeScannerFormInputTemplate
+        {
+            get { return (DataTemplate)GetValue(BarcodeScannerFormInputTemplateProperty); }
+            set { SetValue(BarcodeScannerFormInputTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="BarcodeScannerFormInputTemplate"/> dependency property.
+        /// </summary>
+        public static readonly DependencyProperty BarcodeScannerFormInputTemplateProperty =
+#if MAUI
+            BindableProperty.Create(nameof(BarcodeScannerFormInputTemplate), typeof(DataTemplate), typeof(FieldFormElementView), null);
+#else
+            DependencyProperty.Register(nameof(BarcodeScannerFormInputTemplate), typeof(DataTemplate), typeof(FieldFormElementView), new PropertyMetadata(null));
+#endif
     }
 }
 #endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldTemplateSelector.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldTemplateSelector.cs
index 55799131a..fd9faa133 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldTemplateSelector.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FieldTemplateSelector.cs
@@ -47,10 +47,19 @@ public FieldTemplateSelector(FieldFormElementView parent)
                     RadioButtonsFormInput => _parent.RadioButtonsFormInputTemplate,
                     TextAreaFormInput => _parent.TextAreaFormInputTemplate,
                     TextBoxFormInput => _parent.TextBoxFormInputTemplate,
+                    BarcodeScannerFormInput => _parent.BarcodeScannerFormInputTemplate,
+#if MAUI
+                    _ => null
+#else
                     _ => base.SelectTemplate(item, container)
+#endif
                 };
             }
+#if MAUI
+            return null;
+#else
             return base.SelectTemplate(item, container);
+#endif
         }
     }
 }
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs
new file mode 100644
index 000000000..133ed2da7
--- /dev/null
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Maui.cs
@@ -0,0 +1,288 @@
+// /*******************************************************************************
+//  * Copyright 2012-2018 Esri
+//  *
+//  *  Licensed under the Apache License, Version 2.0 (the "License");
+//  *  you may not use this file except in compliance with the License.
+//  *  You may obtain a copy of the License at
+//  *
+//  *  http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  *   Unless required by applicable law or agreed to in writing, software
+//  *   distributed under the License is distributed on an "AS IS" BASIS,
+//  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  *   See the License for the specific language governing permissions and
+//  *   limitations under the License.
+//  ******************************************************************************/
+
+
+#if MAUI
+using Microsoft.Maui.Controls.Internals;
+using Esri.ArcGISRuntime.Data;
+using Esri.ArcGISRuntime.Mapping.FeatureForms;
+using Esri.ArcGISRuntime.Toolkit.Internal;
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.Maui.Controls.Shapes;
+using System.Runtime.Versioning;
+
+namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives
+{
+    public partial class FormAttachmentView : TemplatedView
+    {
+        private static readonly ControlTemplate DefaultControlTemplate;
+
+        static FormAttachmentView()
+        {
+            DefaultControlTemplate = new ControlTemplate(BuildDefaultTemplate);
+        }
+
+        [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormAttachment.Name), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormAttachment", "Esri.ArcGISRuntime")]
+        [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FormAttachment.Size), "Esri.ArcGISRuntime.Mapping.FeatureForms.FormAttachment", "Esri.ArcGISRuntime")]
+        private static object BuildDefaultTemplate()
+        {
+            Border background = new Border() { BackgroundColor = Color.FromRgba(0, 0, 0, 0x30), StrokeShape = new RoundRectangle() { CornerRadius = 4 }, StrokeThickness = 0 };
+            var root = new Grid();
+            background.Content = root;
+            Image image = new Image();
+            root.Children.Add(image);
+            root.SetBinding(VerticalStackLayout.IsVisibleProperty, nameof(FormElement.IsVisible));
+            Border nameBackground = new Border() { BackgroundColor = Colors.Transparent, Padding = new Thickness(2), VerticalOptions = LayoutOptions.End, StrokeThickness = 0 };
+            var nameLabel = new Label() { HorizontalOptions = LayoutOptions.Center, FontSize = 10, MaxLines = 1, LineBreakMode = LineBreakMode.TailTruncation };
+            nameBackground.Content = nameLabel;
+            nameLabel.SetBinding(Label.TextProperty, new Binding("Attachment.Name", source: RelativeBindingSource.TemplatedParent));
+            root.Children.Add(nameBackground);
+            var sizeLabel = new Label() { VerticalOptions = LayoutOptions.Start, HorizontalOptions = LayoutOptions.Center, FontSize = 10, MaxLines = 1 };
+            sizeLabel.SetBinding(Label.TextProperty, new Binding("Attachment.Size", source: RelativeBindingSource.TemplatedParent, converter: new FileSizeConverter()));
+            root.Children.Add(sizeLabel);
+            var downloadIcon = new Label() { VerticalOptions = LayoutOptions.Start, HorizontalOptions = LayoutOptions.End, FontFamily = "calcite-ui-icons-24", Text = "\uE0CB", Margin = new Thickness(2) };
+            root.Children.Add(downloadIcon);
+            var downloadIndicator = new ActivityIndicator() { HorizontalOptions = LayoutOptions.Center, VerticalOptions = LayoutOptions.Center, IsRunning = false };
+            root.Children.Add(downloadIndicator);
+
+            INameScope nameScope = new NameScope();
+            NameScope.SetNameScope(background, nameScope);
+            nameScope.RegisterName("ThumbnailImage", image);
+            nameScope.RegisterName("AttachmentName", nameLabel);
+            nameScope.RegisterName("FileSizeText", sizeLabel);
+            nameScope.RegisterName("DownloadIcon", downloadIcon);
+            nameScope.RegisterName("NameBackground", nameBackground);
+            nameScope.RegisterName("DownloadIndicator", downloadIndicator);
+            return background;
+        }
+
+        [SupportedOSPlatform("windows")]
+        [SupportedOSPlatform("maccatalyst")]
+        private void ConfigureFlyout()
+        {
+            MenuFlyout flyout = new MenuFlyout();
+            flyout.Add(new MenuFlyoutItem()
+            {
+                Text = Properties.Resources.GetString("FeatureFormRemoveAttachmentMenuItem"),
+                IconImageSource = new FontImageSource { Glyph = "\uE2D0", FontFamily = "calcite-ui-icons-24", Size = 32, Color = Colors.Gray }
+            });
+            flyout.Add(new MenuFlyoutItem()
+            {
+                Text = Properties.Resources.GetString("FeatureFormRenameAttachmentMenuItem"),
+                IconImageSource = new FontImageSource { Glyph = "\uE209", FontFamily = "calcite-ui-icons-24", Size = 32, Color = Colors.Gray }
+            });
+
+            ((MenuFlyoutItem)flyout[0]).Clicked += (s, e) => DeleteAttachment();
+
+            ((MenuFlyoutItem)flyout[1]).Clicked += async (s, e) =>
+            {
+                if (Attachment is not null && Element is not null && GetPage() is Page page)
+                {
+                    try
+                    {
+                        string result = await page.DisplayPromptAsync(Properties.Resources.GetString("FeatureFormRenameAttachmentWindowTitle"), "", initialValue: Attachment.Name);
+                        if (!string.IsNullOrWhiteSpace(result))
+                        {
+                            RenameAttachment(result.Trim());
+                        }
+                    }
+                    catch { }
+                }
+            };
+            FlyoutBase.SetContextFlyout(this, flyout);
+        }
+
+        /// <inheritdoc />
+        protected override void OnSizeAllocated(double width, double height)
+        {
+            base.OnSizeAllocated(width, height);
+            if (Attachment != null && (Attachment.LoadStatus == LoadStatus.Loaded && Attachment.Type == FormAttachmentType.Image ||
+               (GetTemplateChild("ThumbnailImage") as Image)?.Source is null))
+            {
+                UpdateThumbnail();
+            }
+        }
+
+        private void TapGestureRecognizer_Tapped(object? sender, TappedEventArgs e)
+        {
+            OnAttachmentClicked();
+        }
+
+        /// <inheritdoc />
+        protected override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            UpdateLoadedState(true);
+            UpdateThumbnail();
+        }
+
+        private void UpdateLoadedState(bool useTransitions)
+        {
+            VisualElement? sizeLabel = GetTemplateChild("FileSizeText") as VisualElement;
+            Label? nameLabel = GetTemplateChild("AttachmentName") as Label;
+            VisualElement? downloadIcon = GetTemplateChild("DownloadIcon") as VisualElement;
+            VisualElement? nameBackground = GetTemplateChild("NameBackground") as VisualElement;
+            ActivityIndicator? downloadIndicator = GetTemplateChild("DownloadIndicator") as ActivityIndicator;
+            
+
+            if (Attachment?.LoadStatus == LoadStatus.Loading)
+            {
+                if(downloadIcon != null) downloadIcon.IsVisible = false;
+                if (downloadIndicator != null) downloadIndicator.IsRunning = true;
+            }
+            else if (Attachment?.LoadStatus == LoadStatus.Loaded)
+            {
+                UpdateThumbnail();
+                if (sizeLabel != null) sizeLabel.IsVisible = false;
+                if (downloadIcon != null) downloadIcon.IsVisible = false;
+                if (nameLabel != null) nameLabel.TextColor = Colors.White;
+                if (nameBackground != null) nameBackground.BackgroundColor = Color.FromRgba(0, 0, 0, 0x30);
+                if (downloadIndicator != null) downloadIndicator.IsRunning = false;
+            }
+            else if (Attachment?.LoadStatus == LoadStatus.FailedToLoad)
+            {
+                UpdateThumbnail();
+                if (downloadIcon != null) downloadIcon.IsVisible = true;
+                if (downloadIndicator != null) downloadIndicator.IsRunning = false;
+            }
+            else
+            {
+                if (sizeLabel != null) sizeLabel.IsVisible = true;
+                if (downloadIcon != null) downloadIcon.IsVisible = true;
+                if (nameLabel != null) nameLabel.TextColor = null;
+                if (nameBackground != null) nameBackground.BackgroundColor = Colors.Transparent;
+                if (downloadIndicator != null) downloadIndicator.IsRunning = false;
+            }
+        }
+
+        private Page? GetPage()
+        {
+            var parent = this.Parent;
+            while (parent is not null && parent is not Page page)
+            {
+                parent = parent.Parent;
+            }
+            return parent as Page;
+        }
+
+        private Size _thumbnailSize = default; // The size of the generated thumbnail - prevents regenerating the same thumbnail multiple times
+
+        private async void UpdateThumbnail()
+        {
+            var image = GetTemplateChild("ThumbnailImage") as Image;
+            if (image is null || this.Width <= 0 || this.Width <= 0) return;
+            if (Attachment is null)
+            {
+                image.Source = null;
+                return;
+            }
+            else if (Attachment.LoadStatus == LoadStatus.Loaded && Attachment.Type == FormAttachmentType.Image) // Attachment.LoadStatus == LoadStatus.Loaded)
+            {
+                try
+                {
+                    if (_thumbnailSize.Width == this.Width || _thumbnailSize.Height == this.Height)
+                        return;
+                    _thumbnailSize = new Size(this.Width, this.Height);
+                    var thumb = await Attachment.CreateThumbnailAsync((int)(this.Width), (int)(this.Height));
+                    image.Source = await thumb.ToImageSourceAsync();
+                    image.Aspect = Aspect.AspectFill;
+                    return;
+                }
+                catch { } // Fallback to default icon
+                finally
+                {
+                    _thumbnailSize = default;
+                }
+            }
+            // Fallback to file icon
+            string glyph = Attachment.Type switch
+            {
+                FormAttachmentType.Image => "\uE169",
+                FormAttachmentType.Audio => "\uE109",
+                FormAttachmentType.Document => "\uE02D",
+                FormAttachmentType.Video => "\uE2F1",
+                _ => "\uE10E"
+            };
+            if (Attachment.LoadStatus == LoadStatus.FailedToLoad)
+                glyph = "\uE0EC";
+            image.Source = new FontImageSource
+            {
+                Glyph = glyph,
+                FontFamily = "calcite-ui-icons-24",
+                Size = 32,
+                Color = (Attachment.LoadStatus == LoadStatus.FailedToLoad) ? Colors.Red : IconColor
+            };
+            image.Aspect = Aspect.Center;
+        }
+
+        private async Task<bool> DisplayAttachmentActionSheet()
+        {
+            if (Attachment is null) return false;
+            var page = GetPage();
+            if (page is null) return false;
+
+            string delete = Properties.Resources.GetString("FeatureFormRemoveAttachmentMenuItem")!;
+            string rename = Properties.Resources.GetString("FeatureFormRenameAttachmentMenuItem")!;
+            string open = Properties.Resources.GetString("FeatureFormOpenAttachmentMenuItem")!;
+            var result = await page.DisplayActionSheet(Attachment.Name, null, null, delete, rename, open);
+            if (result == delete)
+            {
+                DeleteAttachment();
+            }
+            else if(result == rename)
+            {
+                try
+                {
+                    string newName = await page.DisplayPromptAsync(Properties.Resources.GetString("FeatureFormRenameAttachmentWindowTitle"), "", initialValue: Attachment.Name);
+                    if (!string.IsNullOrWhiteSpace(newName))
+                    {
+                        RenameAttachment(newName.Trim());
+                    }
+                }
+                catch { }
+            }
+            else if (result == open)
+            {
+                return false; // Falls back to default action
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Gets or sets the icon color.
+        /// </summary>
+        public Color? IconColor
+        {
+            get { return (Color)GetValue(IconColorProperty); }
+            set { SetValue(IconColorProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="IconColor"/> dependency property.
+        /// </summary>
+        public static readonly BindableProperty IconColorProperty = BindableProperty.Create(nameof(IconColor), typeof(Color), typeof(FormAttachmentView), Colors.Black, 
+            propertyChanged: (s, oldValue, newValue) => ((FormAttachmentView)s).OnColorPropertyChanged());
+
+        private void OnColorPropertyChanged()
+        {
+            if (Attachment is not null && (Attachment.LoadStatus != LoadStatus.Loaded || Attachment.Type != FormAttachmentType.Image))
+                UpdateThumbnail();
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Windows.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Windows.cs
new file mode 100644
index 000000000..51df8c597
--- /dev/null
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.Windows.cs
@@ -0,0 +1,222 @@
+// /*******************************************************************************
+//  * Copyright 2012-2018 Esri
+//  *
+//  *  Licensed under the Apache License, Version 2.0 (the "License");
+//  *  you may not use this file except in compliance with the License.
+//  *  You may obtain a copy of the License at
+//  *
+//  *  http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  *   Unless required by applicable law or agreed to in writing, software
+//  *   distributed under the License is distributed on an "AS IS" BASIS,
+//  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  *   See the License for the specific language governing permissions and
+//  *   limitations under the License.
+//  ******************************************************************************/
+
+
+#if WPF
+using Esri.ArcGISRuntime.Data;
+using Esri.ArcGISRuntime.Mapping.FeatureForms;
+using Esri.ArcGISRuntime.Toolkit.Internal;
+using Esri.ArcGISRuntime.Toolkit.UI.Controls;
+using Esri.ArcGISRuntime.UI;
+using Microsoft.Win32;
+using System.ComponentModel;
+using System.IO;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace Esri.ArcGISRuntime.Toolkit.Primitives
+{
+    public partial class FormAttachmentView : ButtonBase
+    {
+        /// <inheritdoc />
+#if WINDOWS_XAML
+        protected override void OnApplyTemplate()
+#else
+        public override void OnApplyTemplate()
+#endif
+        {
+            base.OnApplyTemplate();
+            UpdateLoadedState(true);
+            UpdateThumbnail();
+        }
+
+        private void UpdateLoadedState(bool useTransitions)
+        {
+            if (Attachment?.LoadStatus == LoadStatus.Loading)
+                VisualStateManager.GoToState(this, "Loading", useTransitions);
+            else if (Attachment?.LoadStatus == LoadStatus.Loaded)
+            {
+                UpdateThumbnail();
+                VisualStateManager.GoToState(this, "Loaded", useTransitions);
+            }
+            else
+                VisualStateManager.GoToState(this, "NotLoaded", useTransitions);
+        }
+
+        /// <inheritdoc/>
+        protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+        {
+            base.OnRenderSizeChanged(sizeInfo);
+
+            if (Attachment != null && (Attachment.LoadStatus == LoadStatus.Loaded && Attachment.Type == FormAttachmentType.Image || 
+                (GetTemplateChild("ThumbnailImage") as Image)?.Source is null))
+            {
+                UpdateThumbnail();
+            }
+        }
+
+        private void OnAttachmentContextMenu()
+        {
+            ContextMenu? contextMenu = new ContextMenu();
+            contextMenu.Items.Add(new MenuItem()
+            {
+                Header = Properties.Resources.GetString("FeatureFormRemoveAttachmentMenuItem"),
+                Icon = new TextBlock() { Text = "\uE74D", HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, FontFamily = new FontFamily("Segoe MDL2 Assets") }
+            });
+            contextMenu.Items.Add(new MenuItem()
+            {
+                Header = Properties.Resources.GetString("FeatureFormRenameAttachmentMenuItem"),
+                Icon = new TextBlock() { Text = "\uE70F", HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center, FontFamily = new FontFamily("Segoe MDL2 Assets") }
+            });
+            
+            ((MenuItem)contextMenu.Items[0]).Click += (s, e) =>
+            {
+                DeleteAttachment();
+            };
+            ((MenuItem)contextMenu.Items[1]).Click += (s, e) =>
+            {
+                if (Attachment is not null && Element is not null)
+                {
+                    Window renameDialog = new Window()
+                    {
+                        SizeToContent = SizeToContent.Height,
+                        WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                        Owner = Window.GetWindow(this),
+                        WindowStyle = WindowStyle.ToolWindow, Width = 250,
+                        Title = Properties.Resources.GetString("FeatureFormRenameAttachmentWindowTitle")
+                    };
+                    StackPanel panel = new StackPanel() { Margin = new Thickness(10) };
+                    TextBox textBox = new TextBox() { Text = Attachment.Name };
+                    panel.Children.Add(textBox);
+
+                    StackPanel panel2 = new StackPanel() { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Right, Margin = new Thickness(0, 10, 0, 0) };
+                    Button okButton = new Button() { Content = "OK", MinWidth = 75, IsDefault = true, Margin = new Thickness(0, 0, 10, 0), IsEnabled = false };
+                    okButton.Click += (s,e) => renameDialog.DialogResult = true;
+                    Button cancelButton = new Button() { Content = "Cancel", MinWidth = 75, IsCancel = true };
+                    panel2.Children.Add(okButton);
+                    panel2.Children.Add(cancelButton);
+                    panel.Children.Add(panel2);
+                    renameDialog.Content = panel;
+
+                    textBox.TextChanged += (s, e) =>
+                    {
+                        okButton.IsEnabled = !string.IsNullOrEmpty(textBox.Text.Trim()) && textBox.Text.Trim() != Attachment.Name;
+                    };
+                    bool? ok = renameDialog.ShowDialog();
+
+                    if(ok.HasValue && ok.Value == true && !string.IsNullOrEmpty(textBox.Text.Trim()))
+                    {
+                        RenameAttachment(textBox.Text.Trim());
+                    }
+                }
+            };
+            contextMenu.PlacementTarget = this;
+            contextMenu.IsOpen = true;
+        }
+
+        /// <inheritdoc />
+        protected override void OnStylusSystemGesture(StylusSystemGestureEventArgs e)
+        {
+            base.OnStylusSystemGesture(e);
+            if (e.SystemGesture == SystemGesture.HoldEnter && Element is not null && Element.IsEditable)
+            {
+                OnAttachmentContextMenu();
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
+        {
+            base.OnMouseRightButtonDown(e);
+            if (Element is not null && Element.IsEditable)
+            {
+                e.Handled = true;
+                OnAttachmentContextMenu();
+            }
+        }
+
+        /// <inheritdoc />
+        protected override void OnClick()
+        {
+            base.OnClick();
+            OnAttachmentClicked();
+        }
+
+        private Size _thumbnailSize = default; // The size of the generated thumbnail - prevents regenerating the same thumbnail multiple times
+
+        private async void UpdateThumbnail()
+        {
+            var image = GetTemplateChild("ThumbnailImage") as Image;
+            if (image is null || this.ActualWidth == 0 || this.ActualHeight == 0) return;
+            if (Attachment is null)
+            {
+                image.Source = null;
+                return;
+            }
+            else if (Attachment.LoadStatus == LoadStatus.Loaded && Attachment.Type == FormAttachmentType.Image) // Attachment.LoadStatus == LoadStatus.Loaded)
+            {
+                try
+                {
+                    if (_thumbnailSize.Width == this.ActualWidth || _thumbnailSize.Height == this.ActualHeight)
+                        return;
+                    var source = PresentationSource.FromVisual(this);
+                    if (source is null)
+                        return;
+                    _thumbnailSize = new Size(this.ActualWidth, this.ActualHeight);
+                    var thumb = await Attachment.CreateThumbnailAsync((int)(this.ActualWidth * source.CompositionTarget.TransformToDevice.M11), (int)(this.ActualHeight * source.CompositionTarget.TransformToDevice.M22));
+                    image.Source = await thumb.ToImageSourceAsync();
+                    image.Stretch = Stretch.UniformToFill;
+                    return;
+                }
+                catch { } // Fallback to default icon
+                finally
+                {
+                    _thumbnailSize = default;
+                }
+            }
+            // Fallback to file icon
+            string glyph = Attachment.Type switch
+            {
+                FormAttachmentType.Image => "\uEB9F",
+                FormAttachmentType.Audio => "\uEC4F",
+                FormAttachmentType.Document => "\uF584",
+                FormAttachmentType.Video => "\uE714",
+                _ => "\uE160"
+            };
+            if (Attachment.LoadStatus == LoadStatus.FailedToLoad)
+                glyph = "\uE783";
+            var tb = new TextBlock
+            {
+                Text = glyph,
+                FontFamily = new FontFamily("Segoe MDL2 Assets"),
+                Foreground = (Attachment.LoadStatus == LoadStatus.FailedToLoad) ? new SolidColorBrush(Colors.Red) : Foreground,
+                FontSize = 32, HorizontalAlignment = HorizontalAlignment.Center, VerticalAlignment = VerticalAlignment.Center
+            };
+            var geometryDrawing = new GeometryDrawing
+            {
+                Brush = new VisualBrush
+                {
+                    Visual = tb,
+                    Stretch = Stretch.None
+                },
+                Geometry = new RectangleGeometry(new Rect(0, 0, 40, 40))
+            };
+            image.Source = new DrawingImage(geometryDrawing);
+            image.Stretch = Stretch.None;
+        }
+    }
+}
+#endif
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.cs
new file mode 100644
index 000000000..027f2496f
--- /dev/null
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/FormAttachmentView.cs
@@ -0,0 +1,239 @@
+// /*******************************************************************************
+//  * Copyright 2012-2018 Esri
+//  *
+//  *  Licensed under the Apache License, Version 2.0 (the "License");
+//  *  you may not use this file except in compliance with the License.
+//  *  You may obtain a copy of the License at
+//  *
+//  *  http://www.apache.org/licenses/LICENSE-2.0
+//  *
+//  *   Unless required by applicable law or agreed to in writing, software
+//  *   distributed under the License is distributed on an "AS IS" BASIS,
+//  *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  *   See the License for the specific language governing permissions and
+//  *   limitations under the License.
+//  ******************************************************************************/
+
+
+#if WPF || MAUI
+using System.ComponentModel;
+using System.Diagnostics;
+using Esri.ArcGISRuntime.Mapping.FeatureForms;
+using Esri.ArcGISRuntime.Toolkit.Internal;
+#if WPF
+using Microsoft.Win32;
+using Microsoft.Win32.SafeHandles;
+using Esri.ArcGISRuntime.Toolkit.UI.Controls;
+#elif MAUI
+using Esri.ArcGISRuntime.Toolkit.Maui;
+#endif
+
+#if MAUI
+namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives
+#else
+namespace Esri.ArcGISRuntime.Toolkit.Primitives
+#endif
+{
+    /// <summary>
+    /// Displays a <see cref="FormAttachment"/> object.
+    /// </summary>
+    public partial class FormAttachmentView
+    {
+        private WeakEventListener<FormAttachmentView, INotifyPropertyChanged, object?, PropertyChangedEventArgs>? _elementPropertyChangedListener;
+
+        /// <summary>
+        /// Initializes an instance of the <see cref="FormAttachmentView"/> class.
+        /// </summary>
+        public FormAttachmentView()
+        {
+#if MAUI
+            ControlTemplate = DefaultControlTemplate;
+            WidthRequest = 92;
+            HeightRequest = 75;
+            var tapGestureRecognizer = new TapGestureRecognizer();
+            tapGestureRecognizer.Tapped += TapGestureRecognizer_Tapped;
+            GestureRecognizers.Add(tapGestureRecognizer);
+#if WINDOWS || MACCATALYST
+            ConfigureFlyout();
+#endif
+#else
+            DefaultStyleKey = typeof(FormAttachmentView);
+#endif
+        }
+
+        private async void OnAttachmentClicked()
+        {
+            if (Attachment is null || Attachment.LoadStatus == LoadStatus.Loading) return;
+            if (Attachment.LoadStatus == LoadStatus.FailedToLoad)
+            {
+                try
+                {
+                    await Attachment.RetryLoadAsync().ConfigureAwait(false);
+                }
+                catch (System.Exception ex)
+                {
+                    Trace.WriteLine("Failed to retry loading attachment: " + ex.Message, "ArcGIS Maps SDK Toolkit");
+                }
+            }
+            else if (Attachment.LoadStatus == LoadStatus.NotLoaded)
+            {
+                try
+                {
+                    await Attachment.LoadAsync().ConfigureAwait(false);
+                }
+                catch (System.Exception ex)
+                {
+                    Trace.WriteLine("Failed to load attachment: " + ex.Message, "ArcGIS Maps SDK Toolkit");
+                }
+            }
+            else if (Attachment.LoadStatus == LoadStatus.Loaded)
+            {
+                OnLoadedAttachmentClicked();
+            }
+        }
+
+        private void DeleteAttachment()
+        {
+            if (Attachment is not null && Element is not null)
+            {
+                var view = FeatureFormView.GetFeatureFormViewParent(this);
+                var form = view?.FeatureForm; // Get form before delete, or we won't be able to get to the parent since this instance will be removed from the tree
+                Element.DeleteAttachment(Attachment);
+                _ = view?.EvaluateExpressions(form);
+            }
+        }
+
+        private void RenameAttachment(string newName)
+        {
+            if (Attachment != null && Attachment.Name != newName)
+            {
+                Attachment.Name = newName;
+                var view = FeatureFormView.GetFeatureFormViewParent(this);
+                _ = view?.EvaluateExpressions(view?.FeatureForm);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the AttachmentsFormElement.
+        /// </summary>
+        public AttachmentsFormElement? Element
+        {
+            get { return (AttachmentsFormElement)GetValue(ElementProperty); }
+            set { SetValue(ElementProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Element"/> dependency property.
+        /// </summary>
+#if MAUI
+        public static readonly BindableProperty ElementProperty = BindableProperty.Create(nameof(Element), typeof(AttachmentsFormElement), typeof(FormAttachmentView), null);
+#else
+        public static readonly DependencyProperty ElementProperty = DependencyProperty.Register(nameof(Element), typeof(AttachmentsFormElement), typeof(FormAttachmentView), null);
+#endif
+
+        /// <summary>
+        /// Gets or sets the Attachment.
+        /// </summary>
+        public FormAttachment? Attachment
+        {
+            get { return (FormAttachment)GetValue(AttachmentProperty); }
+            set { SetValue(AttachmentProperty, value); }
+        }
+
+        /// <summary>
+        /// Identifies the <see cref="Attachment"/> dependency property.
+        /// </summary>
+#if MAUI
+        public static readonly BindableProperty AttachmentProperty =
+            BindableProperty.Create(nameof(Attachment), typeof(FormAttachment), typeof(FormAttachmentView), null, propertyChanged: (s, oldValue, newValue) => ((FormAttachmentView)s).OnAttachmentPropertyChanged(oldValue as FormAttachment, newValue as FormAttachment));
+#else
+        public static readonly DependencyProperty AttachmentProperty =
+            DependencyProperty.Register(nameof(Attachment), typeof(FormAttachment), typeof(FormAttachmentView), new PropertyMetadata(null, (s, e) => ((FormAttachmentView)s).OnAttachmentPropertyChanged(e.OldValue as FormAttachment, e.NewValue as FormAttachment)));
+#endif
+
+        private void OnAttachmentPropertyChanged(FormAttachment? oldValue, FormAttachment? newValue)
+        {
+            if (oldValue is INotifyPropertyChanged inpcOld)
+            {
+                _elementPropertyChangedListener?.Detach();
+                _elementPropertyChangedListener = null;
+            }
+#if WPF
+            _thumbnailSize = default;
+#endif
+            if (newValue is INotifyPropertyChanged inpcNew)
+            {
+                _elementPropertyChangedListener = new WeakEventListener<FormAttachmentView, INotifyPropertyChanged, object?, PropertyChangedEventArgs>(this, inpcNew)
+                {
+                    OnEventAction = static (instance, source, eventArgs) => instance.Attachment_PropertyChanged(source, eventArgs),
+                    OnDetachAction = static (instance, source, weakEventListener) => source.PropertyChanged -= weakEventListener.OnEvent,
+                };
+                inpcNew.PropertyChanged += _elementPropertyChangedListener.OnEvent;
+            }
+            if (newValue is not null)
+            {
+                if (newValue.LoadStatus == LoadStatus.NotLoaded && newValue.IsLocal) // Load local attachments immediately
+                    _ = newValue.LoadAsync();
+            }
+            UpdateThumbnail();
+            UpdateLoadedState(false);
+        }
+
+        private void Attachment_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(FormAttachment.LoadStatus))
+            {
+                this.Dispatch(() => UpdateLoadedState(true));
+            }
+        }
+
+        private async void OnLoadedAttachmentClicked()
+        {
+            FormAttachment? attachment = Attachment;
+            if (attachment != null && attachment.IsLocal && attachment.LoadStatus == LoadStatus.Loaded)
+            {
+                var viewer = FeatureFormView.GetFeatureFormViewParent(this);
+                if (viewer is not null)
+                {
+                    bool handled = viewer.OnFormAttachmentClicked(attachment);
+                    if (handled)
+                        return;
+                }
+#if MAUI
+#if !WINDOWS && !MACCATALYST // Windows and Catalyst supports context menus for the additional options
+                if (await DisplayAttachmentActionSheet())
+                    return;
+#endif
+                try
+                {
+                    await Microsoft.Maui.ApplicationModel.Launcher.Default.OpenAsync(
+                        new Microsoft.Maui.ApplicationModel.OpenFileRequest(attachment.Name, new ReadOnlyFile(attachment.FilePath, attachment.ContentType)));
+                }
+                catch(System.Exception ex)
+                {
+                    System.Diagnostics.Trace.WriteLine($"Failed to open attachment: " + ex.Message, "ArcGIS Maps SDK Toolkit");
+                }
+#else
+                var saveFileDialog = new SaveFileDialog();
+                var fileInfo = new System.IO.FileInfo(attachment.FilePath);
+                saveFileDialog.FileName = fileInfo.Name;
+                saveFileDialog.DefaultExt = fileInfo.Extension;
+                if (saveFileDialog.ShowDialog() == true)
+                {
+                    try
+                    {
+                        var stream = System.IO.File.OpenRead(attachment.FilePath);
+                        using var outfile = saveFileDialog.OpenFile();
+                        await stream.CopyToAsync(outfile);
+                    }
+                    catch (System.Exception ex)
+                    {
+                        System.Diagnostics.Trace.WriteLine($"Failed to save file to disk: " + ex.Message);
+                    }
+                }
+#endif
+            }
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs
index 0e0e5a82f..ce1094e40 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Maui.cs
@@ -3,6 +3,7 @@
 using Esri.ArcGISRuntime.Mapping.FeatureForms;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 
 namespace Esri.ArcGISRuntime.Toolkit.Maui.Primitives
 {
@@ -30,12 +31,14 @@ private class StringLengthConverter : IValueConverter
         [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement.Value), "Esri.ArcGISRuntime.Mapping.FeatureForms.FieldFormElement", "Esri.ArcGISRuntime")]
         [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.TextAreaFormInput.MaxLength), "Esri.ArcGISRuntime.Mapping.FeatureForms.TextAreaFormInput", "Esri.ArcGISRuntime")]
         [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.TextBoxFormInput.MaxLength), "Esri.ArcGISRuntime.Mapping.FeatureForms.TextBoxFormInput", "Esri.ArcGISRuntime")]
+        [DynamicDependency(nameof(Esri.ArcGISRuntime.Mapping.FeatureForms.BarcodeScannerFormInput.MaxLength), "Esri.ArcGISRuntime.Mapping.FeatureForms.BarcodeScannerFormInput", "Esri.ArcGISRuntime")]
         private static object BuildDefaultTemplate()
         {
             
             Grid root = new Grid();
             root.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Star));
             root.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto));
+            root.ColumnDefinitions.Add(new ColumnDefinition(GridLength.Auto));
             HorizontalStackLayout horizontalStackLayout = new HorizontalStackLayout();
             horizontalStackLayout.Margin = new Thickness(0, -17, 0, 0);
             horizontalStackLayout.SetBinding(View.IsVisibleProperty, new Binding(nameof(TextFormInputView.ShowCharacterCount), source: RelativeBindingSource.TemplatedParent));
@@ -47,7 +50,11 @@ private static object BuildDefaultTemplate()
             maxCountLabel.SetBinding(Label.TextProperty, new Binding("Element.Input.MaxLength", source: RelativeBindingSource.TemplatedParent));
             horizontalStackLayout.Children.Add(maxCountLabel);
             Grid.SetColumn(horizontalStackLayout, 1);
+            Grid.SetColumnSpan(horizontalStackLayout, 2);
             root.Add(horizontalStackLayout);
+            Border errorBorder = new Border() { StrokeThickness = 1, Stroke = new SolidColorBrush(Colors.Red), IsVisible = false };
+            Grid.SetColumnSpan(errorBorder, 2);
+            root.Add(errorBorder);
             Entry textInput = new Entry();
             Grid.SetColumnSpan(textInput, 2);
             root.Add(textInput);
@@ -60,9 +67,10 @@ private static object BuildDefaultTemplate()
             readonlyText.SetBinding(Label.TextProperty, new Binding("Element.Value",source:RelativeBindingSource.TemplatedParent));
             Grid.SetColumnSpan(readonlyText, 2);
             root.Add(readonlyText);
-            Border errorBorder = new Border() { StrokeThickness = 1, Stroke = new SolidColorBrush(Colors.Red), IsVisible = false };
-            Grid.SetColumnSpan(errorBorder, 2);
-            root.Add(errorBorder);
+            Internal.CalciteImageButton barcodeButton = new Internal.CalciteImageButton("\uE22F") { IsVisible = false, BorderWidth = 0 };
+            Grid.SetColumn(barcodeButton, 2);
+            barcodeButton.SetBinding(View.IsVisibleProperty, new Binding(nameof(TextFormInputView.ShowBarcodeScanner), source: RelativeBindingSource.TemplatedParent));
+            root.Add(barcodeButton);
 
             INameScope nameScope = new NameScope();
             NameScope.SetNameScope(root, nameScope);
@@ -70,6 +78,7 @@ private static object BuildDefaultTemplate()
             nameScope.RegisterName("TextInput", textInput);
             nameScope.RegisterName("TextAreaInput", textArea);
             nameScope.RegisterName("ReadOnlyText", readonlyText);
+            nameScope.RegisterName("BarcodeButton", barcodeButton);
             return root;
         }
 
@@ -100,9 +109,23 @@ protected override void OnApplyTemplate()
                 _textAreaInput.TextChanged += TextInput_TextChanged;
             }
             _readonlyLabel = GetTemplateChild("ReadOnlyText") as Label;
+            if (GetTemplateChild("BarcodeButton") is ImageButton imageButton)
+            {
+                imageButton.Clicked += BarcodeButton_Clicked;
+            }
+            else if (GetTemplateChild("BarcodeButton") is Button button)
+            {
+                button.Clicked += BarcodeButton_Clicked;
+            }
             ConfigureTextBox();
             UpdateValidationState();
         }
+
+        private void BarcodeButton_Clicked(object? sender, EventArgs e)
+        {
+            if (Element != null)
+                FeatureFormView.GetFeatureFormViewParent(this)?.OnBarcodeButtonClicked(Element);
+        }
     }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Windows.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Windows.cs
index 9d60c6fdc..bd8094a72 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Windows.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.Windows.cs
@@ -9,6 +9,7 @@
 using System.Text;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
+using Esri.ArcGISRuntime.Toolkit.UI.Controls;
 
 namespace Esri.ArcGISRuntime.Toolkit.Primitives
 {
@@ -16,6 +17,7 @@ public partial class TextFormInputView : Control
     {
         private TextBox? _textInput;
         private TextBlock? _readonlyLabel;
+        private ButtonBase? _barcodeButton;
 
 
         /// <inheritdoc />
@@ -34,9 +36,24 @@ public override void OnApplyTemplate()
                 _textInput.TextChanged += TextInput_TextChanged;
             }
             _readonlyLabel = GetTemplateChild("ReadOnlyText") as TextBlock;
+            if (_barcodeButton != null)
+            {
+                _barcodeButton.Click -= BarcodeButton_Click;
+            }
+            _barcodeButton = GetTemplateChild("BarcodeButton") as ButtonBase;
+            if (_barcodeButton != null)
+            {
+                _barcodeButton.Click += BarcodeButton_Click;
+            }
             ConfigureTextBox();
             UpdateValidationState();
         }
+
+        private void BarcodeButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (Element != null)
+                FeatureFormView.GetFeatureFormViewParent(this)?.OnBarcodeButtonClicked(Element);
+        }
     }
 }
 #endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.cs b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.cs
index 669e8dc5e..d625de2df 100644
--- a/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/FeatureForm/TextFormInputView.cs
@@ -47,27 +47,27 @@ private void ConfigureTextBox()
                 {
 #if MAUI
                     if (_textLineInput != null) _textLineInput.IsVisible = false;
-                    if (_textAreaInput != null)
-                    {
-                        _textAreaInput.IsVisible = Element.IsEditable;
-                    }
+                    if (_textAreaInput != null) _textAreaInput.IsVisible = Element.IsEditable;
 #else
                     _textInput.AcceptsReturn = true;
 #endif
                     _textInput.MaxLength = (int)area.MaxLength;
                 }
-                else if (Element?.Input is TextBoxFormInput box)
+                else if (Element?.Input is TextBoxFormInput || Element?.Input is BarcodeScannerFormInput)
                 {
 #if MAUI
                     if (_textAreaInput != null) _textAreaInput.IsVisible = false;
-                    if (_textLineInput != null)
-                    {
-                        _textLineInput.IsVisible = Element.IsEditable;
-                    }
+                    if (_textLineInput != null) _textLineInput.IsVisible = Element.IsEditable;
 #else
                     _textInput.AcceptsReturn = false;
 #endif
-                    _textInput.MaxLength = (int)box.MaxLength;
+                    int maxLength = 0;
+                    if (Element?.Input is TextBoxFormInput box)
+                        maxLength = (int)box.MaxLength;
+                    else if (Element?.Input is BarcodeScannerFormInput bar)
+                        maxLength = (int)bar.MaxLength;
+
+                    _textInput.MaxLength = maxLength == 0 ? int.MaxValue : maxLength;
                 }
                 _textInput.Text = Element?.Value?.ToString();
 #if MAUI
@@ -89,8 +89,11 @@ private void ConfigureTextBox()
 #endif
                 _readonlyLabel.Text = Element?.FormattedValue;
             }
+
+            ShowBarcodeScanner = Element?.Input is BarcodeScannerFormInput && Element.IsEditable;
+
 #if !MAUI
-            if(_textInput != null)
+            if (_textInput != null)
                 _textInput.Visibility = Element?.IsEditable == false ? Visibility.Collapsed : Visibility.Visible;
 #endif
         }
@@ -187,7 +190,8 @@ public int MaxLines
         /// </summary>
         public bool ShowCharacterCount
         {
-            get {
+            get
+            {
 #if MAUI
                 return _showCharacterCount;
 #else
@@ -197,7 +201,7 @@ public bool ShowCharacterCount
             private set
             {
 #if MAUI
-                if(_showCharacterCount != value)
+                if (_showCharacterCount != value)
                 {
                     _showCharacterCount = value;
                     OnPropertyChanged(nameof(ShowCharacterCount));
@@ -215,6 +219,40 @@ private set
             DependencyProperty.RegisterReadOnly(nameof(ShowCharacterCount), typeof(bool), typeof(TextFormInputView), new PropertyMetadata(false));
 #endif
 
+        /// <summary>
+        /// Gets a value indicating whether the bar code scanner button is visible.
+        /// </summary>
+        public bool ShowBarcodeScanner
+        {
+            get
+            {
+#if MAUI
+                return _ShowBarcodeScanner;
+#else
+                return (bool)GetValue(ShowBarcodeScannerPropertyKey.DependencyProperty);
+#endif
+            }
+            private set
+            {
+#if MAUI
+                if (_ShowBarcodeScanner != value)
+                {
+                    _ShowBarcodeScanner = value;
+                    OnPropertyChanged(nameof(ShowBarcodeScanner));
+                }
+#else
+                SetValue(ShowBarcodeScannerPropertyKey, value);
+#endif
+            }
+        }
+
+#if MAUI
+        private bool _ShowBarcodeScanner = false;
+#else
+        private static readonly DependencyPropertyKey ShowBarcodeScannerPropertyKey =
+            DependencyProperty.RegisterReadOnly(nameof(ShowBarcodeScanner), typeof(bool), typeof(TextFormInputView), new PropertyMetadata(false));
+#endif
+
         /// <summary>
         /// Gets or sets the FieldFormElement.
         /// </summary>
diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/FieldsPopupElementView.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/FieldsPopupElementView.cs
index 08a9a10ff..b9a0af058 100644
--- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/FieldsPopupElementView.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/FieldsPopupElementView.cs
@@ -18,6 +18,12 @@
 using Esri.ArcGISRuntime.Data;
 using Esri.ArcGISRuntime.Mapping.Popups;
 using Esri.ArcGISRuntime.Toolkit.Internal;
+#if MAUI
+using Esri.ArcGISRuntime.Toolkit.Maui;
+#else
+using Esri.ArcGISRuntime.Toolkit.UI.Controls;
+#endif
+
 #if MAUI
 using TextBlock = Microsoft.Maui.Controls.Label;
 #else
@@ -134,7 +140,7 @@ private void RefreshTable()
                     gestureRecognizer.Tapped += (s, e) =>
                     {
                         if (uri is not null)
-                            _ = Launcher.LaunchUriAsync(uri);
+                            PopupViewer.GetPopupViewerParent(this)?.OnHyperlinkClicked(uri);
                     };
                     t.GestureRecognizers.Add(gestureRecognizer);
                     t.FormattedText = new FormattedString();
@@ -144,7 +150,7 @@ private void RefreshTable()
                     hl.Click += (s, e) =>
                     {
                         if (uri is not null)
-                            _ = Launcher.LaunchUriAsync(uri);
+                            PopupViewer.GetPopupViewerParent(this)?.OnHyperlinkClicked(uri);
                     };
                     hl.Inlines.Add("View");
                     t.Inlines.Add(hl);
@@ -234,4 +240,4 @@ public Style FieldTextStyle
             PropertyHelper.CreateProperty<Style, FieldsPopupElementView>(nameof(FieldTextStyle));
     }
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs
index 64313a67d..f8b3a0005 100644
--- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Maui.cs
@@ -107,6 +107,18 @@ internal static Style GetStyle(string resourceKey, Style defaultStyle)
         internal static Style GetPopupViewerTitleStyle() => GetStyle(PopupViewerTitleStyleName, DefaultPopupViewerTitleStyle);
 
         internal static Style GetPopupViewerCaptionStyle() => GetStyle(PopupViewerCaptionStyleName, DefaultPopupViewerCaptionStyle);
+
+        internal static PopupViewer? GetPopupViewerParent(Element element) => GetParent<PopupViewer>(element);
+
+        private static T? GetParent<T>(Element element) where T : Element
+        {
+            var parent = element.Parent;
+            while (parent is not null and not T)
+            {
+                parent = parent.Parent;
+            }
+            return parent as T;
+        }
     }
 }
 #endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Windows.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Windows.cs
index 45c808870..ee05e97b6 100644
--- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Windows.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.Windows.cs
@@ -56,6 +56,34 @@ private static void OnPopupManagerPropertyChanged(DependencyObject d, Dependency
             ((PopupViewer)d).Popup = ((PopupViewer)d).PopupManager?.Popup;
 #pragma warning restore CS0618 // Type or member is obsolete
         }
+
+        internal static PopupViewer? GetPopupViewerParent(DependencyObject? child) => GetParent<PopupViewer>(child);
+
+        private static T? GetParent<T>(DependencyObject? child) where T : DependencyObject
+        {
+            if (child is FrameworkContentElement elm)
+            {
+                child = GetVisualParent(elm);
+            }
+            if (child is null)
+                return default;
+            var parent = VisualTreeHelper.GetParent(child);
+            while (parent is not null and not T)
+            {
+                parent = VisualTreeHelper.GetParent(parent);
+            }
+            return parent as T;
+        }
+
+        private static Visual? GetVisualParent(FrameworkContentElement child)
+        {
+            var parent = child.Parent;
+            while (parent is FrameworkContentElement elm)
+            {
+                parent = elm.Parent;
+            }
+            return parent as Visual;
+        }
     }
 }
 #endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs
index 6721adcc8..3f5e5d2b8 100644
--- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/PopupViewer.cs
@@ -22,7 +22,6 @@
 
 #if MAUI
 using Esri.ArcGISRuntime.Toolkit.Maui.Primitives;
-using DependencyObject = Microsoft.Maui.Controls.BindableObject;
 using ScrollViewer = Microsoft.Maui.Controls.ScrollView;
 #else
 using Esri.ArcGISRuntime.Toolkit.Primitives;
@@ -244,11 +243,34 @@ internal bool OnPopupAttachmentClicked(PopupAttachment attachment)
             if (handler is not null)
             {
                 var args = new PopupAttachmentClickedEventArgs(attachment);
-                PopupAttachmentClicked?.Invoke(this, args);
+                handler.Invoke(this, args);
                 return args.Handled;
             }
             return false;
         }
+
+        /// <summary>
+        /// Raised when a link is clicked
+        /// </summary>
+        /// <remarks>
+        /// <para>By default, when an link is clicked, the default application (Browser) for the file type (if any) is launched. To override this,
+        /// listen to this event, set the <see cref="HyperlinkClickedEventArgs.Handled"/> property to <c>true</c> and perform
+        /// your own logic. </para>
+        /// </remarks>
+        public event EventHandler<HyperlinkClickedEventArgs>? HyperlinkClicked;
+
+        internal void OnHyperlinkClicked(Uri uri)
+        {
+            var handler = HyperlinkClicked;
+            if (handler is not null)
+            {
+                var args = new HyperlinkClickedEventArgs(uri);
+                handler.Invoke(this, args);
+                if (args.Handled)
+                    return;
+            }
+            Launcher.LaunchUriAsync(uri);
+        }
     }
 
     /// <summary>
@@ -271,5 +293,26 @@ internal PopupAttachmentClickedEventArgs(PopupAttachment attachment)
         /// </summary>
         public PopupAttachment Attachment { get; }
     }
+
+    /// <summary>
+    /// Event argument for the <see cref="PopupViewer.HyperlinkClicked"/> event.
+    /// </summary>
+    public sealed class HyperlinkClickedEventArgs : EventArgs
+    {
+        internal HyperlinkClickedEventArgs(Uri uri)
+        {
+            Uri = uri;
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the event handler has handled the event and the default action should be prevented.
+        /// </summary>
+        public bool Handled { get; set; }
+
+        /// <summary>
+        /// Gets the URI that was clicked.
+        /// </summary>
+        public Uri Uri { get; }
+    }
 }
 #endif
\ No newline at end of file
diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Maui.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Maui.cs
index 6f6db3bde..b3ec3f2d8 100644
--- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Maui.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Maui.cs
@@ -245,11 +245,10 @@ private static IEnumerable<Span> VisitInline(MarkupNode node)
                         var tapRecognizer = new TapGestureRecognizer();
                         tapRecognizer.Tapped += (s, e) =>
                         {
-                            try
+                            if (s is Element element)
                             {
-                                Browser.OpenAsync(node.Content, BrowserLaunchMode.SystemPreferred);
+                                PopupViewer.GetPopupViewerParent(element)?.OnHyperlinkClicked(linkUri);
                             }
-                            catch { }
                         };
                         foreach (var subNode in node.Children)
                         {
diff --git a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Windows.cs b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Windows.cs
index b9a0956ac..785901a6c 100644
--- a/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Windows.cs
+++ b/src/Toolkit/Toolkit/UI/Controls/PopupViewer/TextPopupElementView.Windows.cs
@@ -17,6 +17,7 @@
 #if WPF
 using Esri.ArcGISRuntime.Mapping.Popups;
 using Esri.ArcGISRuntime.Toolkit.Internal;
+using Esri.ArcGISRuntime.Toolkit.UI.Controls;
 using Esri.ArcGISRuntime.UI;
 using System.Windows.Documents;
 using System.Windows.Input;
@@ -287,9 +288,9 @@ private static System.Windows.Media.Color ConvertColor(System.Drawing.Color colo
             _ => TextAlignment.Left,
         };
 
-        private static async void NavigateToUri(object sender, RequestNavigateEventArgs ea)
+        private static void NavigateToUri(object sender, RequestNavigateEventArgs ea)
         {
-            await Launcher.LaunchUriAsync(ea.Uri);
+            PopupViewer.GetPopupViewerParent(sender as DependencyObject)?.OnHyperlinkClicked(ea.Uri);
         }
     }
 }
diff --git a/src/version.json b/src/version.json
index 6d563049a..f251ac4dc 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "200.4.0-{height}",
+  "version": "200.5.0-{height}",
   "publicReleaseRefSpec": [
     "^refs/tags/v\\d+\\.\\d+" // we release out of tags starting with vN.N
   ],