diff --git a/src/components/atoms/SecondaryLabel.tsx b/src/components/atoms/SecondaryLabel.tsx
new file mode 100644
index 00000000..9206214a
--- /dev/null
+++ b/src/components/atoms/SecondaryLabel.tsx
@@ -0,0 +1,25 @@
+/** @jsxImportSource theme-ui */
+import { Text } from '@theme-ui/components'
+import React from 'react'
+
+interface SeconadryLabelProps {
+  children: React.ReactNode
+}
+
+const SecondaryLabel = ({ children }: SeconadryLabelProps) => {
+  return (
+    <Text
+      as='small'
+      sx={{
+        fontSize: 2,
+        color: 'secondary',
+        fontWeight: 'heading',
+        fontFamily: 'monospace',
+      }}
+    >
+      {children}
+    </Text>
+  )
+}
+
+export default SecondaryLabel
diff --git a/src/components/pages/SingleStigmataPage.tsx b/src/components/pages/SingleStigmataPage.tsx
index 39588c3c..9a4b58b5 100644
--- a/src/components/pages/SingleStigmataPage.tsx
+++ b/src/components/pages/SingleStigmataPage.tsx
@@ -1,12 +1,13 @@
 /** @jsxImportSource theme-ui */
 import { StigmataData, StigmataSet } from '../../lib/honkai3rd/stigmata'
 import Image from 'next/image'
-import { Box, Heading, Text, Paragraph, Card, Flex } from '@theme-ui/components'
+import { Box, Heading, Paragraph, Card, Flex } from '@theme-ui/components'
 import PageLink from '../../components/atoms/PageLink'
 import StigmataCard from '../../components/molecules/StigmataCard'
 import Breadcrumb from '../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../components/organisms/Honkai3rdNavigator'
 import { capitalize } from '../../lib/string'
