diff --git a/package.json b/package.json
index 393dac64c..c33d64cfd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "NativebaseKitchenSink",
-  "version": "2.7.0",
+  "version": "2.11.0",
   "private": true,
   "devDependencies": {
     "babel-eslint": "7.2.3",
@@ -33,11 +33,12 @@
     "color": "1.0.3",
     "lodash": "4.17.10",
     "moment": "2.13.0",
-    "native-base": "https://github.com/GeekyAnts/NativeBase#master",
+    "native-base": "2.11.0",
     "prop-types": "^15.6.2",
     "react": "16.5.0",
-    "react-native": "0.57.1",
+    "react-native": "0.58.3",
     "react-navigation": "1.5.0",
+    "scheduler": "^0.12.0",
     "styled-components": "^3.4.5"
   }
 }
\ No newline at end of file
diff --git a/src/screens/form/pickerInput.js b/src/screens/form/pickerInput.js
index 06b0d6e80..a9a91caf4 100644
--- a/src/screens/form/pickerInput.js
+++ b/src/screens/form/pickerInput.js
@@ -48,7 +48,7 @@ class PickerInput extends Component {
             <Item picker>
               <Picker
                 mode="dropdown"
-                iosIcon={<Icon name="ios-arrow-down-outline" />}
+                iosIcon={<Icon name="ios-arrow-down" />}
                 style={{ width: undefined }}
                 placeholder="Select your SIM"
                 placeholderStyle={{ color: "#bfc6ea" }}
diff --git a/src/screens/icon/basic.js b/src/screens/icon/basic.js
index 52a330472..ea6eef285 100644
--- a/src/screens/icon/basic.js
+++ b/src/screens/icon/basic.js
@@ -148,7 +148,7 @@ class BasicIcon extends Component {
             />
             <Icon
               active
-              name="game-controller-a"
+              name="logo-game-controller-a"
               style={{ width: 45, height: 45, justifyContent: "center" }}
             />
             <Icon
@@ -188,7 +188,7 @@ class BasicIcon extends Component {
               style={{ width: 45, height: 45, justifyContent: "center" }}
             />
             <Icon
-              name="ionic"
+              name="logo-ionic"
               style={{ width: 45, height: 45, justifyContent: "center" }}
             />
             <Icon
diff --git a/src/screens/icon/platform-specific.js b/src/screens/icon/platform-specific.js
index e3dd480d6..7efd331cb 100644
--- a/src/screens/icon/platform-specific.js
+++ b/src/screens/icon/platform-specific.js
@@ -42,7 +42,7 @@ class PlatformSpecificIcon extends Component {
                 <Text>person</Text>
               </Col>
               <Col style={styles.col}>
-                <Icon ios="ios-apps-outline" android="md-apps" />
+                <Icon ios="ios-apps" android="md-apps" />
                 <Text>apps</Text>
               </Col>
               <Col style={styles.col}>
@@ -54,7 +54,7 @@ class PlatformSpecificIcon extends Component {
                 <Text>paper</Text>
               </Col>
               <Col style={styles.col}>
-                <Icon ios="ios-cart-outline" android="md-cart" />
+                <Icon ios="ios-cart" android="md-cart" />
                 <Text>cart</Text>
               </Col>
             </Row>
diff --git a/src/screens/icon/state.js b/src/screens/icon/state.js
index a0ef7c411..3701586a2 100644
--- a/src/screens/icon/state.js
+++ b/src/screens/icon/state.js
@@ -227,7 +227,7 @@ class StateIcon extends Component {
                 </Text>
               </Col>
               <Col style={styles.col}>
-                <Icon name="ionic" />
+                <Icon name="logo-ionic" />
                 <Text numberOfLines={1} style={styles.iconText}>
                   ionic
                 </Text>
diff --git a/src/screens/list/list-icon.js b/src/screens/list/list-icon.js
index d89451ff9..347e6328c 100644
--- a/src/screens/list/list-icon.js
+++ b/src/screens/list/list-icon.js
@@ -58,7 +58,7 @@ class NHListIcon extends Component {
           <ListItem icon>
             <Left>
               <Button style={{ backgroundColor: "#FF9501" }}>
-                <Icon active name="plane" />
+                <Icon active name="airplane" />
               </Button>
             </Left>
             <Body>
diff --git a/src/screens/picker/backButtonPicker.js b/src/screens/picker/backButtonPicker.js
index 302cc1a3e..2748db644 100644
--- a/src/screens/picker/backButtonPicker.js
+++ b/src/screens/picker/backButtonPicker.js
@@ -47,7 +47,7 @@ class RegularPicker extends Component {
           <Form>
             <Picker
               mode="dropdown"
-              iosIcon={<Icon name="ios-arrow-down-outline" />}
+              iosIcon={<Icon name="ios-arrow-down" />}
               headerBackButtonText="Baaack!"
               style={{ width: undefined }}
               selectedValue={this.state.selected3}
diff --git a/src/screens/picker/customHeaderPicker.js b/src/screens/picker/customHeaderPicker.js
index a7d085538..06564129a 100644
--- a/src/screens/picker/customHeaderPicker.js
+++ b/src/screens/picker/customHeaderPicker.js
@@ -59,7 +59,7 @@ class RegularPicker extends Component {
                   <Right />
                 </Header>}
               mode="dropdown"
-              iosIcon={<Icon name="ios-arrow-down-outline" />}
+              iosIcon={<Icon name="ios-arrow-down" />}
               style={{ width: undefined }}
               selectedValue={this.state.selected1}
               onValueChange={this.onValueChange.bind(this)}
diff --git a/src/screens/picker/headerPicker.js b/src/screens/picker/headerPicker.js
index 6213cc96f..24f827bc9 100644
--- a/src/screens/picker/headerPicker.js
+++ b/src/screens/picker/headerPicker.js
@@ -51,7 +51,7 @@ class RegularPicker extends Component {
             <Picker
               mode="dropdown"
               iosHeader="Your Header"
-              iosIcon={<Icon name="ios-arrow-down-outline" />}
+              iosIcon={<Icon name="ios-arrow-down" />}
               style={{ width: Platform.OS === "ios" ? undefined : 120 }}
               selectedValue={this.state.selected4}
               onValueChange={this.onValueChange4.bind(this)}
diff --git a/src/screens/picker/headerStylePicker.js b/src/screens/picker/headerStylePicker.js
index dc947d3cc..ed71d26bc 100644
--- a/src/screens/picker/headerStylePicker.js
+++ b/src/screens/picker/headerStylePicker.js
@@ -47,7 +47,7 @@ class RegularPicker extends Component {
           <Form>
             <Picker
               mode="dropdown"
-              iosIcon={<Icon name="ios-arrow-down-outline" />}
+              iosIcon={<Icon name="ios-arrow-down" />}
               headerStyle={{ backgroundColor: "#b95dd3" }}
               headerBackButtonTextStyle={{ color: "#fff" }}
               headerTitleStyle={{ color: "#fff" }}
diff --git a/src/screens/picker/picker-text-itemtext.js b/src/screens/picker/picker-text-itemtext.js
index 5d579796a..3ed8884d2 100644
--- a/src/screens/picker/picker-text-itemtext.js
+++ b/src/screens/picker/picker-text-itemtext.js
@@ -47,7 +47,7 @@ class PickerTextItemText extends Component {
           <Form>
             <Picker
               mode="dropdown"
-              iosIcon={<Icon name="ios-arrow-down-outline" />}
+              iosIcon={<Icon name="ios-arrow-down" />}
               style={{ width: undefined }}
               placeholder="Select your SIM"
               textStyle={{ color: "#5cb85c" }}
diff --git a/src/screens/picker/picker-with-icon.js b/src/screens/picker/picker-with-icon.js
index 12f34919c..f32d14e83 100644
--- a/src/screens/picker/picker-with-icon.js
+++ b/src/screens/picker/picker-with-icon.js
@@ -48,7 +48,7 @@ class PickerWithIcon extends Component {
             <Picker
               mode="dropdown"
               iosHeader="Select your SIM"
-              iosIcon={<Icon name="ios-arrow-down-outline" />}
+              iosIcon={<Icon name="ios-arrow-down" />}
               style={{ width: undefined }}
               selectedValue={this.state.selected1}
               onValueChange={this.onValueChange.bind(this)}
diff --git a/src/screens/picker/placeholderPicker.js b/src/screens/picker/placeholderPicker.js
index f058f19b8..4fc58e1b9 100644
--- a/src/screens/picker/placeholderPicker.js
+++ b/src/screens/picker/placeholderPicker.js
@@ -47,7 +47,7 @@ class RegularPicker extends Component {
           <Form>
             <Picker
               mode="dropdown"
-              iosIcon={<Icon name="ios-arrow-down-outline" />}
+              iosIcon={<Icon name="ios-arrow-down" />}
               style={{ width: undefined }}
               placeholder="Select your SIM"
               placeholderStyle={{ color: "#bfc6ea" }}