diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js
index 2daef79d..12a0dc69 100644
--- a/frontend/src/components/BottomBar.js
+++ b/frontend/src/components/BottomBar.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react'
 import { withTranslation } from "react-i18next";
 import { Badge, Tooltip, ListItemAvatar, Avatar,Paper, Grid, IconButton, Select, MenuItem, ListItemText, ListItem, ListItemIcon, ListItemButton } from "@mui/material";
 import MediaQuery from 'react-responsive'
+import Flags from 'country-flag-icons/react/3x2'
 
 // Icons
 import SettingsIcon from '@mui/icons-material/Settings';
@@ -255,6 +256,10 @@ bottomBarDesktop =()=>{
 
     LangSelect = () => {
         const { i18n} = this.props;
+        const flagProps = {
+            width: 20,
+            height: 20,
+          };
         return(
             <Select
                 size = 'small'
@@ -262,15 +267,17 @@ bottomBarDesktop =()=>{
                 inputProps={{
                     style: {textAlign:"center"}
                 }}
+                renderValue={(value)=>value.toUpperCase()}
                 onChange={this.handleChangeLang}>
-                    <MenuItem value={'en'}>EN</MenuItem>
-                    <MenuItem value={'es'}>ES</MenuItem>
-                    <MenuItem value={'de'}>DE</MenuItem>
-                    <MenuItem value={'pl'}>PL</MenuItem>
-                    <MenuItem value={'fr'}>FR</MenuItem>
-                    <MenuItem value={'ca'}>CA</MenuItem>
-                    <MenuItem value={'ru'}>RU</MenuItem>
-                    <MenuItem disabled={true} value={'zh'}>ZH</MenuItem>
+                    <MenuItem value={'en'}><div style={{width:24,position:"relative",top:3}}><Flags.US {...flagProps}/></div>EN</MenuItem>
+                    <MenuItem value={'es'}><div style={{width:24,position:"relative",top:3}}><Flags.ES {...flagProps}/></div>ES</MenuItem>
+                    <MenuItem value={'de'}><div style={{width:24,position:"relative",top:3}}><Flags.DE {...flagProps}/></div>DE</MenuItem>
+                    <MenuItem value={'pl'}><div style={{width:24,position:"relative",top:3}}><Flags.PL {...flagProps}/></div>PL</MenuItem>
+                    <MenuItem value={'fr'}><div style={{width:24,position:"relative",top:3}}><Flags.FR {...flagProps}/></div>FR</MenuItem>
+                    <MenuItem value={'ru'}><div style={{width:24,position:"relative",top:3}}><Flags.RU {...flagProps}/></div>RU</MenuItem>
+                    <MenuItem value={'it'}><div style={{width:24,position:"relative",top:3}}><Flags.IT {...flagProps}/></div>IT</MenuItem>
+                    <MenuItem disabled={true} value={'zh'}><div style={{width:24,position:"relative",top:3}}><Flags.CN {...flagProps}/></div>ZH</MenuItem>
+                    <MenuItem value={'ca'}>CAT</MenuItem>
                 </Select>
         )
     }
diff --git a/frontend/src/components/MakerPage.js b/frontend/src/components/MakerPage.js
index 3615a4f1..22efef53 100644
--- a/frontend/src/components/MakerPage.js
+++ b/frontend/src/components/MakerPage.js
@@ -436,11 +436,17 @@ class MakerPage extends Component {
                             />
                     </div>
                 <Grid item>
-                <Tooltip placement="top" enterTouchDelay={0} enterDelay={1000} enterNextDelay={2000} title={this.state.is_explicit? t("Your order fixed exchange rate"): t("Your order's current exchange rate. Rate will move with the market.")}>
-                    <Typography variant="caption" color="text.secondary">
-                        {(this.state.is_explicit ? t("Order rate:"): t("Order current rate:"))+" "+pn(this.priceNow())+" "+this.state.currencyCode+"/BTC"}
-                    </Typography>
-                </Tooltip>
+                    <div style={{ display: this.state.loadingLimits == true ? '':'none'}}>
+                        <div style={{height:4}}/>
+                        <LinearProgress />
+                    </div>
+                    <div style={{ display: this.state.loadingLimits == false ? '':'none'}}>
+                        <Tooltip placement="top" enterTouchDelay={0} enterDelay={1000} enterNextDelay={2000} title={this.state.is_explicit? t("Your order fixed exchange rate"): t("Your order's current exchange rate. Rate will move with the market.")}>
+                            <Typography variant="caption" color="text.secondary">
+                                {(this.state.is_explicit ? t("Order rate:"): t("Order current rate:"))+" "+pn(this.priceNow())+" "+this.state.currencyCode+"/BTC"}
+                            </Typography>
+                        </Tooltip>
+                    </div>
                 </Grid>
                 </Grid>
             </Paper>
diff --git a/frontend/src/components/i18n.js b/frontend/src/components/i18n.js
index 32981737..731cc01c 100644
--- a/frontend/src/components/i18n.js
+++ b/frontend/src/components/i18n.js
@@ -11,6 +11,7 @@ import translationRU from "../locales/ru.json";
 import translationPL from "../locales/pl.json";
 import translationFR from "../locales/fr.json";
 import translationCA from "../locales/ca.json";
+import translationIT from "../locales/it.json";
 
 i18n
   .use(HttpApi)
@@ -26,6 +27,7 @@ i18n
     pl: {translations: translationPL},
     fr: {translations: translationFR},
     ca: {translations: translationCA},
+    it: {translations: translationIT},
   },
   
   fallbackLng: "en",
diff --git a/frontend/src/locales/it.json b/frontend/src/locales/it.json
index 0238ed67..8726ade8 100644
--- a/frontend/src/locales/it.json
+++ b/frontend/src/locales/it.json
@@ -271,8 +271,7 @@
     "Learn how to verify":"Impara come verificare",
     "Your PGP public key. Your peer uses it to encrypt messages only you can read.":"La tua chiave PGP pubblica. Il tuo pari la utilizza per cifrare i messaggi che solo tu puoi leggere.",
     "Your public key":"La tua chiave pubblica",
-    "Your peer PGP public key. You use it to encrypt messages only he can read and to verify your peer signed the incoming messages.":"La chiave PGP pubblica del tuo pari. La utilizzi per cifrare i messaggi che solo il tuo pari può leggere e per verificare che la firma del tuo pari nei messaggi che ricevi.
-	",
+    "Your peer PGP public key. You use it to encrypt messages only he can read and to verify your peer signed the incoming messages.":"La chiave PGP pubblica del tuo pari. La utilizzi per cifrare i messaggi che solo il tuo pari può leggere e per verificare che la firma del tuo pari nei messaggi che ricevi.",
     "Peer public key":"La chiave pubblica del tuo pari",
     "Your encrypted private key. You use it to decrypt the messages that your peer encrypted for you. You also use it to sign the messages you send.":"La tua chiave privata cifrata. La utilizzi per decifrare i messaggi che il tuo pari ha cifrato per te. La usi anche quando firmi i messaggi che invii.",
     "Your encrypted private key":"La tua chiave privata cifrata",