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 fc5736aba..b712d0044 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -20,7 +20,7 @@
     </div>
 
     <div i18n class="middle-title" *ngIf="html.administrator || maintenanceLifetime || businessModel">
-      Administrators & sustainability
+      ADMINISTRATORS & SUSTAINABILITY
     </div>
 
     <div class="block administrator" *ngIf="html.administrator">
@@ -48,7 +48,7 @@
     </div>
 
     <div i18n class="middle-title" *ngIf="html.description">
-      Information
+      INFORMATION
     </div>
 
     <div class="block description">
@@ -58,7 +58,7 @@
     </div>
 
     <div i18n class="middle-title" *ngIf="html.moderationInformation || html.codeOfConduct || html.terms">
-      Moderation
+      MODERATION
     </div>
 
     <div class="block moderation-information" *ngIf="html.moderationInformation">
@@ -80,7 +80,7 @@
     </div>
 
     <div i18n class="middle-title" *ngIf="html.hardwareInformation">
-      Other information
+      OTHER INFORMATION
     </div>
 
     <div class="block hardware-information" *ngIf="html.hardwareInformation">
@@ -97,7 +97,7 @@
 
   <div class="col">
     <div i18n class="middle-title">
-      Statistics
+      STATISTICS
     </div>
     <my-instance-statistics></my-instance-statistics>
   </div>
diff --git a/client/src/app/+accounts/account-about/account-about.component.html b/client/src/app/+accounts/account-about/account-about.component.html
index f857e5a52..3ae11b49c 100644
--- a/client/src/app/+accounts/account-about/account-about.component.html
+++ b/client/src/app/+accounts/account-about/account-about.component.html
@@ -1,11 +1,11 @@
 <div *ngIf="account" class="row">
   <div class="block col-md-6 col-sm-12">
-    <div i18n class="small-title">Description</div>
+    <div i18n class="small-title">DESCRIPTION</div>
     <div class="content" [innerHtml]="getAccountDescription()"></div>
   </div>
 
   <div class="block col-md-6 col-sm-12">
-    <div i18n class="small-title">Stats</div>
+    <div i18n class="small-title">STATS</div>
 
     <div i18n class="content">Joined {{ account.createdAt | date }}</div>
   </div>
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
index 781156840..8f1ff21a5 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
@@ -25,7 +25,7 @@
       </div>
 
       <a *ngIf="getVideosOf(videoChannel).length !== 0" class="show-more" i18n [routerLink]="getVideoChannelLink(videoChannel)">
-        Show this channel
+        SHOW THIS CHANNEL
       </a>
     </div>
   </div>
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts
index 4fea0e4ed..061eb953a 100644
--- a/client/src/app/+accounts/accounts.component.ts
+++ b/client/src/app/+accounts/accounts.component.ts
@@ -74,9 +74,9 @@ export class AccountsComponent implements OnInit, OnDestroy {
                         )
 
     this.links = [
-      { label: this.i18n('Video channels'), routerLink: 'video-channels' },
-      { label: this.i18n('Videos'), routerLink: 'videos' },
-      { label: this.i18n('About'), routerLink: 'about' }
+      { label: this.i18n('VIDEO CHANNELS'), routerLink: 'video-channels' },
+      { label: this.i18n('VIDEOS'), routerLink: 'videos' },
+      { label: this.i18n('ABOUT'), routerLink: 'about' }
     ]
   }
 
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index b09614061..2cf0e5fd9 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -7,7 +7,7 @@
 
         <ng-container formGroupName="instance">
 
-          <div i18n class="inner-form-title">Instance</div>
+          <div i18n class="inner-form-title">INSTANCE</div>
 
           <div class="form-group">
             <label i18n for="instanceName">Name</label>
@@ -60,7 +60,7 @@
             </div>
           </div>
 
-          <div i18n class="inner-form-title">Moderation & NSFW</div>
+          <div i18n class="inner-form-title">MODERATION & NSFW</div>
 
           <div class="form-group">
             <my-peertube-checkbox inputName="instanceIsNSFW" formControlName="isNSFW">
@@ -127,7 +127,7 @@
             <div *ngIf="formErrors.instance.moderationInformation" class="form-error">{{ formErrors.instance.moderationInformation }}</div>
           </div>
 
-          <div i18n class="inner-form-title">You and your instance</div>
+          <div i18n class="inner-form-title">YOU AND YOUR INSTANCE</div>
 
           <div class="form-group">
             <label i18n for="instanceAdministrator">Who is behind the instance?</label>
@@ -174,7 +174,7 @@
             <div *ngIf="formErrors.instance.businessModel" class="form-error">{{ formErrors.instance.businessModel }}</div>
           </div>
 
-          <div i18n class="inner-form-title">Other information</div>
+          <div i18n class="inner-form-title">OTHER INFORMATION</div>
 
           <div class="form-group">
             <label i18n for="instanceHardwareInformation">What server/hardware does the instance run on?</label>
@@ -195,7 +195,7 @@
     <ngb-tab i18n-title title="Basic configuration">
       <ng-template ngbTabContent>
 
