diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index df01d7b995..a038801321 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -199,7 +199,7 @@
 		}
 	},
 	"Search": {
-		"SearchByProductBarcode": "Search by product barcode",
+		"ProductBarcode": "Product barcode",
 		"Title": "Search"
 	},
 	"ShareButton": {
diff --git a/src/views/AddPriceHome.vue b/src/views/AddPriceHome.vue
index de25b7962e..bed6b47af2 100644
--- a/src/views/AddPriceHome.vue
+++ b/src/views/AddPriceHome.vue
@@ -1,5 +1,7 @@
 <template>
-  <h1 class="mb-1">{{ $t('AddPriceHome.Title') }}</h1>
+  <h1 class="text-h5 mb-1">
+    {{ $t('AddPriceHome.Title') }}
+  </h1>
 
   <v-row>
     <v-col cols="12" sm="6" lg="4">
diff --git a/src/views/AddPriceMultiple.vue b/src/views/AddPriceMultiple.vue
index bccadcee24..df71e057ff 100644
--- a/src/views/AddPriceMultiple.vue
+++ b/src/views/AddPriceMultiple.vue
@@ -1,5 +1,7 @@
 <template>
-  <h1 class="mb-1">{{ $t('AddPriceMultiple.Title') }}</h1>
+  <h1 class="text-h5 mb-1">
+    {{ $t('AddPriceMultiple.Title') }}
+  </h1>
 
   <v-row>
     <!-- Step 1: proof -->
diff --git a/src/views/AddPriceSingle.vue b/src/views/AddPriceSingle.vue
index 8b00c2a780..7b673a0e19 100644
--- a/src/views/AddPriceSingle.vue
+++ b/src/views/AddPriceSingle.vue
@@ -1,5 +1,7 @@
 <template>
-  <h1 class="mb-1">{{ $t('AddPriceSingle.Title') }}</h1>
+  <h1 class="text-h5 mb-1">
+    {{ $t('AddPriceSingle.Title') }}
+  </h1>
 
   <v-form @submit.prevent="createPrice">
     <v-row>
diff --git a/src/views/BrandDetail.vue b/src/views/BrandDetail.vue
index 2d3101d414..265bbde407 100644
--- a/src/views/BrandDetail.vue
+++ b/src/views/BrandDetail.vue
@@ -25,9 +25,8 @@
 
   <br />
 
-  <h2 class="mb-1">
-    {{ $t('BrandDetail.TopProducts') }} <small>{{ brandProductTotal }}</small>
-
+  <h2 class="text-h6 mb-1">
+    {{ $t('BrandDetail.TopProducts') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h2>
 
diff --git a/src/views/Home.vue b/src/views/Home.vue
index e5f228cb60..3a2297e283 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -1,5 +1,5 @@
 <template>
-  <h1 class="mb-1">
+  <h1 class="text-h5 mb-1">
     <i18n-t keypath="Home.Welcome.Title" tag="span">
       <template #name>{{ APP_NAME }}</template>
     </i18n-t>
diff --git a/src/views/LocationDetail.vue b/src/views/LocationDetail.vue
index 1a46874ff9..3425cf7e00 100644
--- a/src/views/LocationDetail.vue
+++ b/src/views/LocationDetail.vue
@@ -29,8 +29,8 @@
 
   <br />
 
-  <h2 class="mb-1">
-    {{ $t('LocationDetail.LatestPrices') }} <small>{{ locationPriceTotal }}</small>
+  <h2 class="text-h6 mb-1">
+    {{ $t('LocationDetail.LatestPrices') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h2>
 
diff --git a/src/views/LocationList.vue b/src/views/LocationList.vue
index 6a4d310a93..2e6080f6a8 100644
--- a/src/views/LocationList.vue
+++ b/src/views/LocationList.vue
@@ -1,5 +1,5 @@
 <template>
-  <h1 class="mb-1">
+  <h1 class="text-h5 mb-1">
     {{ $t('LocationList.Title') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h1>
diff --git a/src/views/PriceList.vue b/src/views/PriceList.vue
index ae06e8884d..84535e102f 100644
--- a/src/views/PriceList.vue
+++ b/src/views/PriceList.vue
@@ -1,5 +1,5 @@
 <template>
-  <h1 class="mb-1">
+  <h1 class="text-h5 mb-1">
     {{ $t('PriceList.Title') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h1>
diff --git a/src/views/ProductDetail.vue b/src/views/ProductDetail.vue
index 55fccb2874..24497e59ac 100644
--- a/src/views/ProductDetail.vue
+++ b/src/views/ProductDetail.vue
@@ -33,8 +33,8 @@
 
   <br />
 
-  <h2 class="mb-1">
-    {{ $t('ProductDetail.LatestPrices') }} <small>{{ productPriceTotal }}</small>
+  <h2 class="text-h6 mb-1">
+    {{ $t('ProductDetail.LatestPrices') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h2>
 
diff --git a/src/views/ProductList.vue b/src/views/ProductList.vue
index fbe6ee775e..4b188a48c8 100644
--- a/src/views/ProductList.vue
+++ b/src/views/ProductList.vue
@@ -1,5 +1,5 @@
 <template>
-  <h1 class="mb-1">
+  <h1 class="text-h5 mb-1">
     {{ $t('ProductList.Title') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h1>
diff --git a/src/views/Search.vue b/src/views/Search.vue
index 13865df549..d25b152c4b 100644
--- a/src/views/Search.vue
+++ b/src/views/Search.vue
@@ -1,5 +1,5 @@
 <template>
-  <h1 class="mb-1">
+  <h1 class="text-h5 mb-1">
     {{ $t('Search.Title') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h1>
@@ -9,7 +9,7 @@
       <v-form @submit.prevent="search">
         <v-text-field
           v-model="productSearchForm.q"
-          :label="$t('Search.SearchByProductBarcode')"
+          :label="$t('Search.ProductBarcode')"
           type="number"
           :prepend-inner-icon="formFilled ? 'mdi-barcode' : 'mdi-barcode-scan'"
           append-inner-icon="mdi-magnify"
diff --git a/src/views/SignIn.vue b/src/views/SignIn.vue
index 23d3b565bd..4e888d2569 100644
--- a/src/views/SignIn.vue
+++ b/src/views/SignIn.vue
@@ -1,5 +1,7 @@
 <template>
-  <h1 class="mb-1">{{ $t('SignIn.Title') }}</h1>
+  <h1 class="text-h5 mb-1">
+    {{ $t('SignIn.Title') }}
+  </h1>
 
   <v-alert
     class="mb-2"
diff --git a/src/views/Stats.vue b/src/views/Stats.vue
index 9d3fbcf2e1..a62a9f1d8c 100644
--- a/src/views/Stats.vue
+++ b/src/views/Stats.vue
@@ -1,6 +1,7 @@
 <template>
-  <h1 class="mb-1">
-    {{ $t('Stats.Title') }} <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
+  <h1 class="text-h5 mb-1">
+    {{ $t('Stats.Title') }}
+    <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h1>
 
   <v-row>
diff --git a/src/views/UserDashboard.vue b/src/views/UserDashboard.vue
index bfc3d4b128..ff239cdd03 100644
--- a/src/views/UserDashboard.vue
+++ b/src/views/UserDashboard.vue
@@ -1,5 +1,7 @@
 <template>
-  <h1 class="mb-1">{{ $t('UserDashboard.Title') }}</h1>
+  <h1 class="text-h5 mb-1">
+    {{ $t('UserDashboard.Title') }}
+  </h1>
 
   <v-row>
     <v-col cols="12" sm="6">
@@ -15,7 +17,7 @@
 
   <br />
 
-  <h2 class="mb-1">
+  <h2 class="text-h6 mb-1">
     {{ $t('UserDashboard.LatestPrices') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h2>
diff --git a/src/views/UserDetail.vue b/src/views/UserDetail.vue
index 6dda174cf9..07b95c90ec 100644
--- a/src/views/UserDetail.vue
+++ b/src/views/UserDetail.vue
@@ -23,7 +23,7 @@
 
   <br />
 
-  <h2 class="mb-1">
+  <h2 class="text-h6 mb-1">
     {{ $t('UserDetail.LatestPrices') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h2>
diff --git a/src/views/UserList.vue b/src/views/UserList.vue
index b42b881bfc..48192652bc 100644
--- a/src/views/UserList.vue
+++ b/src/views/UserList.vue
@@ -1,5 +1,5 @@
 <template>
-  <h1 class="mb-1">
+  <h1 class="text-h5 mb-1">
     {{ $t('UserList.Title') }}
     <v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
   </h1>
diff --git a/src/views/UserSettings.vue b/src/views/UserSettings.vue
index eda1f88af9..aec991ea7c 100644
--- a/src/views/UserSettings.vue
+++ b/src/views/UserSettings.vue
@@ -1,5 +1,7 @@
 <template>
-  <h1 class="mb-1">{{ $t('UserSettings.Title') }}</h1>
+  <h1 class="text-h5 mb-1">
+    {{ $t('UserSettings.Title') }}
+  </h1>
 
   <v-form @submit.prevent="updateSettings">
     <v-row>