diff --git a/components/WeaponModal/index.scss b/components/WeaponModal/index.scss
index a71a19d9..0fecc946 100644
--- a/components/WeaponModal/index.scss
+++ b/components/WeaponModal/index.scss
@@ -30,15 +30,6 @@
         color: $grey-70;
         cursor: not-allowed;
       }
-
-      &:not(.btn-disabled) {
-        background: $grey-90;
-        color: $grey-50;
-
-        &:hover {
-          background: $grey-80;
-        }
-      }
     }
   }
 }
diff --git a/components/WeaponModal/index.tsx b/components/WeaponModal/index.tsx
index 203085f4..559300cc 100644
--- a/components/WeaponModal/index.tsx
+++ b/components/WeaponModal/index.tsx
@@ -247,9 +247,8 @@ const WeaponModal = (props: Props) => {
             <Button
               onClick={updateWeapon}
               disabled={props.gridWeapon.object.ax > 0 && !formValid}
-            >
-              {t('modals.weapon.buttons.confirm')}
-            </Button>
+              text={t('modals.weapon.buttons.confirm')}
+            />
           </div>
         </Dialog.Content>
         <Dialog.Overlay className="Overlay" />
diff --git a/components/WeaponUnit/index.scss b/components/WeaponUnit/index.scss
index 0d623371..2b725eb1 100644
--- a/components/WeaponUnit/index.scss
+++ b/components/WeaponUnit/index.scss
@@ -76,7 +76,6 @@
   }
 
   .Button {
-    background: $grey-100;
     box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.14);
     display: none;
     position: absolute;
diff --git a/components/WeaponUnit/index.tsx b/components/WeaponUnit/index.tsx
index 38468256..6de29e14 100644
--- a/components/WeaponUnit/index.tsx
+++ b/components/WeaponUnit/index.tsx
@@ -13,6 +13,7 @@ import { ButtonType } from '~utils/enums'
 import type { SearchableObject } from '~types'
 
 import PlusIcon from '~public/icons/Add.svg'
+import SettingsIcon from '~public/icons/Settings.svg'
 import './index.scss'
 
 interface Props {
@@ -113,7 +114,7 @@ const WeaponUnit = (props: Props) => {
       {props.editable && gridWeapon && canBeModified(gridWeapon) ? (
         <WeaponModal gridWeapon={gridWeapon}>
           <div>
-            <Button icon="settings" type={ButtonType.IconOnly} />
+            <Button accessoryIcon={<SettingsIcon />} />
           </div>
         </WeaponModal>
       ) : (