diff --git a/src/components/BottomModal.js b/src/components/BottomModal.js
index fc4f985f0f..7193cbf33a 100644
--- a/src/components/BottomModal.js
+++ b/src/components/BottomModal.js
@@ -104,6 +104,7 @@ const BottomModal = ({
           </View>
         </View>
       </ReactNativeModal>
+    </ButtonUseTouchable.Provider>
   );
 };
 
diff --git a/src/families/polkadot/NominateFlow/ValidatorItem.js b/src/families/polkadot/NominateFlow/ValidatorItem.js
index b3e70514d2..1285ec87c8 100644
--- a/src/families/polkadot/NominateFlow/ValidatorItem.js
+++ b/src/families/polkadot/NominateFlow/ValidatorItem.js
@@ -1,6 +1,6 @@
 // @flow
 import React, { memo, useCallback, useMemo } from "react";
-import { View, StyleSheet, TouchableOpacity } from "react-native";
+import { View, StyleSheet } from "react-native";
 import { Trans } from "react-i18next";
 import { Polkadot as PolkadotIdenticon } from "@polkadot/reactnative-identicon/icons";
 
diff --git a/src/navigation/styles.js b/src/navigation/styles.js
index f8e3634cc4..c7f808b5a1 100644
--- a/src/navigation/styles.js
+++ b/src/navigation/styles.js
@@ -2,26 +2,15 @@
 import { StyleSheet, Platform } from "react-native";
 
 let headerStyle = {};
-let headerStyleShadow = {};
 
 if (Platform.OS === "ios") {
   headerStyle = {
     borderBottomWidth: 0,
   };
-  headerStyleShadow = {
-    shadowOpacity: 0.03,
-    shadowRadius: 8,
-    shadowOffset: {
-      height: 4,
-    },
-  };
 } else {
   headerStyle = {
     elevation: 0,
   };
-  headerStyleShadow = {
-    borderBottomWidth: 1,
-  };
 }
 
 function Styles() {
diff --git a/src/screens/AddAccounts/01-SelectCrypto.js b/src/screens/AddAccounts/01-SelectCrypto.js
index c066ddd1ea..0f3b7425fb 100644
--- a/src/screens/AddAccounts/01-SelectCrypto.js
+++ b/src/screens/AddAccounts/01-SelectCrypto.js
@@ -17,7 +17,6 @@ import { useTheme } from "@react-navigation/native";
 import { ScreenName } from "../../const";
 import { TrackScreen } from "../../analytics";
 import FilteredSearchBar from "../../components/FilteredSearchBar";
-import KeyboardView from "../../components/KeyboardView";
 import CurrencyRow from "../../components/CurrencyRow";
 import LText from "../../components/LText";
 
diff --git a/src/screens/ReceiveFunds/02-ConnectDevice.js b/src/screens/ReceiveFunds/02-ConnectDevice.js
index 2548468eb0..df42ab00d9 100644
--- a/src/screens/ReceiveFunds/02-ConnectDevice.js
+++ b/src/screens/ReceiveFunds/02-ConnectDevice.js
@@ -13,7 +13,6 @@ import type { AccountLike } from "@ledgerhq/live-common/lib/types";
 import { createAction } from "@ledgerhq/live-common/lib/hw/actions/app";
 import connectApp from "@ledgerhq/live-common/lib/hw/connectApp";
 
-import { useTheme } from "@react-navigation/native";
 import { accountScreenSelector } from "../../reducers/accounts";
 import { ScreenName } from "../../const";
 import { TrackScreen } from "../../analytics";
@@ -50,8 +49,6 @@ export default function ConnectDevice({ navigation, route }: Props) {
   const readOnlyModeEnabled = useSelector(readOnlyModeEnabledSelector);
   const [device, setDevice] = useState<?Device>();
 
-  const { colors } = useTheme();
-
   useEffect(() => {
     const readOnlyTitle = "transfer.receive.titleReadOnly";
     if (readOnlyModeEnabled && route.params?.title !== readOnlyTitle) {
diff --git a/src/screens/Settings/General/index.js b/src/screens/Settings/General/index.js
index 35ac4bc91f..8b9bf3c1cd 100644
--- a/src/screens/Settings/General/index.js
+++ b/src/screens/Settings/General/index.js
@@ -1,6 +1,5 @@
 /* @flow */
 import React from "react";
-import { StyleSheet } from "react-native";
 import { TrackScreen } from "../../../analytics";
 import CountervalueSettingsRow from "./CountervalueSettingsRow";
 import ThemeSettingsRow from "./ThemeSettingsRow";
@@ -27,7 +26,3 @@ export default function GeneralSettings() {
     </NavigationScrollView>
   );
 }
-
-const styles = StyleSheet.create({
-  root: { paddingTop: 16, paddingBottom: 64 },
-});
diff --git a/src/screens/Swap/Connect.js b/src/screens/Swap/Connect.js
index 9a401395ea..a96fd6f4e6 100644
--- a/src/screens/Swap/Connect.js
+++ b/src/screens/Swap/Connect.js
@@ -20,7 +20,7 @@ const Connect = ({
   provider?: string,
 }) => {
   const [device, setDevice] = useState(null);
-  const [result, setLocalResult] = useState();
+  const [result] = useState();
 
   const onModalHide = useCallback(() => {
     if (result) {
diff --git a/src/screens/VerifyAccount/VerifyAddress.js b/src/screens/VerifyAccount/VerifyAddress.js
index 3023adc52f..5491439327 100644
--- a/src/screens/VerifyAccount/VerifyAddress.js
+++ b/src/screens/VerifyAccount/VerifyAddress.js
@@ -20,7 +20,7 @@ function VerifyAddress({
   device: ?Device,
   onResult: (confirmed: boolean, error?: Error) => void,
 }) {
-  const { theme } = useTheme();
+  const { dark } = useTheme();
   const { t } = useTranslation();
 
   const onConfirmAddress = useCallback(async () => {