diff --git a/Core/Camera/LumixData/FocusMode.cs b/Core/Camera/LumixData/FocusMode.cs
index 8c52041..72c71e0 100644
--- a/Core/Camera/LumixData/FocusMode.cs
+++ b/Core/Camera/LumixData/FocusMode.cs
@@ -9,7 +9,7 @@ public enum FocusMode
     {
         [EnumException(0x5)]
         [XmlEnum(Name = "mf")]
-        Manual = 0xff,
+        MF = 0xff,
 
         [XmlEnum(Name = "afc")]
         AFC = 0x3,
diff --git a/Core/Camera/LumixState.cs b/Core/Camera/LumixState.cs
index 66a95cf..e6e2daa 100644
--- a/Core/Camera/LumixState.cs
+++ b/Core/Camera/LumixState.cs
@@ -84,7 +84,7 @@ public CameraMode CameraMode
 
         public bool CanChangeShutter => CameraMode.ToValue<CameraModeFlags>().HasFlag(CameraModeFlags.Shutter);
 
-        public bool CanManualFocus => FocusMode == FocusMode.Manual;
+        public bool CanManualFocus => FocusMode == FocusMode.MF;
 
         public CurMenu CurMenu
         {
diff --git a/GMaster/GMaster.csproj b/GMaster/GMaster.csproj
index 48ad7ee..5197ef4 100644
--- a/GMaster/GMaster.csproj
+++ b/GMaster/GMaster.csproj
@@ -111,6 +111,7 @@
     <Compile Include="Views\Commands\ManualFocusAfCommand.cs" />
     <Compile Include="Views\Commands\MfAssistPinpCommand.cs" />
     <Compile Include="Views\Commands\TouchAfReleaseCommand.cs" />
+    <Compile Include="Views\Converters\AutofocusModeToIconPathConverter.cs" />
     <Compile Include="Views\Converters\BatteryToIconConverter.cs" />
     <Compile Include="Views\Converters\CameraModeToIconPathConverter.cs" />
     <Compile Include="Views\Converters\FalseToVisibileConverter.cs" />
@@ -236,6 +237,12 @@
     <Content Include="Assets\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\Wide310x150Logo.scale-200.png" />
     <Content Include="Assets\Wide310x150Logo.scale-400.png" />
+    <Content Include="images\AutofocusMode\Face.png" />
+    <Content Include="images\AutofocusMode\FreeMultiArea.png" />
+    <Content Include="images\AutofocusMode\MultiArea.png" />
+    <Content Include="images\AutofocusMode\OneArea.png" />
+    <Content Include="images\AutofocusMode\Pinpoint.png" />
+    <Content Include="images\AutofocusMode\Track.png" />
     <Content Include="images\CameraMode\Movie.png" />
     <Content Include="images\CameraMode\MovieA.png" />
     <Content Include="images\CameraMode\MovieM.png" />
diff --git a/GMaster/Views/CameraViewControl.xaml b/GMaster/Views/CameraViewControl.xaml
index e3d3067..4d83f7b 100644
--- a/GMaster/Views/CameraViewControl.xaml
+++ b/GMaster/Views/CameraViewControl.xaml
@@ -81,7 +81,7 @@
                         Style="{StaticResource TransparentButtonStyle}"
                         IsEnabled="{Binding CanCapture}">
                             <Viewbox>
-                                <TextBlock Padding="5" FontFamily="Segoe MDL2 Assets" Text="&#xE722;" />
+                                    <TextBlock Padding="5" FontFamily="Segoe MDL2 Assets" Text="&#xE722;" />
                             </Viewbox>
                         </tools:PressButton>
                     </StackPanel>
@@ -90,7 +90,13 @@
                     <Image HorizontalAlignment="Left" Source="{Binding CameraMode, Converter={StaticResource CameraModeToIconPathConverter}}"></Image>
                     
                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" >
-                        <Viewbox>
+                        <StackPanel Orientation="Horizontal" Margin="20,0,0,0">
+                            <Viewbox>
+                                    <TextBlock Text="{Binding FocusMode, Mode=TwoWay}"/>
+                            </Viewbox>
+                            <Image Source="{Binding AutoFocusMode, Converter={StaticResource AutofocusModeToIconPathConverter}, Mode=TwoWay}"/>
+                        </StackPanel>
+                        <Viewbox Margin="20,0,0,0">
                             <TextBlock Width="120">
                                 <Run FontFamily="Segoe MDL2 Assets" Text="&#xE7F1;"
                                      tools:StoryboardManager.Trigger="{Binding MemoryCardAccess}">
@@ -120,7 +126,18 @@
                             <Viewbox.RenderTransform>
                                 <ScaleTransform ScaleX="-1" CenterX="20"/>
                             </Viewbox.RenderTransform>
-                            <TextBlock Text="{Binding BatteryLevel, Converter={StaticResource BatteryToIconConverter}, Mode=TwoWay}" FontFamily="Segoe MDL2 Assets"/>
+                            <TextBlock Text="{Binding BatteryLevel, Converter={StaticResource BatteryToIconConverter}, Mode=TwoWay}" 
+                                       FontFamily="Segoe MDL2 Assets"
+                                       tools:StoryboardManager.Trigger="{Binding BatteryCritical}">
+                                <tools:StoryboardManager.Storyboard>
+                                    <Storyboard RepeatBehavior="Forever" Duration="0:0:1">
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="{Binding}">
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Red"/>
+                                            <DiscreteObjectKeyFrame KeyTime="0:0:0.5" Value="White" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </tools:StoryboardManager.Storyboard>
+                            </TextBlock>
                         </Viewbox>
                     </StackPanel>
                     </Grid>
diff --git a/GMaster/Views/CameraViewControl.xaml.cs b/GMaster/Views/CameraViewControl.xaml.cs
index 95d35f3..70f73a0 100644
--- a/GMaster/Views/CameraViewControl.xaml.cs
+++ b/GMaster/Views/CameraViewControl.xaml.cs
@@ -160,7 +160,7 @@ private async void ImageGestureRecognizer_ManipulationCompleted(GestureRecognize
             }
             else
             {
-                if (Lumix.LumixState.FocusMode == FocusMode.Manual)
+                if (Lumix.LumixState.FocusMode == FocusMode.MF)
                 {
                     if (args.PointerDeviceType != PointerDeviceType.Mouse)
                     {
@@ -284,7 +284,7 @@ private async Task MoveFocusPoint(double x, double y, PinchStage stage)
             var fp = ToFloatPoint(x, y);
             if (fp.IsInRange(0f, 1f) && Lumix != null)
             {
-                if (Lumix.LumixState.FocusMode != FocusMode.Manual)
+                if (Lumix.LumixState.FocusMode != FocusMode.MF)
                 {
                     await Lumix.FocusPointMove(fp);
                 }
@@ -298,7 +298,7 @@ private async Task MoveFocusPoint(double x, double y, PinchStage stage)
         private async Task PinchZoom(PinchStage stage, FloatPoint point, float extend)
         {
             extend = (200f + extend) / 1000f;
-            if (Lumix.LumixState.FocusMode != FocusMode.Manual)
+            if (Lumix.LumixState.FocusMode != FocusMode.MF)
             {
                 if (Lumix.LumixState.FocusAreas != null
                     && Lumix.LumixState.FocusAreas.Boxes.Any(b => b.Props.Type == FocusAreaType.OneAreaSelected))
diff --git a/GMaster/Views/CameraViewControlResources.xaml b/GMaster/Views/CameraViewControlResources.xaml
index 5d777b4..00be154 100644
--- a/GMaster/Views/CameraViewControlResources.xaml
+++ b/GMaster/Views/CameraViewControlResources.xaml
@@ -10,6 +10,7 @@
     <converters:RecStateToIconConvertor x:Key="RecStateConvertor" />
     <converters:BatteryToIconConverter x:Key="BatteryToIconConverter"/>
     <converters:CameraModeToIconPathConverter x:Key="CameraModeToIconPathConverter"/>
+    <converters:AutofocusModeToIconPathConverter x:Key="AutofocusModeToIconPathConverter"/>
     <Style x:Key="TransparentButtonStyle" TargetType="Button">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}" />
diff --git a/GMaster/Views/Commands/ManualFocusAfCommand.cs b/GMaster/Views/Commands/ManualFocusAfCommand.cs
index 45e2818..4c0708a 100644
--- a/GMaster/Views/Commands/ManualFocusAfCommand.cs
+++ b/GMaster/Views/Commands/ManualFocusAfCommand.cs
@@ -21,7 +21,7 @@ protected override async Task InternalExecute()
 
             try
             {
-                if (lumix.Camera.LumixState.FocusMode == FocusMode.Manual)
+                if (lumix.Camera.LumixState.FocusMode == FocusMode.MF)
                 {
                     await lumix.Camera.MfAssistAf();
                 }
diff --git a/GMaster/Views/Commands/MfAssistPinpCommand.cs b/GMaster/Views/Commands/MfAssistPinpCommand.cs
index 7d27d67..e03eabc 100644
--- a/GMaster/Views/Commands/MfAssistPinpCommand.cs
+++ b/GMaster/Views/Commands/MfAssistPinpCommand.cs
@@ -21,7 +21,7 @@ protected override async Task InternalExecute()
 
             try
             {
-                if (lumix.Camera.LumixState.FocusMode == FocusMode.Manual)
+                if (lumix.Camera.LumixState.FocusMode == FocusMode.MF)
                 {
                     await lumix.Camera.MfAssistPinp(false);
                 }
diff --git a/GMaster/Views/Commands/TouchAfReleaseCommand.cs b/GMaster/Views/Commands/TouchAfReleaseCommand.cs
index bafc913..e9bcc31 100644
--- a/GMaster/Views/Commands/TouchAfReleaseCommand.cs
+++ b/GMaster/Views/Commands/TouchAfReleaseCommand.cs
@@ -21,7 +21,7 @@ protected override async Task InternalExecute()
 
             try
             {
-                if (lumix.Camera.LumixState.FocusMode != FocusMode.Manual)
+                if (lumix.Camera.LumixState.FocusMode != FocusMode.MF)
                 {
                     await lumix.Camera.ReleaseTouchAF();
                 }
diff --git a/GMaster/Views/Converters/AutofocusModeToIconPathConverter.cs b/GMaster/Views/Converters/AutofocusModeToIconPathConverter.cs
new file mode 100644
index 0000000..332b49a
--- /dev/null
+++ b/GMaster/Views/Converters/AutofocusModeToIconPathConverter.cs
@@ -0,0 +1,22 @@
+namespace GMaster.Views.Converters
+{
+    using System;
+    using System.Collections.Generic;
+    using Core.Camera.LumixData;
+    using Tools;
+
+    public class AutofocusModeToIconPathConverter : DelegateConverter<AutoFocusMode, string>
+    {
+        private static readonly Dictionary<AutoFocusMode, string> Modes = new Dictionary<AutoFocusMode, string>
+        {
+            { AutoFocusMode.Face, "Face.png" },
+            { AutoFocusMode.FreeMultiArea, "FreeMultiArea.png" },
+            { AutoFocusMode.MultiArea, "MultiArea.png" },
+            { AutoFocusMode.OneArea, "OneArea.png" },
+            { AutoFocusMode.Pinpoint, "Pinpoint.png" },
+            { AutoFocusMode.Track, "Track.png" },
+        };
+
+        protected override Func<AutoFocusMode, string> Converter => value => Modes.TryGetValue(value, out var res) ? "/images/AutofocusMode/" + res : string.Empty;
+    }
+}
\ No newline at end of file
diff --git a/GMaster/Views/Models/CameraViewModel.cs b/GMaster/Views/Models/CameraViewModel.cs
index 3ebf733..1f386be 100644
--- a/GMaster/Views/Models/CameraViewModel.cs
+++ b/GMaster/Views/Models/CameraViewModel.cs
@@ -68,7 +68,7 @@ public float BatteryLevel
 
         public object CanManualFocus => lumixState?.CanManualFocus ?? false;
 
-        public bool CanManualFocusAf => (lumixState?.FocusMode ?? FocusMode.Unknown) == FocusMode.Manual && (selectedCamera?.Camera.Profile.ManualFocusAF ?? false);
+        public bool CanManualFocusAf => (lumixState?.FocusMode ?? FocusMode.Unknown) == FocusMode.MF && (selectedCamera?.Camera.Profile.ManualFocusAF ?? false);
 
         public bool CanPowerZoom => lumixState?.LensInfo?.HasPowerZoom ?? false;
 
@@ -258,6 +258,10 @@ public ICollection<string> ShutterSpeeds
             }
         }
 
+        public FocusMode FocusMode => lumixState?.FocusMode ?? FocusMode.Unknown;
+
+        public bool BatteryCritical => BatteryLevel == 0;
+
         [NotifyPropertyChangedInvocator]
         protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
@@ -299,7 +303,7 @@ await RunAsync(() =>
                     {
                         case nameof(LumixState.FocusMode):
                             OnPropertyChanged(nameof(CanManualFocusAf));
-
+                            OnPropertyChanged(nameof(FocusMode));
                             break;
 
                         case nameof(LumixState.CameraMode):
@@ -383,6 +387,7 @@ await RunAsync(() =>
 
                         case nameof(LumixState.State):
                             OnPropertyChanged(nameof(BatteryLevel));
+                            OnPropertyChanged(nameof(BatteryCritical));
                             OnPropertyChanged(nameof(MemoryCardInfo));
                             OnPropertyChanged(nameof(MemoryCardAccess));
                             OnPropertyChanged(nameof(MemoryCardError));
@@ -430,6 +435,10 @@ private void RefreshAll()
                 OnPropertyChanged(nameof(MemoryCardError));
                 OnPropertyChanged(nameof(MemoryCardAccess));
                 OnPropertyChanged(nameof(CameraMode));
+                OnPropertyChanged(nameof(FocusMode));
+                OnPropertyChanged(nameof(AutoFocusMode));
+                OnPropertyChanged(nameof(BatteryCritical));
+
             }
             catch (Exception ex)
             {
diff --git a/GMaster/images/AutofocusMode/Face.png b/GMaster/images/AutofocusMode/Face.png
new file mode 100644
index 0000000..7718977
Binary files /dev/null and b/GMaster/images/AutofocusMode/Face.png differ
diff --git a/GMaster/images/AutofocusMode/FreeMultiArea.png b/GMaster/images/AutofocusMode/FreeMultiArea.png
new file mode 100644
index 0000000..8e03b93
Binary files /dev/null and b/GMaster/images/AutofocusMode/FreeMultiArea.png differ
diff --git a/GMaster/images/AutofocusMode/MultiArea.png b/GMaster/images/AutofocusMode/MultiArea.png
new file mode 100644
index 0000000..4e04ef2
Binary files /dev/null and b/GMaster/images/AutofocusMode/MultiArea.png differ
diff --git a/GMaster/images/AutofocusMode/OneArea.png b/GMaster/images/AutofocusMode/OneArea.png
new file mode 100644
index 0000000..033e4d8
Binary files /dev/null and b/GMaster/images/AutofocusMode/OneArea.png differ
diff --git a/GMaster/images/AutofocusMode/Pinpoint.png b/GMaster/images/AutofocusMode/Pinpoint.png
new file mode 100644
index 0000000..56632c7
Binary files /dev/null and b/GMaster/images/AutofocusMode/Pinpoint.png differ
diff --git a/GMaster/images/AutofocusMode/Track.png b/GMaster/images/AutofocusMode/Track.png
new file mode 100644
index 0000000..311d96f
Binary files /dev/null and b/GMaster/images/AutofocusMode/Track.png differ