diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 3c8aa80a5..fe955766c 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -209,11 +209,13 @@
     <Content Include="apps\ui-tests-app\css\decoration-transform-formattedtext.xml" />
     <Content Include="apps\ui-tests-app\css\text-decoration.xml" />
     <Content Include="apps\ui-tests-app\css\text-transform.xml" />
-    <Content Include="apps\ui-tests-app\css\tab-view.xml" />
-    <Content Include="apps\ui-tests-app\css\text.css" />
+    <Content Include="apps\ui-tests-app\css\tab-view-more.xml" />
+    <Content Include="apps\ui-tests-app\css\test.css" />
     <Content Include="apps\ui-tests-app\css\white-space.xml">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="apps\ui-tests-app\font\material-icons.xml" />
+    <Content Include="apps\ui-tests-app\font\tab-view.xml" />
     <Content Include="apps\ui-tests-app\html-view\html-view.xml">
       <SubType>Designer</SubType>
     </Content>
diff --git a/apps/ui-tests-app/css/tab-view.xml b/apps/ui-tests-app/css/tab-view-more.xml
similarity index 96%
rename from apps/ui-tests-app/css/tab-view.xml
rename to apps/ui-tests-app/css/tab-view-more.xml
index 02d5cb572..43163dc8a 100644
--- a/apps/ui-tests-app/css/tab-view.xml
+++ b/apps/ui-tests-app/css/tab-view-more.xml
@@ -1,4 +1,4 @@
-<Page cssFile="~/css/text.css">
+<Page cssFile="~/css/test.css">
   <TabView>
     <TabView.items>
 
diff --git a/apps/ui-tests-app/css/text.css b/apps/ui-tests-app/css/test.css
similarity index 100%
rename from apps/ui-tests-app/css/text.css
rename to apps/ui-tests-app/css/test.css
diff --git a/apps/ui-tests-app/font/material-icons.xml b/apps/ui-tests-app/font/material-icons.xml
index 472e27721..438b0b653 100644
--- a/apps/ui-tests-app/font/material-icons.xml
+++ b/apps/ui-tests-app/font/material-icons.xml
@@ -1,5 +1,5 @@
 <Page xmlns="http://schemas.nativescript.org/tns.xsd">
   <StackLayout>
-    <Label text="&#xf117;" style="font-family: Material-Design-Iconic-Font" />
+    <Label text="&#xf117;" style="font-family: Material-Design-Iconic-Font" /> <!--Moved to tab-view.xml-->
   </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/ui-tests-app/font/tab-view.xml b/apps/ui-tests-app/font/tab-view.xml
index d52ed3ef7..ff9376cd2 100644
--- a/apps/ui-tests-app/font/tab-view.xml
+++ b/apps/ui-tests-app/font/tab-view.xml
@@ -3,12 +3,12 @@
     <TabView.items>
       <TabViewItem ios:title="Tab 1 &#xf179;" android:title="Tab 1 &#xf17b;">
         <TabViewItem.view>
-          <Label text="Tab 1" />
+          <Label text="Tab 1 &#xf117;" style="font-family: Material-Design-Iconic-Font" />
         </TabViewItem.view>
       </TabViewItem>
       <TabViewItem ios:title="Tab 2 &#xf179;" android:title="Tab 2 &#xf17b;">
         <TabViewItem.view>
-          <Label text="Tab 2" />
+          <Label text="Tab 2 &#xf117;" style="font-family: Material-Design-Iconic-Font" />
         </TabViewItem.view>
       </TabViewItem>
     </TabView.items>
diff --git a/apps/ui-tests-app/mainPage.ts b/apps/ui-tests-app/mainPage.ts
index db06d6d60..c552bb367 100644
--- a/apps/ui-tests-app/mainPage.ts
+++ b/apps/ui-tests-app/mainPage.ts
@@ -48,11 +48,13 @@ examples.set("whitespace", "css/white-space");
 examples.set("radius", "css/radius");
 examples.set("styles", "css/styles");
 examples.set("switch", "css/views");
+examples.set("tabmore", "css/tab-view-more");
 
 examples.set("dialogs", "dialogs/dialogs");
 
 examples.set("fontbtn", "font/button");
 examples.set("fontlbl", "font/label");
+examples.set("tabfont", "font/tab-view");
 examples.set("fontfield", "font/text-field");
 examples.set("fontview", "font/text-view");