diff --git a/src/components/AvatarHeader.tsx b/src/components/AvatarHeader.tsx
index 490e11f3..bdc705f2 100644
--- a/src/components/AvatarHeader.tsx
+++ b/src/components/AvatarHeader.tsx
@@ -16,6 +16,7 @@ export interface AvatarHeaderProps {
   /** @default 0.2 */
   headerHeightModifier?: number,
   fallbackIcon?: keyof typeof iconRegistry
+  fallbackIconComponent?: React.ReactNode
   headerBgColor?: string
   encircle?: boolean
   children?: React.ReactNode
@@ -38,13 +39,22 @@ export const AvatarHeader = observer(function (props: AvatarHeaderProps) {
             source={{ uri: getImageSource(props.picture) }}
           />
         ) : (
-          <View style={props?.encircle ? $encircledIcon(borderColor, props?.pictureHeight) : {}}>
-            <Icon
-              icon={props?.fallbackIcon ?? 'faCircleUser'}
-              size={props?.encircle ? 35 : (props?.pictureHeight ?? 80)}
-              color='white'
-            />
-          </View> 
+          <>
+            {props.fallbackIconComponent && (
+              <View style={props?.encircle ? $encircledIcon(borderColor, props?.pictureHeight) : {}}>
+                {props.fallbackIconComponent}
+              </View>
+            )}
+            {props.fallbackIcon && !props.fallbackIconComponent && (
+              <View style={props?.encircle ? $encircledIcon(borderColor, props?.pictureHeight) : {}}>
+              <Icon
+                icon={props?.fallbackIcon ?? 'faCircleUser'}
+                size={props?.encircle ? 35 : (props?.pictureHeight ?? 80)}
+                color='white'
+              />
+            </View> 
+            )}
+          </> 
         )}
       </View>
       {props.heading && <Text style={{ fontSize: 26, lineHeight: 40 }} text={props.heading} adjustsFontSizeToFit={true} numberOfLines={1} />}
diff --git a/src/screens/MintInfoScreen.tsx b/src/screens/MintInfoScreen.tsx
index 116f71e5..20534eff 100644
--- a/src/screens/MintInfoScreen.tsx
+++ b/src/screens/MintInfoScreen.tsx
@@ -16,6 +16,7 @@ import {
   InfoModal,
   ListItem,
   Loading,
+  MintIcon,
   Screen,
   Text,
 } from '../components'
@@ -31,6 +32,7 @@ import useColorScheme from '../theme/useThemeColor'
 import AppError, { Err } from '../utils/AppError'
 import { useHeader } from '../utils/useHeader'
 import { CurrencySign } from './Wallet/CurrencySign'
+import { SvgXml } from 'react-native-svg'
 
 
 if (Platform.OS === 'android' && UIManager.setLayoutAnimationEnabledExperimental) {
@@ -41,6 +43,7 @@ interface DetailedNutInfo {
   methods: Array<SwapMethod>;
   disabled: boolean;
 }
+
 interface MethodLimit {
   min?: number,
   max?: number,
@@ -327,23 +330,6 @@ export const MintInfoScreen: FC<SettingsStackScreenProps<'MintInfo'>> = observer
   useHeader({
     leftIcon: 'faArrowLeft',
     onLeftPress: () => {
-      /*const routes = navigation.getState()?.routes
-      let prevRouteName: string = ''
-
-      if(routes.length >= 2) {
-          prevRouteName = routes[routes.length - 2].name
-      }            
-
-      log.trace('prevRouteName', {prevRouteName, routes})
-
-      if(prevRouteName === 'Mints') {
-          navigation.navigate('Mints', {})
-      } else {                
-          navigation.dispatch(
-              StackActions.replace('Settings')                    
-          )
-          navigation.navigate('WalletNavigator', {screen: 'Wallet'})
-      } */
       navigation.goBack()
     },
   })
@@ -373,6 +359,9 @@ export const MintInfoScreen: FC<SettingsStackScreenProps<'MintInfo'>> = observer
         if (mint) {
           const info: GetInfoResponse = await MintClient.getMintInfo(mint.mintUrl)
           mint.setStatus(MintStatus.ONLINE)
+          if(info.name && info.name !== mint.shortname) {
+            await mint.setShortname()
+          }
           setMintInfo(info)
           setMint(mint)
         } else {
@@ -414,8 +403,15 @@ export const MintInfoScreen: FC<SettingsStackScreenProps<'MintInfo'>> = observer
   return (
     <Screen style={$screen} preset="scroll">
       <AvatarHeader
-        encircle={true}
-        fallbackIcon="faBank"
+        encircle={false}        
+        fallbackIconComponent={
+          <SvgXml 
+              width={60} 
+              height={60} 
+              xml={MintIcon}
+              fill='white'
+          />
+        }
         headerHeightModifier={0.26}
         heading={mintInfo?.name ?? translate('mintInfo.loadingNamePlaceholder')}
         text={route.params.mintUrl}>