diff --git a/android/app/release/app-release.apk b/android/app/release/app-release.apk
index dd9d8df..7a4b600 100644
Binary files a/android/app/release/app-release.apk and b/android/app/release/app-release.apk differ
diff --git a/package.json b/package.json
index b01726c..bc0f8fc 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "react-native-qrcode-scanner": "^1.5.5",
     "react-native-qrcode-svg": "^5.2.0",
     "react-native-render-html": "^4.1.2",
+    "react-native-safe-area-context": "4.7.4",
     "react-native-screens": "^2.7.0",
     "react-native-searchable-dropdown": "^1.1.1",
     "react-native-signature-canvas": "^4.4.1",
diff --git a/src/navigation/MainNav.js b/src/navigation/MainNav.js
index 1011440..547d1fe 100644
--- a/src/navigation/MainNav.js
+++ b/src/navigation/MainNav.js
@@ -1,4 +1,4 @@
-import { createSwitchNavigator, createAppContainer, SafeAreaView } from 'react-navigation'
+import { createSwitchNavigator, createAppContainer } from 'react-navigation'
 import AuthStack from './AuthStack'
 import AppStack from './AppStack'
 import React from 'react'
@@ -6,6 +6,7 @@ import AppLoading from '../screens/app/AppLoading'
 import LanguageSelect from '../screens/app/LanguageSelect'
 import { View } from 'react-native'
 import NavigationService from '../utils/NavigationService'
+import {SafeAreaProvider, SafeAreaView} from "react-native-safe-area-context";
 
 const MainNav = createAppContainer(createSwitchNavigator({
   AppLoading,
@@ -19,10 +20,12 @@ export class AppNavContainer extends React.Component {
   }
 
   render () {
-    return <SafeAreaView style={{ flex: 1 }}>
-      <MainNav ref={navigatorRef => {NavigationService.setTopLevelNavigator(navigatorRef)}}/>
-    </SafeAreaView>
+    return <SafeAreaProvider>
+      <SafeAreaView style={{flex: 1}} edges={['top', 'bottom']}>
+        <MainNav ref={navigatorRef => {NavigationService.setTopLevelNavigator(navigatorRef)}}/>
+      </SafeAreaView>
+    </SafeAreaProvider>
   }
 }
 
-export default AppNavContainer
\ No newline at end of file
+export default AppNavContainer
diff --git a/yarn.lock b/yarn.lock
index 47e5d00..2402f83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7548,6 +7548,11 @@ react-native-render-html@^4.1.2:
     html-entities "^1.2.0"
     htmlparser2 "3.10.1"
 
+react-native-safe-area-context@4.7.4:
+  version "4.7.4"
+  resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-4.7.4.tgz#3dd8438971e70043d76f2428ede75b8a9639265e"
+  integrity sha512-3LR3DCq9pdzlbq6vsHGWBFehXAKDh2Ljug6jWhLWs1QFuJHM6AS2+mH2JfKlB2LqiSFZOBcZfHQFz0sGaA3uqg==
+
 react-native-safe-area-view@^0.14.9:
   version "0.14.9"
   resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.9.tgz#90ee8383037010d9a5055a97cf97e4c1da1f0c3d"