diff --git a/BlueComponents.js b/BlueComponents.js
index 7cc04b36..b8537bf7 100644
--- a/BlueComponents.js
+++ b/BlueComponents.js
@@ -158,7 +158,7 @@ export const BlueNavigationStyle = (navigation, withNavigationCloseButton = fals
   headerTintColor: '#0c2550',
   headerRight: withNavigationCloseButton ? (
     <TouchableOpacity style={{ marginHorizontal: 16 }} onPress={() => navigation.goBack(null)}>
-      <Icon name="times" size={24} type="font-awesome" color="#0c2550" />
+      <Image source={require('./img/close.png')} />
     </TouchableOpacity>
   ) : null,
   headerBackTitle: null,
diff --git a/img/close.png b/img/close.png
new file mode 100755
index 00000000..5b2e38c8
Binary files /dev/null and b/img/close.png differ
diff --git a/img/close@2x.png b/img/close@2x.png
new file mode 100755
index 00000000..6f8179fd
Binary files /dev/null and b/img/close@2x.png differ
diff --git a/img/close@3x.png b/img/close@3x.png
new file mode 100755
index 00000000..0532d6c5
Binary files /dev/null and b/img/close@3x.png differ
diff --git a/screen/settings/settings.js b/screen/settings/settings.js
index db6643b0..eaf2754c 100644
--- a/screen/settings/settings.js
+++ b/screen/settings/settings.js
@@ -39,7 +39,7 @@ export default class Settings extends Component {
             <BlueListItem title={loc.settings.encrypt_storage} />
           </TouchableOpacity>
           <TouchableOpacity onPress={() => this.props.navigation.navigate('Language')}>
-            <BlueListItem title={loc.settings.language}  />
+            <BlueListItem title={loc.settings.language} />
           </TouchableOpacity>
           <BlueListItem title={loc.settings.currency} />
           <TouchableOpacity onPress={() => this.props.navigation.navigate('About')}>
diff --git a/screen/wallets/list.js b/screen/wallets/list.js
index 9ba349fd..599d6f57 100644
--- a/screen/wallets/list.js
+++ b/screen/wallets/list.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { View, TouchableOpacity, Text, FlatList, RefreshControl, LayoutAnimation, ScrollView } from 'react-native';
+import { View, TouchableOpacity, Text, FlatList, RefreshControl, ScrollView } from 'react-native';
 import {
   BlueTransactionOnchainIcon,
   BlueLoading,
@@ -21,23 +21,6 @@ let A = require('../../analytics');
 /** @type {AppStorage} */
 let BlueApp = require('../../BlueApp');
 let loc = require('../../loc');
-const customLayoutSpringAnimation = {
-  duration: 300,
-  create: {
-    type: LayoutAnimation.Types.spring,
-    property: LayoutAnimation.Properties.scaleXY,
-    springDamping: 0.7,
-  },
-  update: {
-    type: LayoutAnimation.Types.spring,
-    springDamping: 0.7,
-  },
-  delete: {
-    type: LayoutAnimation.Types.spring,
-    property: LayoutAnimation.Properties.scaleXY,
-    springDamping: 0.7,
-  },
-};
 
 export default class WalletsList extends Component {
   static navigationOptions = ({ navigation }) => ({
@@ -66,12 +49,6 @@ export default class WalletsList extends Component {
 
   async componentDidMount() {
     this.refreshFunction();
-
-    LayoutAnimation.configureNext(customLayoutSpringAnimation);
-    this.setState({
-      isLoading: false,
-      dataSource: BlueApp.getTransactions(),
-    });
   }
 
   /**
@@ -149,7 +126,6 @@ export default class WalletsList extends Component {
   onSnapToItem(index) {
     console.log('onSnapToItem', index);
     this.lastSnappedTo = index;
-    LayoutAnimation.configureNext(customLayoutSpringAnimation);
 
     if (index < BlueApp.getWallets().length) {
       // not the last