diff --git a/Atomex.Client.Core b/Atomex.Client.Core
index 5a73643..5ebc632 160000
--- a/Atomex.Client.Core
+++ b/Atomex.Client.Core
@@ -1 +1 @@
-Subproject commit 5a7364344ead065b98a9e53e4c192b399a0c15c9
+Subproject commit 5ebc632e81c01d9eb50d56a6e566322557d9dc06
diff --git a/Atomex.Client.Wpf.Installer/Product.wxs b/Atomex.Client.Wpf.Installer/Product.wxs
index 14a36ab..dd128ed 100644
--- a/Atomex.Client.Wpf.Installer/Product.wxs
+++ b/Atomex.Client.Wpf.Installer/Product.wxs
@@ -3,7 +3,7 @@
 <?define Name = "Atomex Client" ?>
 <?define Manufacturer = "Atomex.me" ?>
 <?define Description = "Multicurrency HD wallet with built-in hybrid exchange based on atomic swap." ?>
-<?define Version = "1.0.69" ?>
+<?define Version = "1.0.70" ?>
 <?define UpgradeCode = "DB7FCF8D-E0C6-4C99-A6B1-3FB6D703F97E" ?>
 <?define ExeName = "Atomex.Client.Wpf.exe" ?>
 
diff --git a/Atomex.Client.Wpf/Properties/Resources.Designer.cs b/Atomex.Client.Wpf/Properties/Resources.Designer.cs
index adf9fef..c382ba9 100644
--- a/Atomex.Client.Wpf/Properties/Resources.Designer.cs
+++ b/Atomex.Client.Wpf/Properties/Resources.Designer.cs
@@ -69,6 +69,15 @@ public static string ActiveSwapsWarning {
             }
         }
         
