diff --git a/src/lib/styles/_cards.scss b/src/lib/card/Card.module.scss
similarity index 69%
rename from src/lib/styles/_cards.scss
rename to src/lib/card/Card.module.scss
index 6a2926890..293ae1e89 100644
--- a/src/lib/styles/_cards.scss
+++ b/src/lib/card/Card.module.scss
@@ -1,10 +1,9 @@
-@import './palette';
-@import './typography';
+@import '../styles';
 
 .card {
-    padding: 16px 16px 32px 16px;
-    border: solid 1px $black-10;
-    border-radius: 8px;
+    padding: $pad-lg $pad-lg $pad-xxxxl $pad-lg;
+    border: solid $border-xs $black-10;
+    border-radius: $pad-sm;
 
     .card-title {
         @include font-weight-semi-bold;
diff --git a/src/lib/button/Buttons.test.tsx b/src/lib/card/Card.test.tsx
similarity index 74%
rename from src/lib/button/Buttons.test.tsx
rename to src/lib/card/Card.test.tsx
index 0dae599ff..2544dd797 100644
--- a/src/lib/button/Buttons.test.tsx
+++ b/src/lib/card/Card.test.tsx
@@ -1,6 +1,6 @@
 import '@testing-library/jest-dom'
 
-describe('<Button />', () => {
+describe('<Card />', () => {
 
     test('it should render the content', () => { })
 })
diff --git a/src/lib/card/Card.tsx b/src/lib/card/Card.tsx
new file mode 100644
index 000000000..f5faf01a8
--- /dev/null
+++ b/src/lib/card/Card.tsx
@@ -0,0 +1,31 @@
+import { FC, ReactNode, SVGProps } from 'react'
+
+import styles from './Card.module.scss'
+
+export interface CardProps {
+    children: ReactNode
+    icon?: FC<SVGProps<SVGSVGElement>>
+    title: string
+}
+
+const Card: FC<CardProps> = (props: CardProps) => {
+
+    const Icon: FC<SVGProps<SVGSVGElement>> | undefined = props.icon
+
+    return (
+        <div className={styles.card}>
+
+            <div className={styles['card-title']}>
+                <div>
+                    {props.title}
+                </div>
+                {!!Icon && <Icon />}
+            </div>
+
+            {props.children}
+
+        </div>
+    )
+}
+
+export default Card
diff --git a/src/lib/card/index.ts b/src/lib/card/index.ts
new file mode 100644
index 000000000..03fa782ed
--- /dev/null
+++ b/src/lib/card/index.ts
@@ -0,0 +1 @@
+export { default as Card } from './Card'
diff --git a/src/lib/content-layout/ContentLayout.module.scss b/src/lib/content-layout/ContentLayout.module.scss
index e728a5f83..5cfa83f70 100644
--- a/src/lib/content-layout/ContentLayout.module.scss
+++ b/src/lib/content-layout/ContentLayout.module.scss
@@ -7,10 +7,6 @@
     grid-template-columns: 1fr;
     justify-content: center;
 
-    @include xxl {
-        padding: 0;
-    }
-
     @include md {
         padding: 0 $pad-xxl;
     }
diff --git a/src/lib/form/form-input/form-field-wrapper/FormFieldWrapper.module.scss b/src/lib/form/form-input/form-field-wrapper/FormFieldWrapper.module.scss
index 9cfc7d4e2..89c5af82f 100644
--- a/src/lib/form/form-input/form-field-wrapper/FormFieldWrapper.module.scss
+++ b/src/lib/form/form-input/form-field-wrapper/FormFieldWrapper.module.scss
@@ -1,7 +1,6 @@
 @import '../../../styles';
 
 $form-pad-top: calc($pad-md - $border);
-$border-xs: 1px;
 $error-line-height: 14px;
 
 .form-field-wrapper {
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 5fba22a3c..c3ad01716 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -1,5 +1,6 @@
 export * from './avatar'
 export * from './button'
+export * from './card'
 export * from './content-layout'
 export * from './form'
 export * from './global-config.model'
diff --git a/src/lib/styles/_layout.scss b/src/lib/styles/_layout.scss
index e0c1a6001..42e58ec00 100644
--- a/src/lib/styles/_layout.scss
+++ b/src/lib/styles/_layout.scss
@@ -8,6 +8,7 @@ $left-col-width-xl: calc(1.3 * $header-height);
 /* TODO: determine which UI library to use and replace below */
 
 /* Padding */
+$border-xs: 1px;
 $border: 2px;
 $pad-xs: calc(2 * $border); // 4
 $pad-sm: calc(2 * $pad-xs); // 8
diff --git a/src/lib/styles/index.scss b/src/lib/styles/index.scss
index 5008128f0..f784e1968 100644
--- a/src/lib/styles/index.scss
+++ b/src/lib/styles/index.scss
@@ -2,7 +2,6 @@
 
 @import 'breakpoints';
 @import 'buttons';
-@import 'cards';
 @import 'fonts';
 @import 'icons';
 @import 'layout';
diff --git a/src/utils/settings/Settings.tsx b/src/utils/settings/Settings.tsx
index 26a74dc76..bac76aabe 100644
--- a/src/utils/settings/Settings.tsx
+++ b/src/utils/settings/Settings.tsx
@@ -8,6 +8,7 @@ import {
     authUrlLogin,
     Avatar,
     Button,
+    Card,
     ContentLayout,
     IconOutline,
     profileContext,
@@ -74,52 +75,38 @@ const Settings: FC<{}> = () => {
 
                 <div className={styles['page-content']}>
 
-                    <div className='card'>
-
-                        <div className='card-title'>
-                            <div>
-                                Basic Information
-                            </div>
-                            <IconOutline.UserIcon />
-                        </div>
-
+                    <Card
+                        icon={IconOutline.UserIcon}
+                        title='Basic Information'
+                    >
                         <Button
                             label='edit'
                             onClick={toggleEditProfile}
                             tabIndex={1}
                             buttonStyle='link'
                         />
-
-                    </div>
+                    </Card>
 
                     <Modal
-                        center
                         open={editProfileOpen}
                         onClose={toggleEditProfile}
                     >
                         <ProfileUpdate onClose={toggleEditProfile} />
                     </Modal>
 
-                    <div className='card'>
-
-                        <div className='card-title'>
-                            <div>
-                                Reset Password
-                            </div>
-                            <IconOutline.LockClosedIcon />
-                        </div>
-
+                    <Card
+                        icon={IconOutline.LockClosedIcon}
+                        title='Reset Password'
+                    >
                         <Button
                             label='edit'
                             onClick={toggleResetPassword}
                             tabIndex={2}
                             buttonStyle='link'
                         />
-
-                    </div>
+                    </Card>
 
                     <Modal
-                        center
                         open={resetPasswordOpen}
                         onClose={toggleResetPassword}
                     >