diff --git a/src/App/Controls/AccountViewCell/AccountViewCell.xaml b/src/App/Controls/AccountViewCell/AccountViewCell.xaml
index c3eb578b7..3d45cf929 100644
--- a/src/App/Controls/AccountViewCell/AccountViewCell.xaml
+++ b/src/App/Controls/AccountViewCell/AccountViewCell.xaml
@@ -59,26 +59,26 @@
                     Grid.Row="0"
                     Text="{Binding AccountView.Email}"
                     IsVisible="{Binding IsActive}"
-                    StyleClass="list-title"
+                    StyleClass="accountlist-title, accountlist-title-platform"
                     LineBreakMode="TailTruncation" />
                 <Label
                     Grid.Row="0"
                     Text="{Binding AccountView.Email}"
                     IsVisible="{Binding IsActive, Converter={StaticResource inverseBool}}"
-                    StyleClass="list-title"
+                    StyleClass="accountlist-title, accountlist-title-platform"
                     TextColor="{DynamicResource MutedColor}"
                     LineBreakMode="TailTruncation" />
                 <Label
                     Grid.Row="1"
                     IsVisible="{Binding ShowHostname}"
                     Text="{Binding AccountView.Hostname}"
-                    StyleClass="list-sub"
+                    StyleClass="accountlist-sub, accountlist-sub-platform"
                     LineBreakMode="TailTruncation" />
                 <Label
                     Grid.Row="2"
                     Text="{u:I18n AccountUnlocked}"
                     IsVisible="{Binding IsUnlockedAndNotActive}"
-                    StyleClass="list-sub"
+                    StyleClass="accountlist-sub, accountlist-sub-platform"
                     FontAttributes="Italic"
                     TextTransform="Lowercase"
                     LineBreakMode="TailTruncation" />
@@ -86,7 +86,7 @@
                     Grid.Row="2"
                     Text="{u:I18n AccountLocked}"
                     IsVisible="{Binding IsLockedAndNotActive}"
-                    StyleClass="list-sub"
+                    StyleClass="accountlist-sub, accountlist-sub-platform"
                     FontAttributes="Italic"
                     TextTransform="Lowercase"
                     LineBreakMode="TailTruncation" />
@@ -94,7 +94,7 @@
                     Grid.Row="2"
                     Text="{u:I18n AccountLoggedOut}"
                     IsVisible="{Binding IsLoggedOutAndNotActive}"
-                    StyleClass="list-sub"
+                    StyleClass="accountlist-sub, accountlist-sub-platform"
                     FontAttributes="Italic"
                     TextTransform="Lowercase"
                     LineBreakMode="TailTruncation" />
@@ -144,7 +144,7 @@
                 AutomationProperties.IsInAccessibleTree="False" />
             <Label
                 Text="{u:I18n AddAccount}"
-                StyleClass="list-title"
+                StyleClass="accountlist-title, accountlist-title-platform"
                 LineBreakMode="TailTruncation"
                 VerticalOptions="Center"
                 Grid.Column="1" />
diff --git a/src/App/Styles/Android.xaml b/src/App/Styles/Android.xaml
index 48edce35b..42c292738 100644
--- a/src/App/Styles/Android.xaml
+++ b/src/App/Styles/Android.xaml
@@ -92,7 +92,7 @@
         <Setter Property="TextColor"
                 Value="{DynamicResource ButtonTextColor}" />
         <Setter Property="FontSize"
-                Value="18" />
+                Value="Medium" />
         <Setter Property="CornerRadius"
                 Value="5" />
         <Setter Property="Margin"
@@ -126,7 +126,7 @@
         <Setter Property="TextColor"
                 Value="{DynamicResource ButtonPrimaryTextColor}" />
         <Setter Property="FontSize"
-                Value="18" />
+                Value="Medium" />
         <Setter Property="FontAttributes"
                 Value="Bold" />
         <Setter Property="CornerRadius"
@@ -298,6 +298,18 @@
         <Setter Property="FontSize"
                 Value="25" />
     </Style>
+    <Style TargetType="Label"
+           Class="accountlist-title-platform"
+           ApplyToDerivedTypes="True">
+        <Setter Property="FontSize"
+                Value="Body" />
+    </Style>
+    <Style TargetType="Label"
+           Class="accountlist-sub-platform"
+           ApplyToDerivedTypes="True">
+        <Setter Property="FontSize"
+                Value="Caption" />
+    </Style>
     
     <!-- Box -->
 
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 27d5f60b9..dd024bbbb 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -221,6 +221,14 @@
         <Setter Property="TextColor"
                 Value="{DynamicResource MutedColor}" />
     </Style>
+    <Style TargetType="Label"
+           Class="accountlist-title">
+    </Style>
+    <Style TargetType="Label"
+           Class="accountlist-sub">
+        <Setter Property="TextColor"
+                Value="{DynamicResource MutedColor}" />
+    </Style>
     <Style TargetType="Label"
            ApplyToDerivedTypes="True"
            Class="list-title-icon">
diff --git a/src/App/Styles/iOS.xaml b/src/App/Styles/iOS.xaml
index 0ce572739..ca5201346 100644
--- a/src/App/Styles/iOS.xaml
+++ b/src/App/Styles/iOS.xaml
@@ -105,7 +105,7 @@
         <Setter Property="TextColor"
                 Value="{DynamicResource ButtonTextColor}" />
         <Setter Property="FontSize"
-                Value="18" />
+                Value="Medium" />
         <Setter Property="Margin"
                 Value="0, 5, 0, 0" />
         <Setter Property="VisualStateManager.VisualStateGroups">
@@ -143,7 +143,7 @@
         <Setter Property="TextColor"
                 Value="{DynamicResource ButtonPrimaryTextColor}" />
         <Setter Property="FontSize"
-                Value="18" />
+                Value="Medium" />
         <Setter Property="FontAttributes"
                 Value="Bold" />
         <Setter Property="Margin"
@@ -320,6 +320,16 @@
         <Setter Property="FontSize"
                 Value="25" />
     </Style>
+    <Style TargetType="Label"
+           Class="accountlist-title-platform"
+           ApplyToDerivedTypes="True">
+    </Style>
+    <Style TargetType="Label"
+           Class="accountlist-sub-platform"
+           ApplyToDerivedTypes="True">
+        <Setter Property="FontSize"
+                Value="Small" />
+    </Style>
 
     <!-- Box -->