+        /// <summary>
+        ///   Ищет локализованную строку, похожую на Amount is greater than the available. Please use the Max button to get the maximum available value..
+        /// </summary>
+        public static string CvBigAmount {
+            get {
+                return ResourceManager.GetString("CvBigAmount", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Ищет локализованную строку, похожую на Conversion error. Please contant technical support..
         /// </summary>
@@ -205,11 +214,11 @@ public static string CvWarning {
         }
         
         /// <summary>
-        ///   Ищет локализованную строку, похожую на Amount to convert must be greater than zero..
+        ///   Ищет локализованную строку, похожую на Amount must be greater than zero..
         /// </summary>
-        public static string CvWrongAmount {
+        public static string CvZeroAmount {
             get {
-                return ResourceManager.GetString("CvWrongAmount", resourceCulture);
+                return ResourceManager.GetString("CvZeroAmount", resourceCulture);
             }
         }
         
diff --git a/Atomex.Client.Wpf/Properties/Resources.resx b/Atomex.Client.Wpf/Properties/Resources.resx
index e1594cd..2fe54c6 100644
--- a/Atomex.Client.Wpf/Properties/Resources.resx
+++ b/Atomex.Client.Wpf/Properties/Resources.resx
@@ -237,8 +237,8 @@
   <data name="CvWarning" xml:space="preserve">
     <value>Warning</value>
   </data>
-  <data name="CvWrongAmount" xml:space="preserve">
-    <value>Amount to convert must be greater than zero.</value>
+  <data name="CvBigAmount" xml:space="preserve">
+    <value>Amount is greater than the available. Please use the Max button to get the maximum available value.</value>
   </data>
   <data name="CvNoLiquidity" xml:space="preserve">
     <value>Not enough liquidity to convert a specified amount.</value>
@@ -296,4 +296,7 @@ NOTE: Do not sign out or close the application until the swap is completed, othe
   <data name="CvTooHighNetworkFee" xml:space="preserve">
     <value>Too high network fee for this amount ({0} is {1})!</value>
   </data>
+  <data name="CvZeroAmount" xml:space="preserve">
+    <value>Amount must be greater than zero.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Atomex.Client.Wpf/Styles/AmountTextBoxStyle.xaml b/Atomex.Client.Wpf/Styles/AmountTextBoxStyle.xaml
index 3ed1f43..ff9260d 100644
--- a/Atomex.Client.Wpf/Styles/AmountTextBoxStyle.xaml
+++ b/Atomex.Client.Wpf/Styles/AmountTextBoxStyle.xaml
@@ -129,4 +129,17 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <Style x:Key="ConversionAmountTextBox"
+           BasedOn="{StaticResource AmountTextBox}"
+           TargetType="{x:Type TextBox}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding IsAmountValid}" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource DefaultForegroundBrush}"/>
+            </DataTrigger>
+            <DataTrigger Binding="{Binding IsAmountValid}" Value="False">
+                <Setter Property="Foreground" Value="{DynamicResource InvalidAmountForegroundBrush}"/>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Atomex.Client.Wpf/Themes/blue.xaml b/Atomex.Client.Wpf/Themes/blue.xaml
index 1e6b152..55e7daa 100644
--- a/Atomex.Client.Wpf/Themes/blue.xaml
+++ b/Atomex.Client.Wpf/Themes/blue.xaml
@@ -233,6 +233,7 @@
     <SolidColorBrush x:Key="NoLiquidityForegroundBrush" Color="#e25b5b"/>
     <SolidColorBrush x:Key="MarketVolumeForegroundBrush" Color="AliceBlue"/>
     <SolidColorBrush x:Key="ConversionArrowBrush" Color="LightGray"/>
+    <SolidColorBrush x:Key="InvalidAmountForegroundBrush" Color="#e25b5b"/>
 
     <SolidColorBrush x:Key="SwapStateCanceledBackgroundBrush" Color="{DynamicResource UnconfirmedColor}"/>
     <SolidColorBrush x:Key="SwapStateCompletedBackgroundBrush" Color="{DynamicResource ConfirmedColor}"/>
diff --git a/Atomex.Client.Wpf/ViewModels/ConversionConfirmationViewModel.cs b/Atomex.Client.Wpf/ViewModels/ConversionConfirmationViewModel.cs
index 71097f0..2940c6a 100644
--- a/Atomex.Client.Wpf/ViewModels/ConversionConfirmationViewModel.cs
+++ b/Atomex.Client.Wpf/ViewModels/ConversionConfirmationViewModel.cs
@@ -148,7 +148,7 @@ private async Task<Error> ConvertAsync()
                     .ToList();
 
                 if (Amount == 0)
-                    return new Error(Errors.SwapError, Resources.CvWrongAmount);
+                    return new Error(Errors.SwapError, Resources.CvZeroAmount);
 
                 if (Amount > 0 && !fromWallets.Any())
                     return new Error(Errors.SwapError, Resources.CvInsufficientFunds);
diff --git a/Atomex.Client.Wpf/ViewModels/ConversionViewModel.cs b/Atomex.Client.Wpf/ViewModels/ConversionViewModel.cs
index fa4dfec..cb8d021 100644
--- a/Atomex.Client.Wpf/ViewModels/ConversionViewModel.cs
+++ b/Atomex.Client.Wpf/ViewModels/ConversionViewModel.cs
@@ -110,7 +110,8 @@ public virtual Currency FromCurrency
                 FromCurrencyViewModel = _currencyViewModels
                     .First(c => c.Currency.Name == _fromCurrency.Name);
 
-                Amount = 0;
+                _amount = 0;
+                _ = UpdateAmountAsync(_amount, updateUi: true);
             }
         }
 
@@ -233,10 +234,27 @@ public string BaseCurrencyFormat
         }
 
         protected decimal _amount;
-        public decimal Amount
+
+        public string AmountString
         {
-            get => _amount;
-            set { _ = UpdateAmountAsync(value); }
+            get => _amount.ToString(CurrencyFormat, CultureInfo.InvariantCulture);
+            set
+            {
+                if (!decimal.TryParse(value, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var amount))
+                    return;
+
+                _amount = amount.TruncateByFormat(CurrencyFormat);
+
+                if (_amount > long.MaxValue)
+                    _amount = long.MaxValue;
+
+                _ = UpdateAmountAsync(_amount, updateUi: false);
+            }
+        }
+
+        public string FromAmountString
+        {
+            get => _amount.ToString(CurrencyFormat, CultureInfo.InvariantCulture);
         }
 
         private decimal _amountInBase;