-        <div i18n class="inner-form-title">Theme & Default route</div>
+        <div i18n class="inner-form-title">THEME AND DEFAULT ROUTE</div>
 
         <ng-container formGroupName="theme">
           <div class="form-group">
@@ -226,7 +226,7 @@
           <div *ngIf="formErrors.instance.defaultClientRoute" class="form-error">{{ formErrors.instance.defaultClientRoute }}</div>
         </div>
 
-        <div i18n class="inner-form-title">Signup</div>
+        <div i18n class="inner-form-title">SIGNUP</div>
 
         <ng-container formGroupName="signup">
           <div class="form-group">
@@ -258,7 +258,7 @@
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Users</div>
+        <div i18n class="inner-form-title">USERS</div>
 
         <ng-container formGroupName="user">
           <div class="form-group">
@@ -287,7 +287,7 @@
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Import</div>
+        <div i18n class="inner-form-title">IMPORT</div>
 
         <ng-container formGroupName="import">
           <ng-container formGroupName="videos">
@@ -310,7 +310,7 @@
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Auto-blacklist</div>
+        <div i18n class="inner-form-title">AUTO-BLACKLIST</div>
 
         <ng-container formGroupName="autoBlacklist">
           <ng-container formGroupName="videos">
@@ -332,7 +332,7 @@
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Instance followers</div>
+        <div i18n class="inner-form-title">INSTANCE FOLLOWERS</div>
 
         <ng-container formGroupName="followers">
           <ng-container formGroupName="instance">
@@ -353,7 +353,7 @@
           </ng-container>
         </ng-container>
 
-        <div i18n class="inner-form-title">Instance followings</div>
+        <div i18n class="inner-form-title">INSTANCE FOLLOWINGS</div>
 
         <ng-container formGroupName="followings">
           <ng-container formGroupName="instance">
@@ -399,7 +399,7 @@
         </ng-container>
 
 
-        <div i18n class="inner-form-title">Administrator</div>
+        <div i18n class="inner-form-title">ADMINISTRATORS</div>
 
         <div class="form-group" formGroupName="admin">
           <label i18n for="adminEmail">Admin email</label>
@@ -422,7 +422,7 @@
 
     <ngb-tab i18n-title title="Services">
       <ng-template ngbTabContent>
-        <div i18n class="inner-form-title">Twitter</div>
+        <div i18n class="inner-form-title">TWITTER</div>
 
         <ng-container formGroupName="services">
           <ng-container formGroupName="twitter">
@@ -470,7 +470,7 @@
     <ngb-tab i18n-title title="Advanced configuration">
       <ng-template ngbTabContent>
 
-        <div i18n class="inner-form-title">Transcoding</div>
+        <div i18n class="inner-form-title">TRANSCODING</div>
 
         <ng-container formGroupName="transcoding">
           <div class="form-group">
@@ -583,7 +583,7 @@
         </ng-container>
 
         <div class="inner-form-title">
-          <ng-container i18n>Cache</ng-container>
+          <ng-container i18n>CACHE</ng-container>
 
           <my-help>
             <ng-template ptTemplate="customHtml">
@@ -612,7 +612,7 @@
           </div>
         </ng-container>
 
-        <div i18n class="inner-form-title">Customizations</div>
+        <div i18n class="inner-form-title">CUSTOMIZATIONS</div>
 
         <ng-container formGroupName="instance">
           <ng-container formGroupName="customizations">
diff --git a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.html b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.html
index 9655668d7..c02213ebb 100644
--- a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.html
+++ b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.html
@@ -1,19 +1,19 @@
 <div *ngIf="videoChannel" class="row">
   <div class="description col-md-6 col-sm-12">
     <div class="block">
-      <div i18n class="small-title">Description</div>
+      <div i18n class="small-title">DESCRIPTION</div>
       <div class="content" [innerHtml]="getVideoChannelDescription()"></div>
     </div>
 
     <div class="block" *ngIf="supportHTML">
-      <div i18n class="small-title">Support this channel</div>
+      <div i18n class="small-title">SUPPORT THIS CHANNEL</div>
       <div class="content" [innerHtml]="supportHTML"></div>
     </div>
   </div>
 
   <div class="stats col-md-6 col-sm-12">
     <div class="block">
-      <div i18n class="small-title">Stats</div>
+      <div i18n class="small-title">STATS</div>
       <div i18n class="content">Created {{ videoChannel.createdAt | date }}</div>
     </div>
   </div>
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index 0889ca854..00b9938d9 100644
--- a/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@ -66,9 +66,9 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
     if (this.isUserLoggedIn()) this.hotkeysService.add(this.hotkeys)
 
     this.links = [
-      { label: this.i18n('Videos'), routerLink: 'videos' },
-      { label: this.i18n('Video playlists'), routerLink: 'video-playlists' },
-      { label: this.i18n('About'), routerLink: 'about' }
+      { label: this.i18n('VIDEOS'), routerLink: 'videos' },
+      { label: this.i18n('VIDEO PLAYLISTS'), routerLink: 'video-playlists' },
+      { label: this.i18n('ABOUT'), routerLink: 'about' }
     ]
   }
 
