diff --git a/res/css/components/views/settings/devices/_DeviceDetails.pcss b/res/css/components/views/settings/devices/_DeviceDetails.pcss
index 9b34fa378a..00074f0d2f 100644
--- a/res/css/components/views/settings/devices/_DeviceDetails.pcss
+++ b/res/css/components/views/settings/devices/_DeviceDetails.pcss
@@ -55,7 +55,7 @@ limitations under the License.
 }
 
 .mx_DeviceDetails_metadataTable {
-    font-size: $font-12px;
+    font: var(--cpd-font-body-sm-regular);
     color: $secondary-content;
 
     width: 100%;
diff --git a/res/css/components/views/settings/devices/_DeviceTile.pcss b/res/css/components/views/settings/devices/_DeviceTile.pcss
index 18224362c2..7bfe1e0349 100644
--- a/res/css/components/views/settings/devices/_DeviceTile.pcss
+++ b/res/css/components/views/settings/devices/_DeviceTile.pcss
@@ -31,9 +31,8 @@ limitations under the License.
 
 .mx_DeviceTile_metadata {
     margin-top: $spacing-4;
-    font-size: $font-12px;
+    font: var(--cpd-font-body-sm-regular);
     color: $secondary-content;
-    line-height: $font-14px;
 }
 
 .mx_DeviceTile_inactiveIcon {
diff --git a/res/css/views/elements/_Dropdown.pcss b/res/css/views/elements/_Dropdown.pcss
index 4060dab176..8ab577a4cf 100644
--- a/res/css/views/elements/_Dropdown.pcss
+++ b/res/css/views/elements/_Dropdown.pcss
@@ -29,7 +29,7 @@ limitations under the License.
     position: relative;
     border-radius: 4px;
     border: 1px solid $strong-input-border-color;
-    font-size: $font-12px;
+    font: var(--cpd-font-body-sm-regular);
     user-select: none;
 }
 
diff --git a/res/css/views/right_panel/_BaseCard.pcss b/res/css/views/right_panel/_BaseCard.pcss
index b6b03aeb91..0990e9797e 100644
--- a/res/css/views/right_panel/_BaseCard.pcss
+++ b/res/css/views/right_panel/_BaseCard.pcss
@@ -229,7 +229,7 @@ limitations under the License.
             color: $primary-content;
         }
 
-        font-size: $font-12px;
+        font: var(--cpd-font-body-sm-regular);
         color: $secondary-content;
         padding-top: 10px;
         padding-bottom: 10px;
diff --git a/res/css/views/rooms/_EventTile.pcss b/res/css/views/rooms/_EventTile.pcss
index 6d93a5e41e..a8c146a32a 100644
--- a/res/css/views/rooms/_EventTile.pcss
+++ b/res/css/views/rooms/_EventTile.pcss
@@ -1160,6 +1160,7 @@ $left-gutter: 64px;
         display: flex;
         align-items: center;
         position: relative;
+        font: var(--cpd-font-body-sm-regular);
 
         &::before {
             @mixin ThreadSummaryIcon;
@@ -1167,8 +1168,6 @@ $left-gutter: 64px;
 
         .mx_ThreadPanel_replies_amount {
             @mixin ThreadRepliesAmount;
-            line-height: var(--EventTile_ThreadSummary-line-height);
-            font-size: $font-12px; /* Same font size as the counter on the main panel */
         }
 
         .mx_ThreadSummary_content {
diff --git a/res/css/views/rooms/_ThreadSummary.pcss b/res/css/views/rooms/_ThreadSummary.pcss
index 7e8c869104..34fe50e989 100644
--- a/res/css/views/rooms/_ThreadSummary.pcss
+++ b/res/css/views/rooms/_ThreadSummary.pcss
@@ -14,12 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_ThreadSummary,
-.mx_ThreadSummary_content,
-.mx_ThreadSummary_icon {
-    font-size: $font-12px;
-}
-
 .mx_ThreadSummary,
 .mx_ThreadSummary_content {
     color: $secondary-content;
@@ -47,6 +41,7 @@ limitations under the License.
     clear: both;
     overflow: hidden;
     border: 1px solid $panels; /* always render a border so the hover effect doesn't require a re-layout */
+    font: var(--cpd-font-body-sm-regular);
 
     .mx_ThreadSummary_chevron {
         position: absolute;