diff --git a/src/App/App.xaml b/src/App/App.xaml
index 049f80fb4..c21ed3905 100644
--- a/src/App/App.xaml
+++ b/src/App/App.xaml
@@ -3,6 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Bit.App.App">
     <Application.Resources>
-
     </Application.Resources>
-</Application>
\ No newline at end of file
+</Application>
+    
\ No newline at end of file
diff --git a/src/App/App.xaml.cs b/src/App/App.xaml.cs
index b87e44f34..4ee26492a 100644
--- a/src/App/App.xaml.cs
+++ b/src/App/App.xaml.cs
@@ -1,6 +1,8 @@
 using Bit.App.Pages;
 using System;
+using System.Reflection;
 using Xamarin.Forms;
+using Xamarin.Forms.StyleSheets;
 using Xamarin.Forms.Xaml;
 
 [assembly: XamlCompilation(XamlCompilationOptions.Compile)]
@@ -11,6 +13,23 @@ namespace Bit.App
         public App()
         {
             InitializeComponent();
+
+            // TODO: Load theme?
+            if(false)
+            {
+#pragma warning disable CS0162 // Unreachable code detected
+                Resources.Add(
+#pragma warning restore CS0162 // Unreachable code detected
+                    StyleSheet.FromAssemblyResource(IntrospectionExtensions.GetTypeInfo(typeof(App)).Assembly,
+                    "Bit.App.Css.dark.css"));
+            }
+            Resources.Add(
+                StyleSheet.FromAssemblyResource(IntrospectionExtensions.GetTypeInfo(typeof(App)).Assembly,
+                "Bit.App.Css.styles.css"));
+            Resources.Add(
+                StyleSheet.FromAssemblyResource(IntrospectionExtensions.GetTypeInfo(typeof(App)).Assembly,
+                $"Bit.App.Css.{Device.RuntimePlatform.ToLowerInvariant()}.css"));
+
             MainPage = new TabsPage();
         }
 
diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
index b560b7862..ead5e568e 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -3,12 +3,11 @@
           xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
           x:Class="Bit.App.Controls.CipherViewCell"
           xmlns:controls="clr-namespace:Bit.App.Controls">
-
     <ViewCell.View>
+
         <StackLayout x:Name="_layout"
                      Padding="10"
                      x:DataType="controls:CipherViewCellViewModel">
-
             <StackLayout.BindingContext>
                 <controls:CipherViewCellViewModel />
             </StackLayout.BindingContext>
@@ -16,8 +15,7 @@
             <Label Text="{Binding Cipher.Name}"
                    LineBreakMode="NoWrap"
                    FontSize="16" />
-
         </StackLayout>
-    </ViewCell.View>
 
+    </ViewCell.View>
 </ViewCell>
