diff --git a/src/components/atoms/Badge.module.css b/src/components/atoms/Badge.module.css
index 223a8a494..8d3a8f096 100644
--- a/src/components/atoms/Badge.module.css
+++ b/src/components/atoms/Badge.module.css
@@ -1,10 +1,11 @@
 .badge {
   display: inline-block;
   font-size: var(--font-size-mini);
+  font-family: var(--font-family-base);
   font-weight: var(--font-weight-bold);
-  line-height: 1;
+  line-height: 1 !important;
   text-transform: uppercase;
-  padding: 0.2rem 0.2rem 0.1rem 0.2rem;
+  padding: 0.2rem;
   border-radius: var(--border-radius);
   color: var(--brand-white);
   background: var(--brand-purple);
diff --git a/src/components/atoms/Badge.tsx b/src/components/atoms/Badge.tsx
index 159d6bbad..7514b4dc7 100644
--- a/src/components/atoms/Badge.tsx
+++ b/src/components/atoms/Badge.tsx
@@ -1,5 +1,8 @@
 import React, { ReactElement } from 'react'
 import styles from './Badge.module.css'
+import classNames from 'classnames/bind'
+
+const cx = classNames.bind(styles)
 
 export default function Badge({
   label,
@@ -8,5 +11,10 @@ export default function Badge({
   label: string
   className?: string
 }): ReactElement {
-  return <span className={`${styles.badge} ${className}`}>{label}</span>
+  const styleClasses = cx({
+    badge: true,
+    [className]: className
+  })
+
+  return <span className={styleClasses}>{label}</span>
 }
diff --git a/src/components/atoms/Price/PriceUnit.module.css b/src/components/atoms/Price/PriceUnit.module.css
index 3557bfefb..1641f6796 100644
--- a/src/components/atoms/Price/PriceUnit.module.css
+++ b/src/components/atoms/Price/PriceUnit.module.css
@@ -1,6 +1,7 @@
 .price {
   display: inline-block;
   font-weight: var(--font-weight-bold);
+  font-family: var(--font-family-base);
   font-size: var(--font-size-large);
   color: var(--font-color-text);
   line-height: 1.2;
@@ -25,7 +26,7 @@
   font-size: var(--font-size-small);
 }
 
-.badge {
+.price .badge {
   vertical-align: middle;
   margin-left: calc(var(--spacer) / 6);
   background: var(--color-secondary);
diff --git a/src/components/molecules/AssetTeaser.module.css b/src/components/molecules/AssetTeaser.module.css
index aaa8f9a7c..d8c2d4402 100644
--- a/src/components/molecules/AssetTeaser.module.css
+++ b/src/components/molecules/AssetTeaser.module.css
@@ -29,6 +29,7 @@
 }
 
 .title {
+  line-height: 1.3 !important;
   font-size: var(--font-size-large);
   margin-top: calc(var(--spacer) / 12);
   margin-bottom: 0;
diff --git a/src/components/organisms/AssetActions/Pool/Graph.module.css b/src/components/organisms/AssetActions/Pool/Graph.module.css
index 3b200dbcc..80a937c46 100644
--- a/src/components/organisms/AssetActions/Pool/Graph.module.css
+++ b/src/components/organisms/AssetActions/Pool/Graph.module.css
@@ -21,7 +21,9 @@
 }
 
 .button,
-.button:hover {
+.button:hover,
+.button:focus,
+.button:active {
   display: inline-block;
   color: var(--color-secondary);
   font-size: var(--font-size-mini);
diff --git a/src/components/organisms/AssetActions/Trade/Swap.module.css b/src/components/organisms/AssetActions/Trade/Swap.module.css
index 4909e595a..50b399ce6 100644
--- a/src/components/organisms/AssetActions/Trade/Swap.module.css
+++ b/src/components/organisms/AssetActions/Trade/Swap.module.css
@@ -3,7 +3,9 @@
 }
 
 .swapButton,
-.swapButton:hover {
+.swapButton:hover,
+.swapButton:focus,
+.swapButton:active {
   padding: 0;
   display: block;
   width: calc(100% + 4rem);
@@ -13,6 +15,7 @@
   border-top: 1px solid var(--border-color);
   border-bottom: 1px solid var(--border-color);
   padding: calc(var(--spacer) / 3) 0 calc(var(--spacer) / 6) 0;
+  transform: none;
 }
 
 .swapButton svg {
diff --git a/src/components/organisms/AssetQueryCarousel.module.css b/src/components/organisms/AssetQueryCarousel.module.css
index 2f6116af4..2d95a7413 100644
--- a/src/components/organisms/AssetQueryCarousel.module.css
+++ b/src/components/organisms/AssetQueryCarousel.module.css
@@ -24,6 +24,11 @@
   margin-top: calc(var(--spacer) / 2);
 }
 
+.assetCarousel [class*='alice-carousel__stage-item'] *,
+.assetCarousel [class*='alice-carousel__stage-item'] {
+  line-height: var(--line-height);
+}
+
 .empty {
   color: var(--color-secondary);
   font-size: var(--font-size-small);