diff --git a/site/src/components/core/buttons/button.module.scss b/site/src/components/core/buttons/button.module.scss
index 73283f490..71bb70f7a 100644
--- a/site/src/components/core/buttons/button.module.scss
+++ b/site/src/components/core/buttons/button.module.scss
@@ -7,6 +7,8 @@
   margin: 0.25rem 0;
   padding: 0 16px;
 
+  text-decoration: none;
+
   @media (min-width: 576px) {
     margin: 0.45rem 0;
     padding: 0 26px;
diff --git a/site/src/components/core/layout/layout.js b/site/src/components/core/layout/layout.js
index 3dd3d3b42..41b0ee1f6 100644
--- a/site/src/components/core/layout/layout.js
+++ b/site/src/components/core/layout/layout.js
@@ -10,6 +10,7 @@ import '../../../themes/fonts.scss';
 import '../../../themes/theme.scss';
 import '../../../themes/main.scss';
 import '../../../themes/input.scss';
+import '../../../themes/links.scss';
 import '../../../themes/variables.scss';
 
 import SEO from '../seo/seo';
diff --git a/site/src/components/enterprise/features/features.js b/site/src/components/enterprise/features/features.js
index 12661721a..a2e82f6f6 100644
--- a/site/src/components/enterprise/features/features.js
+++ b/site/src/components/enterprise/features/features.js
@@ -21,7 +21,7 @@ export const EnterpriseFeatures = ({lang}) => {
             id="enterprise.features.introduction"
             values={{
               communityLink: (
-                <Link to={`/${lang}/features/`} style={{textDecoration: 'underline'}}>
+                <Link to={`/${lang}/features/`}>
                   <FormattedMessage id="enterprise.community.link" />
                 </Link>
               ),
diff --git a/site/src/components/features/features/features.js b/site/src/components/features/features/features.js
index 4d274b740..68b6fb034 100644
--- a/site/src/components/features/features/features.js
+++ b/site/src/components/features/features/features.js
@@ -80,7 +80,7 @@ export const ListFeatures = ({lang}) => {
             id="features.enterprise.only.notice"
             values={{
               organizationsLink: (
-                <Link to={`/${lang}/enterprise/`} style={{textDecoration: 'underline'}}>
+                <Link to={`/${lang}/enterprise/`}>
                   <FormattedMessage id="features.enterprise.organizations.link" />
                 </Link>
               ),
diff --git a/site/src/components/pricing/plan/plan.js b/site/src/components/pricing/plan/plan.js
index 48115049e..ac5ecbf8a 100644
--- a/site/src/components/pricing/plan/plan.js
+++ b/site/src/components/pricing/plan/plan.js
@@ -41,8 +41,7 @@ export const Plan = ({lang}) => {
               sponsorshipLink: (
                 <a
                   href="https://opencollective.com/deckdeckgo#category-CONTRIBUTE"
-                  rel="noopener noreferrer"
-                  style={{textDecoration: 'underline'}}>
+                  rel="noopener noreferrer">
                   <FormattedMessage id="pricing.community.sponsorship" />
                 </a>
               ),
@@ -91,7 +90,7 @@ export const Plan = ({lang}) => {
                 id="pricing.community.feature.more"
                 values={{
                   featuresLink: (
-                    <Link to={`/${lang}/features/`} style={{textDecoration: 'underline'}}>
+                    <Link to={`/${lang}/features/`}>
                       <FormattedMessage id="pricing.community.features" />
                     </Link>
                   ),
diff --git a/site/src/components/pricing/try/try.js b/site/src/components/pricing/try/try.js
index 09109c761..bdf0ae6fe 100644
--- a/site/src/components/pricing/try/try.js
+++ b/site/src/components/pricing/try/try.js
@@ -15,8 +15,7 @@ export const Try = () => {
             tryLink: (
               <a
                 href="https://app.deckdeckgo.com/editor"
-                rel="noopener noreferrer"
-                style={{textDecoration: 'underline'}}>
+                rel="noopener noreferrer">
                 <FormattedMessage id="pricing.try.link" />
               </a>
             ),
diff --git a/site/src/pages/faq/index.en.js b/site/src/pages/faq/index.en.js
index b7cbed56c..06d68237a 100644
--- a/site/src/pages/faq/index.en.js
+++ b/site/src/pages/faq/index.en.js
@@ -26,8 +26,7 @@ const FaqPage = (props) => {
             <a
               href="https://dev.to/daviddalbusco/we-are-developing-an-open-source-editor-for-presentations-1bng"
               target="_blank"
-              rel="noopener noreferrer"
-              style={{textDecoration: 'underline'}}>
+              rel="noopener noreferrer">
               article
             </a>{' '}
             to present our project and ourselves, you might find more answers in it if you wish to have a more concrete answer.
@@ -58,7 +57,7 @@ const FaqPage = (props) => {
 
           <p>
             That being said, for our{' '}
-            <Link to="/en/enterprise/" style={{textDecoration: 'underline'}}>
+            <Link to="/en/enterprise/">
               enterprise
             </Link>{' '}
             we do offer templates and options that match their CI/CD. In addition, we are in the making to open our online editor to custom users and community
@@ -69,7 +68,7 @@ const FaqPage = (props) => {
 
           <p>
             You can't (but we do understand that you might wish to if you are a{' '}
-            <Link to="/en/enterprise/" style={{textDecoration: 'underline'}}>
+            <Link to="/en/enterprise/">
               company
             </Link>
             ).
diff --git a/site/src/themes/links.scss b/site/src/themes/links.scss
new file mode 100644
index 000000000..1e5f2f2cc
--- /dev/null
+++ b/site/src/themes/links.scss
@@ -0,0 +1,5 @@
+main {
+  a {
+    text-decoration: underline;
+  }
+}