+import SecondaryLabel from '../atoms/SecondaryLabel'
 
 export interface SingleStigmataPageProps {
   type: 'single'
@@ -72,15 +73,15 @@ const SingleStigmataPage = ({
 
         {stigmataSet != null && (
           <Card>
-            <Heading as='h2' m={0} p={2} sx={{ borderBottom: 'default' }}>
-              <PageLink href={`/honkai3rd/stigmata/${stigmataSet.id}-set`}>
-                {stigmataSet.name}
-              </PageLink>
-              <br />
-              <Text as='small' sx={{ fontSize: 2, color: 'secondary' }}>
-                Set
-              </Text>
-            </Heading>
+            <Box sx={{ p: 2, borderBottom: 'default' }}>
+              <Heading as='h2' mb={1}>
+                <PageLink href={`/honkai3rd/stigmata/${stigmataSet.id}-set`}>
+                  {stigmataSet.name}
+                </PageLink>
+              </Heading>
+              <SecondaryLabel>Set</SecondaryLabel>
+            </Box>
+
             <Flex
               p={2}
               sx={{
diff --git a/src/components/pages/StigmataSetPage.tsx b/src/components/pages/StigmataSetPage.tsx
index 20a54c47..b243ed56 100644
--- a/src/components/pages/StigmataSetPage.tsx
+++ b/src/components/pages/StigmataSetPage.tsx
@@ -1,5 +1,5 @@
 /** @jsxImportSource theme-ui */
-import { Box, Heading, Text, Paragraph, Card, Flex } from '@theme-ui/components'
+import { Box, Heading, Paragraph, Card, Flex } from '@theme-ui/components'
 import React from 'react'
 import PageLink from '../../components/atoms/PageLink'
 import StigmataCard from '../../components/molecules/StigmataCard'
@@ -7,6 +7,7 @@ import Breadcrumb from '../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../components/organisms/Honkai3rdNavigator'
 import { StigmataData, StigmataSet } from '../../lib/honkai3rd/stigmata'
 import { capitalize } from '../../lib/string'
+import SecondaryLabel from '../atoms/SecondaryLabel'
 
 export interface StigmataSetProps {
   type: 'set'
@@ -63,22 +64,18 @@ const StigmataSetPage = ({
           {stigmataSetList.map((stigmataSetItem) => {
             return (
               <React.Fragment key={stigmataSetItem.id}>
-                <Heading as='h2' m={0} p={2} sx={{ borderBottom: 'default' }}>
-                  <PageLink href={`/honkai3rd/stigmata/${stigmataSetItem.id}`}>
-                    {stigmataSetItem.name}
-                  </PageLink>
-
-                  <br />
-                  <Text
-                    as='small'
-                    sx={{
-                      fontSize: 2,
-                      color: 'secondary',
-                    }}
-                  >
+                <Box sx={{ p: 2, borderBottom: 'default' }}>
+                  <Heading as='h2' mb={1}>
+                    <PageLink
+                      href={`/honkai3rd/stigmata/${stigmataSetItem.id}`}
+                    >
+                      {stigmataSetItem.name}
+                    </PageLink>
+                  </Heading>
+                  <SecondaryLabel>
                     {capitalize(stigmataSetItem.type)}
-                  </Text>
-                </Heading>
+                  </SecondaryLabel>
+                </Box>
                 <Box p={2} sx={{ borderBottom: 'default' }}>
                   HP : {stigmataSetItem.hp} / ATK : {stigmataSetItem.atk} / DEF
                   : {stigmataSetItem.def} / CRT : {stigmataSetItem.crt}
diff --git a/src/pages/honkai3rd/battlesuits/[battlesuitId].tsx b/src/pages/honkai3rd/battlesuits/[battlesuitId].tsx
index 8578c05b..74d7c89f 100644
--- a/src/pages/honkai3rd/battlesuits/[battlesuitId].tsx
+++ b/src/pages/honkai3rd/battlesuits/[battlesuitId].tsx
@@ -6,6 +6,7 @@ import React from 'react'
 import BattlesuitFeatureLabel from '../../../components/atoms/BattlesuitFeatureLabel'
 import BattlesuitRankIcon from '../../../components/atoms/BattlesuitRankIcon'
 import PageLink from '../../../components/atoms/PageLink'
+import SecondaryLabel from '../../../components/atoms/SecondaryLabel'
 import TypeLabel from '../../../components/atoms/TypeLabel'
 import ValkyrieLabel from '../../../components/atoms/ValkyrieLabel'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
@@ -179,18 +180,17 @@ const BattlesuitSkillGroupCard = ({
 }: BattlesuitSkillGroupCardProps) => {
   return (
     <Card mb={3}>
-      <Heading
-        as='h2'
-        p={2}
-        m={0}
-        sx={{ borderBottom: 'default', fontSize: 4 }}
+      <Box
+        sx={{
+          p: 2,
+          borderBottom: 'default',
+        }}
       >
-        {skillGroup.core.name}
-        <br />
-        <Text as='small' sx={{ fontSize: 2, color: 'secondary' }}>
-          {heading}
-        </Text>
-      </Heading>
+        <Heading as='h2' mb={1}>
+          {skillGroup.core.name}
+        </Heading>
+        <SecondaryLabel>{heading}</SecondaryLabel>
+      </Box>
 
       <Paragraph p={2} sx={{ whiteSpace: 'pre-wrap', borderBottom: 'default' }}>
         {skillGroup.core.description}
diff --git a/src/pages/honkai3rd/elfs/[elfId].tsx b/src/pages/honkai3rd/elfs/[elfId].tsx
index 001ead4f..c91b00bf 100644
--- a/src/pages/honkai3rd/elfs/[elfId].tsx
+++ b/src/pages/honkai3rd/elfs/[elfId].tsx
@@ -1,9 +1,10 @@
 /** @jsxImportSource theme-ui */
-import { Box, Card, Flex, Heading, Paragraph, Text } from '@theme-ui/components'
+import { Box, Card, Flex, Heading, Paragraph } from '@theme-ui/components'
 import { NextPageContext } from 'next'
 import Image from 'next/image'
 import React from 'react'
 import BattlesuitFeatureLabel from '../../../components/atoms/BattlesuitFeatureLabel'
+import SecondaryLabel from '../../../components/atoms/SecondaryLabel'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
 import { ElfData } from '../../../lib/honkai3rd/elfs'
@@ -78,17 +79,7 @@ const ElfShowPage = ({ elf }: ElfShowPageProps) => {
                       >
                         {item.name}
                       </Heading>
-                      <Text
-                        as='small'
-                        sx={{
-                          fontSize: 2,
-                          color: 'secondary',
-                          fontWeight: 'heading',
-                          fontFamily: 'monospace',
-                        }}
-                      >
-                        {capitalize(item.type)}
-                      </Text>
+                      <SecondaryLabel>{capitalize(item.type)}</SecondaryLabel>
                     </Box>
                     <Paragraph
                       sx={{