diff --git a/screen/plausibledeniability.js b/screen/plausibledeniability.js
index cf5325d4d..0d61fa850 100644
--- a/screen/plausibledeniability.js
+++ b/screen/plausibledeniability.js
@@ -48,7 +48,7 @@ export default class PlausibleDeniability extends Component {
             <BlueButton
               icon={{
                 name: 'shield',
-                type: 'octicon',
+                type: 'font-awesome',
                 color: BlueApp.settings.buttonTextColor,
               }}
               title={loc.plausibledeniability.create_fake_storage}
diff --git a/screen/settings/about.js b/screen/settings/about.js
index 4a595cbe6..c24eaf563 100644
--- a/screen/settings/about.js
+++ b/screen/settings/about.js
@@ -54,8 +54,8 @@ export default class About extends Component {
 
             <BlueButton
               icon={{
-                name: 'mark-github',
-                type: 'octicon',
+                name: 'github',
+                type: 'font-awesome',
                 color: BlueApp.settings.buttonTextColor,
               }}
               onPress={() => {
@@ -93,8 +93,8 @@ export default class About extends Component {
 
             <BlueButton
               icon={{
-                name: 'thumbsup',
-                type: 'octicon',
+                name: 'thumbs-up',
+                type: 'font-awesome',
                 color: BlueApp.settings.buttonTextColor,
               }}
               onPress={() => {
diff --git a/screen/settings/encryptStorage.js b/screen/settings/encryptStorage.js
index 03f2fdb1f..1b7781232 100644
--- a/screen/settings/encryptStorage.js
+++ b/screen/settings/encryptStorage.js
@@ -58,7 +58,7 @@ export default class EncryptStorage extends Component {
                   <BlueButton
                     icon={{
                       name: 'shield',
-                      type: 'octicon',
+                      type: 'font-awesome',
                       color: BlueApp.settings.buttonTextColor,
                     }}
                     onPress={async () => {
diff --git a/screen/settings/lightningSettings.js b/screen/settings/lightningSettings.js
index e5b869b2f..77ce8d3ba 100644
--- a/screen/settings/lightningSettings.js
+++ b/screen/settings/lightningSettings.js
@@ -59,8 +59,8 @@ export default class LightningSettings extends Component {
 
         <Button
           icon={{
-            name: 'mark-github',
-            type: 'octicon',
+            name: 'github',
+            type: 'font-awesome',
             color: BlueApp.settings.buttonTextColor,
             backgroundColor: '#FFFFFF',
           }}
diff --git a/screen/transactions/RBF-create.js b/screen/transactions/RBF-create.js
index d100e2449..af18884c0 100644
--- a/screen/transactions/RBF-create.js
+++ b/screen/transactions/RBF-create.js
@@ -225,7 +225,7 @@ export default class SendCreate extends Component {
         {this.state.isLoading ? (
           <ActivtyIndicator />
         ) : (
-          <BlueButton icon={{ name: 'megaphone', type: 'octicon' }} onPress={() => this.broadcast()} title="Broadcast" />
+          <BlueButton icon={{ name: 'bullhorn', type: 'font-awesome' }} onPress={() => this.broadcast()} title="Broadcast" />
         )}
       </SafeBlueArea>
     );
diff --git a/screen/wallets/list.js b/screen/wallets/list.js
index fd0700999..ce451c4d4 100644
--- a/screen/wallets/list.js
+++ b/screen/wallets/list.js
@@ -25,7 +25,7 @@ export default class WalletsList extends Component {
         style={{ marginHorizontal: 16, width: 40, height: 40, justifyContent: 'center', alignItems: 'flex-end' }}
         onPress={() => navigation.navigate('Settings')}
       >
-        <Icon name="kebab-horizontal" size={22} type="octicon" color={BlueApp.settings.foregroundColor} />
+        <Icon size={22} name="ellipsis-h" type="font-awesome" color={BlueApp.settings.foregroundColor} />
       </TouchableOpacity>
     ),
   });
diff --git a/screen/wallets/scanQrWif.js b/screen/wallets/scanQrWif.js
index 5ed8db003..9c8c74e8b 100644
--- a/screen/wallets/scanQrWif.js
+++ b/screen/wallets/scanQrWif.js
@@ -255,7 +255,7 @@ export default class ScanQrWif extends React.Component {
                   >
                     <BlueText>{this.state.message}</BlueText>
                     <BlueButton
-                      icon={{ name: 'stop', type: 'octicon' }}
+                      icon={{ name: 'ban', type: 'font-awesome' }}
                       onPress={async () => {
                         this.setState({ message: false });
                         shold_stop_bip38 = true; // eslint-disable-line
diff --git a/screen/wallets/transactions.js b/screen/wallets/transactions.js
index 862f1ebfb..772702594 100644
--- a/screen/wallets/transactions.js
+++ b/screen/wallets/transactions.js
@@ -41,7 +41,7 @@ export default class WalletTransactions extends Component {
             })
           }
         >
-          <Icon name="kebab-horizontal" size={22} type="octicon" color="#FFFFFF" />
+          <Icon name="ellipsis-h" type="font-awesome" size={22} color="#FFFFFF" />
         </TouchableOpacity>
       ),
       headerStyle: {