diff --git a/src/components/General/Breadcrumb/Breadcrumb.tsx b/src/components/General/Breadcrumb/Breadcrumb.tsx
index 2ccdf8b0..f22954ca 100644
--- a/src/components/General/Breadcrumb/Breadcrumb.tsx
+++ b/src/components/General/Breadcrumb/Breadcrumb.tsx
@@ -1,25 +1,19 @@
-import { Text } from '@status-im/components'
-import { ChevronRightIcon } from '@status-im/icons'
 import { XStack } from 'tamagui'
+import BreadcrumbElement from './BreadcrumbElement'
 
-type BreadcrumbBarProps = {
+type BreadcrumbProps = {
   breadcrumbList: string[]
 }
 
-const Breadcrumb = ({ breadcrumbList }: BreadcrumbBarProps) => {
+const Breadcrumb = ({ breadcrumbList }: BreadcrumbProps) => {
   return (
     <XStack space={'$2'} alignItems="center">
-      {breadcrumbList.map((item, index) => {
-        const isNotLast = index !== breadcrumbList.length - 1
-        return (
-          <XStack space={'$2'} alignItems="center" key={index}>
-            <Text size={15} color={isNotLast ? '#647084' : ''}>
-              {item}
-            </Text>
-            {isNotLast && <ChevronRightIcon size={20} color="#647084" />}
-          </XStack>
-        )
-      })}
+      {breadcrumbList.map((element, index) => (
+        <BreadcrumbElement
+          element={element}
+          isLastElement={index === breadcrumbList.length - 1}
+        />
+      ))}
     </XStack>
   )
 }
diff --git a/src/components/General/Breadcrumb/BreadcrumbElement.tsx b/src/components/General/Breadcrumb/BreadcrumbElement.tsx
new file mode 100644
index 00000000..2ec0f3f6
--- /dev/null
+++ b/src/components/General/Breadcrumb/BreadcrumbElement.tsx
@@ -0,0 +1,26 @@
+import { Text } from '@status-im/components'
+import { ChevronRightIcon } from '@status-im/icons'
+import { XStack } from 'tamagui'
+
+type BreadcrumbElementProps = {
+  element: string
+  isLastElement: boolean
+}
+
+const BreadcrumbElement = ({
+  element,
+  isLastElement,
+}: BreadcrumbElementProps) => {
+  return (
+    <XStack space={'$2'} alignItems="center">
+      <Text size={15} color={isLastElement ? '' : '#647084'}>
+        {element}
+      </Text>
+      {isLastElement === false && (
+        <ChevronRightIcon size={20} color="#647084" />
+      )}
+    </XStack>
+  )
+}
+
+export default BreadcrumbElement