diff --git a/client/src/app/header/search-typeahead.component.html b/client/src/app/header/search-typeahead.component.html
index e36809060..949defed6 100644
--- a/client/src/app/header/search-typeahead.component.html
+++ b/client/src/app/header/search-typeahead.component.html
@@ -13,7 +13,7 @@
     <div *ngIf="showHelp" id="typeahead-help" class="overflow-hidden">
       <ng-container *ngIf="activeResult.type === 'search-global'">
         <div class="d-flex justify-content-between">
-          <label class="small-title" i18n>Global search</label>
+          <label class="small-title" i18n>GLOBAL SEARCH</label>
           <div class="advanced-search-status text-muted">
             <span *ngIf="serverConfig" class="mr-1" i18n>using {{ serverConfig.followings.instance.autoFollowIndex.indexUrl }}</span>
             <i class="glyphicon glyphicon-globe"></i>
@@ -26,7 +26,7 @@
     <!-- search instructions, when search input is empty -->
     <div *ngIf="areInstructionsDisplayed" id="typeahead-instructions" class="overflow-hidden">
       <div class="d-flex justify-content-between">
-        <label class="small-title" i18n>Advanced search</label>
+        <label class="small-title" i18n>ADVANCED SEARCH</label>
         <div class="advanced-search-status c-help">
           <span [ngClass]="canSearchAnyURI ? 'text-success' : 'text-muted'" i18n-title title="Determines whether you can resolve any distant content, or if this instance only allows doing so for instances it follows.">
             <span *ngIf="canSearchAnyURI" class="mr-1" i18n>any instance</span>
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 91422df77..790a8af00 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -48,7 +48,7 @@
       </div>
 
       <div *ngIf="isLoggedIn" class="panel-block">
-        <div i18n class="block-title">My library</div>
+        <div i18n class="block-title">MY LIBRARY</div>
 
         <a routerLink="/my-account/videos" routerLinkActive="active">
           <my-global-icon iconName="videos"></my-global-icon>
@@ -73,7 +73,7 @@
       </div>
 
       <div class="panel-block">
-        <div i18n class="block-title">Videos</div>
+        <div i18n class="block-title">VIDEOS</div>
 
         <a routerLink="/videos/overview" routerLinkActive="active">
           <my-global-icon iconName="globe"></my-global-icon>
@@ -102,7 +102,7 @@
       </div>
 
       <div class="panel-block">
-        <div class="block-title" i18n>More</div>
+        <div class="block-title" i18n>MORE</div>
 
         <a *ngIf="userHasAdminAccess" [routerLink]="getFirstAdminRouteAvailable()" routerLinkActive="active">
           <my-global-icon iconName="administration"></my-global-icon>
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/videos/+video-watch/comment/video-comments.component.html
index 2bf52ab86..2ab2d4689 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.html
@@ -13,7 +13,7 @@
 
     <div ngbDropdown class="d-inline-block ml-4">
       <button class="btn btn-sm btn-outline-secondary" id="dropdownSortComments" ngbDropdownToggle i18n>
-        Sort by
+        SORT BY
       </button>
       <div ngbDropdownMenu aria-labelledby="dropdownSortComments">
         <button (click)="handleSortChange('-createdAt')" ngbDropdownItem i18n>Most recent first (default)</button>
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index a382777f5..cfa0432ad 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -84,12 +84,12 @@
                     placement="bottom auto"
                   >
                     <my-global-icon iconName="support"></my-global-icon>
-                    <span class="icon-text" i18n>Support</span>
+                    <span class="icon-text" i18n>SUPPORT</span>
                   </div>
 
                   <div (click)="showShareModal()" class="action-button" role="button">
                     <my-global-icon iconName="share"></my-global-icon>
-                    <span class="icon-text" i18n>Share</span>
+                    <span class="icon-text" i18n>SHARE</span>
                   </div>
 
                   <div
@@ -100,7 +100,7 @@
                   >
                     <div class="action-button action-button-save" ngbDropdownToggle role="button">
                       <my-global-icon iconName="playlist-add"></my-global-icon>
-                      <span class="icon-text" i18n>Save</span>
+                      <span class="icon-text" i18n>SAVE</span>
                     </div>
 
                     <div ngbDropdownMenu>
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.html b/client/src/app/videos/recommendations/recommended-videos.component.html
index 476eca071..4548c7d80 100644
--- a/client/src/app/videos/recommendations/recommended-videos.component.html
+++ b/client/src/app/videos/recommendations/recommended-videos.component.html
@@ -7,7 +7,7 @@
       <div *ngIf="!playlist" class="title-page-autoplay"
         [ngbTooltip]="autoPlayNextVideoTooltip" placement="bottom-right auto"
       >
-        <span i18n>Autoplay</span>
+        <span i18n>AUTOPLAY</span>
         <p-inputSwitch [(ngModel)]="autoPlayNextVideo" (ngModelChange)="switchAutoPlayNextVideo()"></p-inputSwitch>
       </div>
     </div>