diff --git a/src/pages/honkai3rd/weapons/index.tsx b/src/pages/honkai3rd/weapons/index.tsx
index 48bc8bf3..abe1713b 100644
--- a/src/pages/honkai3rd/weapons/index.tsx
+++ b/src/pages/honkai3rd/weapons/index.tsx
@@ -1,17 +1,96 @@
 /** @jsxImportSource theme-ui */
 import { Text, Box, Heading, Flex, Link } from '@theme-ui/components'
-import Image from 'next/image'
 import NextLink from 'next/link'
 import Breadcrumb from '../../../components/organisms/Breadcrumb'
 import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
 import { listWeapons, WeaponData } from '../../../data/honkai3rd/weapons'
 import { pick } from 'ramda'
+import SquareImageBox from '../../../components/atoms/SquareImageBox'
+import { useMemo, useState } from 'react'
+import FilterButton from '../../../components/atoms/FilterButton'
+
+type WeaponListItemData = Pick<
+  WeaponData,
+  'id' | 'name' | 'rarity' | 'category'
+>
 
 interface WeaponListPageProps {
-  weaponDataList: Pick<WeaponData, 'id' | 'name' | 'rarity'>[]
+  weaponDataList: WeaponListItemData[]
 }
 
+const weaponFilterOptions = [
+  { value: 'all', label: 'All' },
+  { value: 'pistol', label: 'Pistols' },
+  { value: 'katana', label: 'Katanas' },
+  { value: 'cannon', label: 'Cannons' },
+  { value: 'greatsword', label: 'Greatswords' },
+  { value: 'cross', label: 'Crosses' },
+  { value: 'gauntlet', label: 'Gauntlets' },
+  { value: 'scythe', label: 'Scythes' },
+  { value: 'lance', label: 'Lances' },
+  { value: 'bow', label: 'Bows' },
+]
+
 const WeaponListPage = ({ weaponDataList }: WeaponListPageProps) => {
+  const [filter, setFilter] = useState('all')
+
+  const weaponList = useMemo(() => {
+    return weaponDataList.map((weapon) => {
+      const hidden = isWeaponHidden(weapon, filter)
+      return (
+        <Box
+          key={weapon.id}
+          className={hidden ? 'hidden' : ''}
+          sx={{
+            width: '120px',
+            padding: 2,
+            margin: 1,
+            borderColor: 'gray.3',
+            borderWidth: 1,
+            borderStyle: 'solid',
+            borderRadius: 8,
+            transition: 'box-shadow 200ms ease-in-out',
+            '&:hover': {
+              borderColor: 'gray.3',
+              boxShadow: '0 4px 8px rgba(0, 0, 0, 0.2)',
+            },
+            '&.hidden': {
+              display: 'none',
+            },
+          }}
+        >
+          <NextLink
+            href={`/honkai3rd/weapons/${weapon.id}`}
+            key={weapon.id}
+            passHref={true}
+          >
+            <Link>
+              <SquareImageBox
+                size={100}
+                alt={weapon.name}
+                src={`/assets/honkai3rd/weapons/${weapon.id}.png`}
+              />
+              <Box
+                sx={{
+                  overflow: 'hidden',
+                  textOverflow: 'ellipsis',
+                  width: '100%',
+                  whiteSpace: 'nowrap',
+                  textAlign: 'center',
+                }}
+              >
+                <Text>{weapon.name}</Text>
+              </Box>
+              <Box sx={{ fontSize: 1, textAlign: 'center' }}>
+                {'⭐'.repeat(weapon.rarity)}
+              </Box>
+            </Link>
+          </NextLink>
+        </Box>
+      )
+    })
+  }, [weaponDataList, filter])
+
   return (
     <Box>
       <Honkai3rdNavigator />
@@ -25,73 +104,29 @@ const WeaponListPage = ({ weaponDataList }: WeaponListPageProps) => {
         />
 
         <Heading as='h1'>Weapons</Heading>
-
+        <Box>
+          <Heading as='h3'>Filter by Category</Heading>
+          <Flex mb={2} sx={{ flexWrap: 'wrap' }}>
+            {weaponFilterOptions.map(({ value, label }) => {
+              return (
+                <FilterButton
+                  active={value === filter}
+                  setFilter={setFilter}
+                  value={value}
+                  label={label}
+                  m={1}
+                />
+              )
+            })}
+          </Flex>
+        </Box>
         <Flex
           sx={{
             flexWrap: 'wrap',
             justifyContent: 'space-around',
           }}
         >
-          {weaponDataList.map((weapon) => {
-            return (
-              <Box
-                key={weapon.id}
-                sx={{
-                  width: '120px',
-                  padding: 2,
-                  margin: 1,
-                  borderColor: 'gray.3',
-                  borderWidth: 1,
-                  borderStyle: 'solid',
-                  borderRadius: 8,
-                  '&:hover': {
-                    borderColor: 'gray.3',
-                    boxShadow: '0 4px 8px rgba(0, 0, 0, 0.2)',
-                    transition: 'box-shadow 200ms ease-in-out',
-                  },
-                }}
-              >
-                <NextLink
-                  href={`/honkai3rd/weapons/${weapon.id}`}
-                  key={weapon.id}
-                  passHref={true}
-                >
-                  <Link>
-                    <Box
-                      sx={{
-                        position: 'relative',
-                        overflow: 'hidden',
-                        width: '100px',
-                        height: '100px',
-                        borderRadius: 4,
-                      }}
-                    >
-                      <Image
-                        alt={weapon.name}
-                        layout='fill'
-                        objectFit='cover'
-                        src={`/assets/honkai3rd/weapons/${weapon.id}.png`}
-                      />
-                    </Box>
-                    <Box
-                      sx={{
-                        overflow: 'hidden',
-                        textOverflow: 'ellipsis',
-                        width: '100%',
-                        whiteSpace: 'nowrap',
-                        textAlign: 'center',
-                      }}
-                    >
-                      <Text>{weapon.name}</Text>
-                    </Box>
-                    <Box sx={{ fontSize: 1, textAlign: 'center' }}>
-                      {'⭐'.repeat(weapon.rarity)}
-                    </Box>
-                  </Link>
-                </NextLink>
-              </Box>
-            )
-          })}
+          {weaponList}
         </Flex>
       </Box>
     </Box>
@@ -104,8 +139,26 @@ export async function getStaticProps() {
   return {
     props: {
       weaponDataList: listWeapons().map((weapon) => {
-        return pick(['name', 'id', 'rarity'], weapon)
+        return pick(['name', 'id', 'rarity', 'category'], weapon)
       }),
     },
   }
 }
+
+function isWeaponHidden(weapon: WeaponListItemData, filter: string): boolean {
+  switch (filter) {
+    case 'pistol':
+    case 'katana':
+    case 'cannon':
+    case 'greatsword':
+    case 'cross':
+    case 'gauntlet':
+    case 'scythe':
+    case 'lance':
+    case 'bow':
+      return weapon.category !== filter
+    default:
+    case 'all':
+      return false
+  }
+}