diff --git a/src/App/Controls/FaLabel.cs b/src/App/Controls/FaLabel.cs
new file mode 100644
index 000000000..23839fc95
--- /dev/null
+++ b/src/App/Controls/FaLabel.cs
@@ -0,0 +1,20 @@
+using Xamarin.Forms;
+
+namespace Bit.App.Controls
+{
+    public class FaLabel : Label
+    {
+        public FaLabel()
+        {
+            switch(Device.RuntimePlatform)
+            {
+                case Device.iOS:
+                    FontFamily = "FontAwesome";
+                    break;
+                case Device.Android:
+                    FontFamily = "FontAwesome.ttf#FontAwesome";
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/App/Css/android.css b/src/App/Css/android.css
new file mode 100644
index 000000000..a2b2970d9
--- /dev/null
+++ b/src/App/Css/android.css
@@ -0,0 +1,3 @@
+^Label, ^Entry, ^Editor {
+    font-size: 16;
+}
diff --git a/src/App/Css/dark.css b/src/App/Css/dark.css
new file mode 100644
index 000000000..f5b591a49
--- /dev/null
+++ b/src/App/Css/dark.css
@@ -0,0 +1,3 @@
+^contentpage {
+    background-color: gray;
+}
diff --git a/src/App/Css/ios.css b/src/App/Css/ios.css
new file mode 100644
index 000000000..4a0890cae
--- /dev/null
+++ b/src/App/Css/ios.css
@@ -0,0 +1,3 @@
+^Label, ^Entry, ^Editor {
+    font-size: 14;
+}
diff --git a/src/App/Css/styles.css b/src/App/Css/styles.css
new file mode 100644
index 000000000..1d2a93485
--- /dev/null
+++ b/src/App/Css/styles.css
@@ -0,0 +1,12 @@
+^ContentPage {
+    background-color: white;
+}
+
+StackLayout.list-cell {
+    padding: 10;
+    -xf-orientation: horizontal;
+}
+
+StackLayout.list-cell > FaLabel {
+    font-size: 22;
+}
diff --git a/src/App/Pages/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/GroupingsPage/GroupingsPage.xaml
index 656ea2823..c099a1f22 100644
--- a/src/App/Pages/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/GroupingsPage/GroupingsPage.xaml
@@ -21,10 +21,14 @@
             <DataTemplate x:Key="folderTemplate"
                           x:DataType="pages:GroupingsPageListItem">
                 <ViewCell>
-                    <StackLayout Padding="10">
+                    <StackLayout StyleClass="list-cell">
+                        <controls:FaLabel Text="&#xf07c;"
+                                          HorizontalOptions="Start"
+                                          VerticalOptions="CenterAndExpand" />
                         <Label Text="{Binding Folder.Name}"
-                               LineBreakMode="NoWrap"
-                               FontSize="16" />
+                               LineBreakMode="TailTruncation"
+                               HorizontalOptions="StartAndExpand"
+                               VerticalOptions="CenterAndExpand" />
                     </StackLayout>
                 </ViewCell>
             </DataTemplate>
@@ -32,10 +36,14 @@
             <DataTemplate x:Key="collectionTemplate"
                           x:DataType="pages:GroupingsPageListItem">
                 <ViewCell>
-                    <StackLayout Padding="10">
+                    <StackLayout StyleClass="list-cell">
+                        <controls:FaLabel Text="&#xf1b2;"
+                                          HorizontalOptions="Start"
+                                          VerticalOptions="CenterAndExpand" />
                         <Label Text="{Binding Collection.Name}"
-                               LineBreakMode="NoWrap"
-                               FontSize="16" />
+                               LineBreakMode="TailTruncation"
+                               HorizontalOptions="StartAndExpand"
+                               VerticalOptions="CenterAndExpand" />
                     </StackLayout>
                 </ViewCell>
             </DataTemplate>
diff --git a/src/App/Pages/SettingsPage.xaml b/src/App/Pages/SettingsPage.xaml
index ce357a702..7654d4b81 100644
--- a/src/App/Pages/SettingsPage.xaml
+++ b/src/App/Pages/SettingsPage.xaml
@@ -1,32 +1,24 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage 
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="Bit.App.Pages.SettingsPage"
-    xmlns:pages="clr-namespace:Bit.App.Pages"
-    x:DataType="pages:SettingsPageViewModel"
-    Title="{Binding PageTitle}">
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Bit.App.Pages.SettingsPage"
+             xmlns:pages="clr-namespace:Bit.App.Pages"
+             xmlns:controls="clr-namespace:Bit.App.Controls"
+             x:DataType="pages:SettingsPageViewModel"
+             Title="{Binding PageTitle}">
     <ContentPage.BindingContext>
         <pages:SettingsPageViewModel />
     </ContentPage.BindingContext>
 
     <StackLayout>
         <!-- Place new controls here -->
-        <Label
-            Text="Settings!"
-            HorizontalOptions="Center"
-            VerticalOptions="CenterAndExpand" />
-        <Label
-            Text="&#xf2b9;"
-            HorizontalOptions="Center"
-            VerticalOptions="CenterAndExpand">
-
-            <Label.FontFamily>
-                <OnPlatform x:TypeArguments="x:String"
-                    Android="FontAwesome.ttf#FontAwesome"
-                    iOS="FontAwesome" />
-            </Label.FontFamily>
-        </Label>
+        <Label Text="Settings!"
+               HorizontalOptions="Center"
+               VerticalOptions="CenterAndExpand" />
+        <controls:FaLabel Text="&#xf2b9;"
+                          HorizontalOptions="Center"
+                          VerticalOptions="CenterAndExpand">
+        </controls:FaLabel>
     </StackLayout>
 
 </ContentPage>