diff --git a/components/Icon.js b/components/Icon.js
index 4a768ad..eb3e922 100644
--- a/components/Icon.js
+++ b/components/Icon.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Font } from 'expo';
+import * as Font from 'expo-font';
 import { createIconSetFromIcoMoon } from '@expo/vector-icons';
 import { Icon } from 'galio-framework';
 
diff --git a/package.json b/package.json
index a6522e8..792b34f 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "expo": "^33.0.0",
+    "expo-font": "^5.0.1",
     "galio-framework": "^0.5.3",
     "prop-types": "^15.7.2",
     "react": "16.8.3",
diff --git a/screens/Elements.js b/screens/Elements.js
index aedd7bf..a6e58f7 100644
--- a/screens/Elements.js
+++ b/screens/Elements.js
@@ -286,8 +286,8 @@ class Elements extends React.Component {
               <Block row middle space="between" style={{ paddingTop: 7 }}>
                 <Text size={14}>Manage Options</Text>
                 <Icon
-                  name="stre-right"
-                  family="Galio"
+                  name="chevron-right"
+                  family="entypo"
                   style={{ paddingRight: 5 }}
                 />
               </Block>
@@ -312,7 +312,7 @@ class Elements extends React.Component {
                 onlyIcon
                 shadowless
                 icon="facebook"
-                iconFamily="FontAwesome"
+                iconFamily="Font-Awesome"
                 iconColor={theme.COLORS.WHITE}
                 iconSize={theme.SIZES.BASE * 1.625}
                 color={theme.COLORS.FACEBOOK}
@@ -325,7 +325,7 @@ class Elements extends React.Component {
                 onlyIcon
                 shadowless
                 icon="twitter"
-                iconFamily="FontAwesome"
+                iconFamily="Font-Awesome"
                 iconColor={theme.COLORS.WHITE}
                 iconSize={theme.SIZES.BASE * 1.625}
                 color={theme.COLORS.TWITTER}
@@ -338,7 +338,7 @@ class Elements extends React.Component {
                 onlyIcon
                 shadowless
                 icon="dribbble"
-                iconFamily="FontAwesome"
+                iconFamily="Font-Awesome"
                 iconColor={theme.COLORS.WHITE}
                 iconSize={theme.SIZES.BASE * 1.625}
                 color={theme.COLORS.DRIBBBLE}
diff --git a/screens/Register.js b/screens/Register.js
index 82e8f6e..d24fe49 100644
--- a/screens/Register.js
+++ b/screens/Register.js
@@ -33,7 +33,7 @@ class Register extends React.Component {
                     <Block row>
                       <Icon
                         name="logo-github"
-                        family="Ionicons"
+                        family="Ionicon"
                         size={14}
                         color={"black"}
                         style={{ marginTop: 2, marginRight: 5 }}
@@ -45,7 +45,7 @@ class Register extends React.Component {
                     <Block row>
                       <Icon
                         name="logo-google"
-                        family="Ionicons"
+                        family="Ionicon"
                         size={14}
                         color={"black"}
                         style={{ marginTop: 2, marginRight: 5 }}