2 files changed, 20 insertions, 17 deletions

diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html
index c6247c4ae..80acfcce0 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -7,26 +7,16 @@
       <div *ngIf="isContactFormEnabled" (click)="openContactModal()" i18n role="button" class="contact-admin">Contact administrator</div>
     </div>
 
+    <div class="block instance-badges">
+      <span *ngFor="let category of categories" class="badge badge-primary category">{{ category }}</span>
+
+      <span *ngFor="let language of languages" class="badge badge-secondary language">{{ language }}</span>
+    </div>
+
     <div class="short-description">
       <div class="block short-description">{{ shortDescription }}</div>
 
       <div *ngIf="isNSFW" class="block dedicated-to-nsfw">This instance is dedicated to sensitive/NSFW content.</div>
-
-      <div class="block">
-        <div class="section-title" *ngIf="languages.length !== 0">Main instance languages</div>
-
-        <ul>
-          <li *ngFor="let language of languages">{{ language }}</li>
-        </ul>
-      </div>
-
-      <div class="block">
-        <div class="section-title" *ngIf="categories.length !== 0">Main instance categories</div>
-
-        <ul>
-          <li *ngFor="let category of categories">{{ category }}</li>
-        </ul>
-      </div>
     </div>
 
     <div class="middle-title" *ngIf="html.administrator || maintenanceLifetime || businessModel">
diff --git a/client/src/app/+about/about-instance/about-instance.component.scss b/client/src/app/+about/about-instance/about-instance.component.scss
index d71cfffc6..909ae5c21 100644
--- a/client/src/app/+about/about-instance/about-instance.component.scss
+++ b/client/src/app/+about/about-instance/about-instance.component.scss
@@ -7,7 +7,6 @@
 
   .title {
     font-size: 20px;
-    margin-bottom: 15px;
     font-weight: $font-semibold;
   }
 
@@ -19,6 +18,20 @@
   }
 }
 
+.instance-badges {
+  font-size: 16px;
+
+  .badge {
+    font-size: 12px;
+    font-weight: $font-semibold;
+    margin-right: 5px;
+
+    &.category {
+      background-color: var(--mainColor);
+    }
+  }
+}
+
 .section-title {
   font-weight: $font-semibold;
   font-size: 16px;