diff --git a/src/app/pages/ui-features/buttons/buttons.component.scss b/src/app/pages/ui-features/buttons/buttons.component.scss
index 29b9ff13..c0c44c88 100644
--- a/src/app/pages/ui-features/buttons/buttons.component.scss
+++ b/src/app/pages/ui-features/buttons/buttons.component.scss
@@ -6,7 +6,6 @@
 @include nb-install-component() {
   /deep/ {
     $button-size: 50px;
-    $button-border-radius: 12px;
 
     .container-title {
       color: nb-theme(color-fg);
@@ -39,7 +38,7 @@
       .state-value {
         width: $button-size;
         height: $button-size;
-        border-radius: $button-border-radius;
+        border-radius: nb-theme(btn-border-radius);
       }
 
       .state-details {
diff --git a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss b/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
index 9aa3b379..ba0c956c 100644
--- a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
+++ b/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss
@@ -20,7 +20,7 @@
   .subheader {
     margin-bottom: 0.75rem;
     font-size: 0.875rem;
-    font-weight: nb-theme(font-weight-bold);
+    font-weight: nb-theme(font-weight-bolder);
     color: nb-theme(color-fg-heading);
   }
 }
diff --git a/src/app/pages/ui-features/typography/typography.component.html b/src/app/pages/ui-features/typography/typography.component.html
index 84bb8b4a..7971b602 100644
--- a/src/app/pages/ui-features/typography/typography.component.html
+++ b/src/app/pages/ui-features/typography/typography.component.html
@@ -44,7 +44,7 @@
         </nb-card>
       </div>
       <div class="col-sm-12 col-md-6 col-xxl-5">
-        <nb-card size="medium">
+        <nb-card size="medium" class="headings-card">
           <nb-card-header>
             Headings
           </nb-card-header>
@@ -117,7 +117,7 @@
             <p class="text-indent">
               Far far away, behind the word mountains, far from the countries <strong>Vokalia</strong> and <strong>Consonantia</strong>,
               there live the blind texts.
-              Separated they live in <strong>Bookmarksgrove</strong>.
+              They live in <strong>Bookmarksgrove</strong>.
             </p>
             <p class="text-indent">
               A small <strong>river named Duden</strong> flows by their place and supplies it with the
@@ -182,6 +182,13 @@
               Far far away, behind the your awesomeness.
             </div>
           </div>
+          <div class="item text-link">
+            <div class="color bg-link"></div>
+            <div>
+              <h5 class="text-link">Link Text</h5>
+              Far far away, behind the your awesomeness.
+            </div>
+          </div>
           <div class="item text-primary">
             <div class="color bg-primary"></div>
             <div>
@@ -192,7 +199,7 @@
           <div class="item text-success">
             <div class="color bg-success"></div>
             <div>
-              <h5 class="text-success">Link/Hightlight Text</h5>
+              <h5 class="text-success">Success Text</h5>
               Far far away, behind the your awesomeness.
             </div>
           </div>
diff --git a/src/app/pages/ui-features/typography/typography.component.scss b/src/app/pages/ui-features/typography/typography.component.scss
index 82bd8138..97a92e20 100644
--- a/src/app/pages/ui-features/typography/typography.component.scss
+++ b/src/app/pages/ui-features/typography/typography.component.scss
@@ -27,6 +27,21 @@
     }
   }
 
+  .headings-card {
+    nb-card-body {
+      padding: 1rem 1.25rem;
+    }
+    .header {
+      padding-bottom: 0.675rem;
+      margin-bottom: 0.675rem;
+
+      &:last-child {
+        padding-bottom: 0;
+        margin-bottom: 0;
+      }
+    }
+  }
+
   .header {
     display: flex;
     flex-wrap: wrap;
@@ -80,7 +95,7 @@
     .item {
       display: flex;
       align-items: center;
-      margin-bottom: 1.5rem;
+      margin-bottom: 1.25rem;
       &:last-child {
         margin-bottom: 0;
       }
@@ -98,4 +113,12 @@
       margin-bottom: 0.25rem;
     }
   }
+
+  .text-link {
+    color: nb-theme(link-color);
+  }
+
+  .bg-link {
+    background: nb-theme(link-color);
+  }
 }