@@ -253,6 +271,13 @@ public bool IsAmountUpdating
             set { _isAmountUpdating = value; OnPropertyChanged(nameof(IsAmountUpdating)); }
         }
 
+        private bool _isAmountValid = true;
+        public bool IsAmountValid
+        {
+            get => _isAmountValid;
+            set { _isAmountValid = value; OnPropertyChanged(nameof(IsAmountValid)); }
+        }
+
         private decimal _targetAmount;
         public decimal TargetAmount
         {
@@ -458,9 +483,35 @@ public ConversionViewModel(
         public ICommand ConvertCommand => _convertCommand ??= new Command(OnConvertClick);
 
         private ICommand _maxAmountCommand;
-        public ICommand MaxAmountCommand => _maxAmountCommand ??= new Command(() =>
+        public ICommand MaxAmountCommand => _maxAmountCommand ??= new Command(async () =>
+        {
+            try
+            {
+                var swapParams = await Atomex.ViewModels.Helpers
+                    .EstimateSwapPaymentParamsAsync(
+                        amount: EstimatedMaxAmount,
+                        fromCurrency: FromCurrency,
+                        toCurrency: ToCurrency,
+                        account: App.Account,
+                        atomexClient: App.Terminal,
+                        symbolsProvider: App.SymbolsProvider);
+
+                _amount = Math.Min(swapParams.Amount, EstimatedMaxAmount);
+                _ = UpdateAmountAsync(_amount, updateUi: true);
+            }
+            catch (Exception e)
+            {
+                Log.Error(e, "Max amount command error.");
+            }
+        });
+
+
+        private ICommand _swapCurrenciesCommand;
+        public ICommand SwapCurrenciesCommand => _swapCurrenciesCommand ??= new Command(() =>
         {
-            Amount = EstimatedMaxAmount;
+            var temp = _toCurrency;
+            _toCurrency = _fromCurrency;
+            FromCurrency = temp;
         });
 
         private void SubscribeToServices()
@@ -471,7 +522,7 @@ private void SubscribeToServices()
                 App.QuotesProvider.QuotesUpdated += OnBaseQuotesUpdatedEventHandler;
         }
 
-        protected virtual async Task UpdateAmountAsync(decimal value)
+        protected virtual async Task UpdateAmountAsync(decimal value, bool updateUi = false)
         {
             Warning = string.Empty;
 
@@ -505,15 +556,19 @@ protected virtual async Task UpdateAmountAsync(decimal value)
                     Warning = string.Empty;
                 }
 
-                _amount = swapParams.Amount;
                 _estimatedPaymentFee = swapParams.PaymentFee;
                 _estimatedMakerNetworkFee = swapParams.MakerNetworkFee;
 
                 OnPropertyChanged(nameof(CurrencyFormat));
                 OnPropertyChanged(nameof(TargetCurrencyFormat));
-                OnPropertyChanged(nameof(Amount));
                 OnPropertyChanged(nameof(EstimatedPaymentFee));
                 OnPropertyChanged(nameof(EstimatedMakerNetworkFee));
+                OnPropertyChanged(nameof(FromAmountString));
+
+                IsAmountValid = _amount <= swapParams.Amount.TruncateByFormat(CurrencyFormat);
+
+                if (updateUi)
+                    OnPropertyChanged(nameof(AmountString));
 
                 await UpdateRedeemAndRewardFeesAsync();
 
@@ -681,7 +736,7 @@ protected async void OnQuotesUpdatedEventHandler(object sender, MarketDataEventA
             try
             {
                 var swapPriceEstimation = await Atomex.ViewModels.Helpers.EstimateSwapPriceAsync(
-                    amount: Amount,
+                    amount: _amount,
                     fromCurrency: FromCurrency,
                     toCurrency: ToCurrency,
                     account: App.Account,
@@ -749,9 +804,15 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
 
         private void OnConvertClick()
         {
-            if (Amount == 0)
+            if (_amount == 0)
+            {
+                DialogViewer.ShowMessage(Resources.CvWarning, Resources.CvZeroAmount);
+                return;
+            }
+
+            if (!IsAmountValid)
             {
-                DialogViewer.ShowMessage(Resources.CvWarning, Resources.CvWrongAmount);
+                DialogViewer.ShowMessage(Resources.CvWarning, Resources.CvBigAmount);
                 return;
             }
 
@@ -777,7 +838,7 @@ private void OnConvertClick()
             var side = symbol.OrderSideForBuyCurrency(ToCurrency);
             var price = EstimatedPrice;
             var baseCurrency = Currencies.GetByName(symbol.Base);
-            var qty = AmountHelper.AmountToQty(side, Amount, price, baseCurrency.DigitsMultiplier);
+            var qty = AmountHelper.AmountToQty(side, _amount, price, baseCurrency.DigitsMultiplier);
 
             if (qty < symbol.MinimumQty)
             {
@@ -808,7 +869,7 @@ private void OnConvertClick()
                 TargetFeeCurrencyCode = TargetFeeCurrencyCode,
                 TargetFeeCurrencyFormat = TargetFeeCurrencyFormat,
 
-                Amount = Amount,
+                Amount = _amount,
                 AmountInBase = AmountInBase,
                 TargetAmount = TargetAmount,
                 TargetAmountInBase = TargetAmountInBase,
@@ -836,7 +897,8 @@ private void OnConvertClick()
 
         private void OnSuccessConvertion(object sender, EventArgs e)
         {
-            Amount = _amount; // recalculate amount
+            _amount = Math.Min(_amount, EstimatedMaxAmount); // recalculate amount
+            _ = UpdateAmountAsync(_amount, updateUi: true);
         }
 
         private void DesignerMode()
diff --git a/Atomex.Client.Wpf/Views/ConversionView.xaml b/Atomex.Client.Wpf/Views/ConversionView.xaml
index 3ebbf2f..28ebe03 100644
--- a/Atomex.Client.Wpf/Views/ConversionView.xaml
+++ b/Atomex.Client.Wpf/Views/ConversionView.xaml
@@ -43,6 +43,7 @@
                     <RowDefinition/>
                     <RowDefinition/>
                     <RowDefinition/>
+                    <RowDefinition Height="30"/>
                 </Grid.RowDefinitions>
 
                 <TextBlock Text="From:"
@@ -75,6 +76,31 @@
                           Grid.Column="1"
                           Grid.Row="1"/>
 
+                <controls:RoundedButton
+                    Grid.Row="0"
+                    Grid.RowSpan="2"
+                    Grid.Column="1"
+                    Width="40"
+                    Height="40"
+                    CornerRadius="20"
+                    HorizontalAlignment="Right"
+                    Margin="0 0 20 0"
+                    Command="{Binding SwapCurrenciesCommand}">
+                    <controls:RoundedButton.Content>
+                        <Path Stretch="Uniform"
+                            SnapsToDevicePixels="False"
+                            UseLayoutRounding="False"
+                            Width="24"
+                            Height="24"
+                            Fill="{DynamicResource ConversionArrowBrush}"
+                            Data="{DynamicResource Unicons.ExchangeAlt}">
+                            <Path.LayoutTransform>
+                                <RotateTransform CenterX="0.5" CenterY="0.5" Angle="90"/>
+                            </Path.LayoutTransform>
+                        </Path>
+                    </controls:RoundedButton.Content>
+                </controls:RoundedButton>
+
                 <TextBlock Text="Amount:"
                            Grid.Column="0"
                            Grid.Row="2"
@@ -84,20 +110,13 @@
                          Margin="0 5 0 5"
                          FontSize="18"
                          Background="{DynamicResource DefaultSubstrateBrush}"
-                         Foreground="{DynamicResource DefaultForegroundBrush}"
+                         Text="{Binding AmountString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                          helpers:TextBoxHelper.CornerRadius="20"
                          helpers:AmountTextBoxHelper.CurrencyCode="{Binding CurrencyCode}"
                          helpers:AmountTextBoxHelper.BaseCurrencyCode="{Binding BaseCurrencyCode}"
-                         Style="{StaticResource AmountTextBox}"
+                         Style="{StaticResource ConversionAmountTextBox}"
                          Grid.Column="1"
                          Grid.Row="2">
-                    <TextBox.Text>
-                        <MultiBinding Converter="{StaticResource AmountToStringConverter}"
-                                      UpdateSourceTrigger="PropertyChanged">
-                            <Binding Path="Amount" Mode="TwoWay"/>
-                            <Binding Path="CurrencyFormat" Mode="OneWay"/>
-                        </MultiBinding>
-                    </TextBox.Text>
                     <helpers:AmountTextBoxHelper.AmountInBase>
                         <MultiBinding Converter="{StaticResource AmountToStringConverter}">
                             <Binding Path="AmountInBase" Mode="OneWay"/>
@@ -111,42 +130,44 @@
                     </i:Interaction.Behaviors>
                 </TextBox>
 
-                <controls:RoundedButton Height="25"
+                <controls:RoundedButton Height="27"
                                         Margin="7 0 0 0"
                                         Padding="15 0 15 0"
                                         CornerRadius="12"
                                         HorizontalAlignment="Left"
-                                        Opacity="0.8"
                                         ToolTip="Use the maximum currently available amount"
                                         Command="{Binding MaxAmountCommand}"
                                         Grid.Column="2"
-                                        Grid.Row="2">
+                                        Grid.Row="2"
+                                        Content="Max"
+                                        Style="{DynamicResource ConvertButtonStyle}"/>
 
-                    <controls:RoundedButton.Content>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock Foreground="{DynamicResource MarketVolumeForegroundBrush}"
+                <StackPanel Orientation="Horizontal"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Grid.Row="3"
+                            Grid.Column="1">
+                    <TextBlock Foreground="{DynamicResource MarketVolumeForegroundBrush}"
                                        FontSize="11"
                                        Text="Available:  "
                                        FontFamily="{DynamicResource DefaultButtonFontFamily}"/>
-                            <TextBlock Foreground="{DynamicResource MarketVolumeForegroundBrush}"
+                    <TextBlock Foreground="{DynamicResource MarketVolumeForegroundBrush}"
                                        FontSize="11"
                                        FontFamily="{DynamicResource DefaultButtonFontFamily}">
-                                <TextBlock.Text>
-                                    <MultiBinding Converter="{StaticResource AmountToStringConverter}"
+                        <TextBlock.Text>
+                            <MultiBinding Converter="{StaticResource AmountToStringConverter}"
                                                   UpdateSourceTrigger="PropertyChanged">
-                                        <Binding Path="EstimatedMaxAmount" Mode="OneWay"/>
-                                        <Binding Path="CurrencyFormat" Mode="OneWay"/>
-                                    </MultiBinding>
-                                </TextBlock.Text>
-                            </TextBlock>
-                            <TextBlock Foreground="{DynamicResource MarketVolumeForegroundBrush}"
+                                <Binding Path="EstimatedMaxAmount" Mode="OneWay"/>
+                                <Binding Path="CurrencyFormat" Mode="OneWay"/>
+                            </MultiBinding>
+                        </TextBlock.Text>
+                    </TextBlock>
+                    <TextBlock Foreground="{DynamicResource MarketVolumeForegroundBrush}"
                                        FontSize="9"
                                        Margin="3 0 0 1"
                                        VerticalAlignment="Bottom"
                                        Text="{Binding CurrencyCode}"/>
-                        </StackPanel>
-                    </controls:RoundedButton.Content>
-                </controls:RoundedButton>
+                </StackPanel>
             </Grid>
 
             <Border Height="Auto"
@@ -177,14 +198,8 @@
                         <TextBlock Foreground="{DynamicResource DefaultForegroundBrush}"
                                    FontSize="18"
                                    FontFamily="{DynamicResource DefaultFontFamily}"
+                                   Text="{Binding FromAmountString}"
                                    VerticalAlignment="Bottom">
-                            <TextBlock.Text>
-                                <MultiBinding Converter="{StaticResource AmountToStringConverter}"
-                                              UpdateSourceTrigger="PropertyChanged">
-                                    <Binding Path="Amount" Mode="TwoWay"/>
-                                    <Binding Path="CurrencyFormat" Mode="OneWay"/>
-                                </MultiBinding>
-                            </TextBlock.Text>
                         </TextBlock>
                         <TextBlock Margin="4 0 0 2"
                                    Foreground="{DynamicResource DefaultForegroundBrush}"