diff --git a/src/components/General/TagContainer.tsx b/src/components/General/TagContainer.tsx
index 42dbfd0d..4b11be71 100644
--- a/src/components/General/TagContainer.tsx
+++ b/src/components/General/TagContainer.tsx
@@ -1,14 +1,13 @@
 import { Tag } from '@status-im/components'
 import { XStack } from 'tamagui'
-import PairIcon from '../Icons/PairIcon'
-import CreateIcon from '../Icons/CreateIcon'
 import './TagContainer.css'
+import { AddSmallIcon, SwapIcon } from '@status-im/icons'
 
 const TagContainer = () => {
   return (
     <XStack space={'$2'} alignItems="center" className="tag-container">
-      <Tag icon={PairIcon} label="Pair" size={32} />
-      <Tag selected icon={CreateIcon} label="Create" size={32} />
+      <Tag icon={SwapIcon} label="Pair" size={32} />
+      <Tag selected icon={AddSmallIcon} label="Create" size={32} />
     </XStack>
   )
 }
diff --git a/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx b/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx
index 8422dbbb..5454b378 100644
--- a/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx
+++ b/src/pages/DeviceHealthCheck/DeviceHealthCheck.tsx
@@ -13,9 +13,8 @@ import { useSelector } from 'react-redux'
 import { RootState } from '../../redux/store'
 
 const DeviceHealthCheck = () => {
- 
   const deviceHealthState = useSelector((state: RootState) => state.deviceHealth)
-  console.log(deviceHealthState)
+
   return (
     <PageWrapperShadow rightImageSrc="/background-images/eye-background.png">
       <YStack
diff --git a/src/pages/PairDevice/PairDevice.tsx b/src/pages/PairDevice/PairDevice.tsx
index 21696fee..dc7643b7 100644
--- a/src/pages/PairDevice/PairDevice.tsx
+++ b/src/pages/PairDevice/PairDevice.tsx
@@ -5,18 +5,16 @@ import { Button, Checkbox, Tag, Text } from '@status-im/components'
 import PageWrapperShadow from '../../components/PageWrappers/PageWrapperShadow'
 import SyncStatus from './SyncStatus'
 import NimbusLogo from '../../components/Logos/NimbusLogo'
-import PairIcon from '../../components/Icons/PairIcon'
-import CreateIcon from '../../components/Icons/CreateIcon'
-import NodeIcon from '../../components/Icons/NodeIcon'
 import Titles from '../../components/General/Titles'
 import PairedSuccessfully from './PairedSuccessfully'
-import { CreateAvatar } from './CreateAvatar'
+import CreateAvatar from './CreateAvatar'
 import GenerateId from './GenerateId'
+import { AddSmallIcon, NodeIcon, SwapIcon } from '@status-im/icons'
 
 const PairDevice = () => {
   const [autoChecked, setAutoChecked] = useState(false)
   const [isAwaitingPairing, setIsAwaitingPairing] = useState(false)
-  const isPaired = false
+  const isPaired = true
   const isPairing = true
 
   const changeSetIsAwaitingPairing = (result: boolean) => {
@@ -34,8 +32,8 @@ const PairDevice = () => {
         <XStack style={{ justifyContent: 'space-between' }}>
           <NimbusLogo />
           <XStack space={'$2'} style={{ alignItems: 'center' }}>
-            <Tag icon={PairIcon} label="Pair" size={32} selected />
-            <Tag icon={CreateIcon} label="Create" size={32} />
+            <Tag icon={SwapIcon} label="Pair" size={32} selected />
+            <Tag icon={AddSmallIcon} label="Create" size={32} />
           </XStack>
         </XStack>
         <Titles title="Pair Device" subtitle="Pair your device to the Nimbus Node Manager" />
@@ -66,7 +64,7 @@ const PairDevice = () => {
         {isPaired && <CreateAvatar></CreateAvatar>}
         <Separator borderColor={'#e3e3e3'} />
         <XStack>
-          <Button icon={<NodeIcon />} disabled={!isPaired}>
+          <Button icon={<NodeIcon size={20} />} disabled={!isPaired}>
             Continue
           </Button>
         </XStack>