diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-hdpi/browse.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-hdpi/browse.png
deleted file mode 100644
index 26760d47b..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-hdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-hdpi/home.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-hdpi/home.png
deleted file mode 100644
index b9e32e4a1..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-hdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-hdpi/search.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-hdpi/search.png
deleted file mode 100644
index 40c311a90..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-hdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-mdpi/browse.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-mdpi/browse.png
deleted file mode 100644
index 50dccb475..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-mdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-mdpi/home.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-mdpi/home.png
deleted file mode 100644
index 22fd209ce..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-mdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-mdpi/search.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-mdpi/search.png
deleted file mode 100644
index 6beb756be..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-mdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xhdpi/browse.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xhdpi/browse.png
deleted file mode 100644
index 6dab5363b..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xhdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xhdpi/home.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xhdpi/home.png
deleted file mode 100644
index 5dc68a4e8..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xhdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xhdpi/search.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xhdpi/search.png
deleted file mode 100644
index edc52d42c..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xhdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/browse.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/browse.png
deleted file mode 100644
index 6b2acb40b..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/home.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/home.png
deleted file mode 100644
index a25d1a2e4..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/search.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/search.png
deleted file mode 100644
index 8e37b99fd..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxhdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png
deleted file mode 100644
index 9a4d6ce88..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png
deleted file mode 100644
index 372293f0f..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/search.png b/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/search.png
deleted file mode 100644
index f4e8e65d9..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/Android/src/main/res/drawable-xxxhdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/browse.png b/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/browse.png
deleted file mode 100644
index cde8ecf30..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/browse@2x.png b/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/browse@2x.png
deleted file mode 100644
index 37e94bd5c..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/browse@2x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/browse@3x.png b/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/browse@3x.png
deleted file mode 100644
index 5adce0609..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/browse@3x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/home.png b/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/home.png
deleted file mode 100644
index ca969cb8c..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/home@2x.png b/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/home@2x.png
deleted file mode 100644
index ace1ca2aa..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/home@2x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/home@3x.png b/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/home@3x.png
deleted file mode 100644
index ca2bef9e8..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/home@3x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/search.png b/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/search.png
deleted file mode 100644
index 68b6e1440..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/search@2x.png b/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/search@2x.png
deleted file mode 100644
index 097b02828..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/search@2x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/search@3x.png b/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/search@3x.png
deleted file mode 100644
index b140301e2..000000000
Binary files a/packages/template-tab-navigation-ng/App_Resources/iOS/tabIcons/search@3x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ng/package.json b/packages/template-tab-navigation-ng/package.json
index c78aeb359..a43897fc4 100644
--- a/packages/template-tab-navigation-ng/package.json
+++ b/packages/template-tab-navigation-ng/package.json
@@ -53,14 +53,14 @@
     "nativescript-theme-core": "~1.0.6",
     "reflect-metadata": "~0.1.12",
     "rxjs": "^6.4.0",
-    "tns-core-modules": "~6.0.0",
+    "tns-core-modules": "next",
     "zone.js": "~0.9.1"
   },
   "devDependencies": {
     "@angular/compiler-cli": "~8.2.0",
     "@ngtools/webpack": "~8.2.0",
     "codelyzer": "~4.5.0",
-    "nativescript-dev-webpack": "~1.1.0",
+    "nativescript-dev-webpack": "next",
     "node-sass": "^4.7.1",
     "tslint": "~5.11.0",
     "typescript": "~3.5.3"
diff --git a/packages/template-tab-navigation-ng/src/app/app.component.android.scss b/packages/template-tab-navigation-ng/src/app/app.component.android.scss
index c62d15d82..4c2574f0f 100644
--- a/packages/template-tab-navigation-ng/src/app/app.component.android.scss
+++ b/packages/template-tab-navigation-ng/src/app/app.component.android.scss
@@ -1,7 +1,20 @@
 @import 'app.component';
 
 // Place any CSS rules you want to apply only on Android here
-TabView {
-    tab-text-color: $blue-dark;
-    selected-tab-text-color: $item-active-color;
-}
\ No newline at end of file
+TabStripItem Label {
+    color: $blue-dark;
+    text-transform: uppercase;
+    font-weight: bold;
+}
+
+TabStripItem:active Label {
+    color: $item-active-color;
+}
+
+TabStripItem Image {
+    color: $blue-dark;
+}
+
+TabStripItem:active Image {
+    color: $item-active-color;
+}
diff --git a/packages/template-tab-navigation-ng/src/app/app.component.html b/packages/template-tab-navigation-ng/src/app/app.component.html
index 2119a06c8..14b9bab25 100644
--- a/packages/template-tab-navigation-ng/src/app/app.component.html
+++ b/packages/template-tab-navigation-ng/src/app/app.component.html
@@ -1,18 +1,43 @@
-<TabView androidTabsPosition="bottom">
+<BottomNavigation>
+    <TabStrip>
+        <!--
+            Besides the approach demonstrated below there is alternative shorthand syntax for setting TabStripItem title and icon:
 
-    <page-router-outlet
-        *tabItem="{title: 'Home', iconSource: getIconSource('home')}"
-        name="homeTab">
-    </page-router-outlet>
+            <TabStripItem title="Home" iconSource="res://tabIcons/home" />
 
-    <page-router-outlet
-        *tabItem="{title: 'Browse', iconSource: getIconSource('browse')}"
-        name="browseTab">
-    </page-router-outlet>
+            Both shorthand and verbose syntax can use
+            TabStripItem Label {...} css selector to style the title label,
+            and TabStriptItem Image {...} css selector to style the icon image (see _app-common.scss).
+            Note that when working with font icons we recommend the usage of the verbose syntax as it
+            is explicit and describes better the need to provide font icon as well as set the respective font (e.g. via class name).
+         -->
+        <TabStripItem>
+            <!--
+                Note TabStripItem will only accept single Label and/or single Image elements that it
+                will "adopt"; any other layout elements you try to specify will be ignored
+            -->
+            <Label text="Home"></Label>
+            <Image src="font://&#xf015;" class="fa"></Image>
+        </TabStripItem>
+        <TabStripItem>
+            <Label text="Browse"></Label>
+            <Image src="font://&#xf1ea;" class="fa"></Image>
+        </TabStripItem>
+        <TabStripItem>
+            <Label text="Search"></Label>
+            <Image src="font://&#xf002;" class="fa"></Image>
+        </TabStripItem>
+    </TabStrip>
 
-    <page-router-outlet
-        *tabItem="{title: 'Search', iconSource: getIconSource('search')}"
-        name="searchTab">
-    </page-router-outlet>
+    <TabContentItem>
+        <page-router-outlet name="homeTab"></page-router-outlet>
+    </TabContentItem>
 
-</TabView>
\ No newline at end of file
+    <TabContentItem>
+        <page-router-outlet name="browseTab"></page-router-outlet>
+    </TabContentItem>
+
+    <TabContentItem>
+        <page-router-outlet name="searchTab"></page-router-outlet>
+    </TabContentItem>
+</BottomNavigation>
diff --git a/packages/template-tab-navigation-ng/src/app/app.component.ios.scss b/packages/template-tab-navigation-ng/src/app/app.component.ios.scss
index e6205509a..f1a111a1d 100644
--- a/packages/template-tab-navigation-ng/src/app/app.component.ios.scss
+++ b/packages/template-tab-navigation-ng/src/app/app.component.ios.scss
@@ -1,6 +1,18 @@
 @import 'app.component';
 
 // Place any CSS rules you want to apply only on IOS here
-TabView {
-    selected-tab-text-color: $item-active-color;
-}
\ No newline at end of file
+TabStripItem Label {
+    color: $blue-dark;
+}
+
+TabStripItem:active Label {
+    color: $item-active-color;
+}
+
+TabStripItem Image {
+    color: $blue-dark;
+}
+
+TabStripItem:active Image {
+    color: $item-active-color;
+}
diff --git a/packages/template-tab-navigation-ng/src/app/app.component.ts b/packages/template-tab-navigation-ng/src/app/app.component.ts
index 7acfde182..01b6e2b40 100644
--- a/packages/template-tab-navigation-ng/src/app/app.component.ts
+++ b/packages/template-tab-navigation-ng/src/app/app.component.ts
@@ -15,10 +15,4 @@ export class AppComponent implements OnInit {
     ngOnInit(): void {
         // Init your component properties here.
     }
-
-    getIconSource(icon: string): string {
-        const iconPrefix = isAndroid ? "res://" : "res://tabIcons/";
-
-        return iconPrefix + icon;
-    }
 }
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-hdpi/browse.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-hdpi/browse.png
deleted file mode 100644
index 26760d47b..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-hdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-hdpi/home.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-hdpi/home.png
deleted file mode 100644
index b9e32e4a1..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-hdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-hdpi/search.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-hdpi/search.png
deleted file mode 100644
index 40c311a90..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-hdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-mdpi/browse.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-mdpi/browse.png
deleted file mode 100644
index 50dccb475..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-mdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-mdpi/home.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-mdpi/home.png
deleted file mode 100644
index 22fd209ce..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-mdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-mdpi/search.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-mdpi/search.png
deleted file mode 100644
index 6beb756be..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-mdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xhdpi/browse.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xhdpi/browse.png
deleted file mode 100644
index 6dab5363b..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xhdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xhdpi/home.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xhdpi/home.png
deleted file mode 100644
index 5dc68a4e8..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xhdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xhdpi/search.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xhdpi/search.png
deleted file mode 100644
index edc52d42c..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xhdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxhdpi/browse.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxhdpi/browse.png
deleted file mode 100644
index 6b2acb40b..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxhdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxhdpi/home.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxhdpi/home.png
deleted file mode 100644
index a25d1a2e4..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxhdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxhdpi/search.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxhdpi/search.png
deleted file mode 100644
index 8e37b99fd..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxhdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png
deleted file mode 100644
index 9a4d6ce88..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png
deleted file mode 100644
index 372293f0f..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/search.png b/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/search.png
deleted file mode 100644
index f4e8e65d9..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/browse.png b/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/browse.png
deleted file mode 100644
index cde8ecf30..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/browse@2x.png b/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/browse@2x.png
deleted file mode 100644
index 37e94bd5c..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/browse@2x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/browse@3x.png b/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/browse@3x.png
deleted file mode 100644
index 5adce0609..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/browse@3x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/home.png b/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/home.png
deleted file mode 100644
index ca969cb8c..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/home@2x.png b/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/home@2x.png
deleted file mode 100644
index ace1ca2aa..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/home@2x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/home@3x.png b/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/home@3x.png
deleted file mode 100644
index ca2bef9e8..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/home@3x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/search.png b/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/search.png
deleted file mode 100644
index 68b6e1440..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/search@2x.png b/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/search@2x.png
deleted file mode 100644
index 097b02828..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/search@2x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/search@3x.png b/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/search@3x.png
deleted file mode 100644
index b140301e2..000000000
Binary files a/packages/template-tab-navigation-ts/app/App_Resources/iOS/tabIcons/search@3x.png and /dev/null differ
diff --git a/packages/template-tab-navigation-ts/app/_app-common.scss b/packages/template-tab-navigation-ts/app/_app-common.scss
index dd8d22ff3..be8b392ce 100644
--- a/packages/template-tab-navigation-ts/app/_app-common.scss
+++ b/packages/template-tab-navigation-ts/app/_app-common.scss
@@ -25,4 +25,20 @@
 //Action bar
 ActionBar .action-bar-title {
     horizontal-align: center;
-}
\ No newline at end of file
+}
+
+TabStripItem Label {
+    color: $blue-dark;
+}
+
+TabStripItem:active Label {
+    color: $item-active-color;
+}
+
+TabStripItem Image {
+    color: $blue-dark;
+}
+
+TabStripItem:active Image {
+    color: $item-active-color;
+}
diff --git a/packages/template-tab-navigation-ts/app/app-root.xml b/packages/template-tab-navigation-ts/app/app-root.xml
index 5722be046..f68ed82f9 100644
--- a/packages/template-tab-navigation-ts/app/app-root.xml
+++ b/packages/template-tab-navigation-ts/app/app-root.xml
@@ -1,19 +1,51 @@
 <!--
-The TabView component provides a simple way to navigate between different views by
-tapping on some of the tabs or by swiping between the views.
-Learn more about the TabView component in this documentation article:
-http://docs.nativescript.org/cookbook/ui/tab-view
+The BottomNavigation component provides a way for high level navigation between different views by
+tapping on some of the tabs. Learn more about the BottomNavigation component
+in this documentation article: https://docs.nativescript.org/ui/ns-ui-widgets/bottom-navigation.
+Tabs component is similar to BottomNavigation but suitable for mid level navigation scenarios thus
+supports swiping between the views. Learn more about the Tabs component in this documentation article:
+https://docs.nativescript.org/angular/ui/ng-ui-widgets/tabs.
 -->
-<TabView androidTabsPosition="bottom">
-    <TabViewItem title="Home" ios:iconSource="res://tabIcons/home" android:iconSource="res://home">
-        <Frame defaultPage="home/home-items-page"></Frame>
-    </TabViewItem>
+<BottomNavigation>
+    <TabStrip>
+        <!--
+            Besides the approach demonstrated below there is alternative shorthand syntax for setting TabStripItem title and icon:
 
-    <TabViewItem title="Browse" ios:iconSource="res://tabIcons/browse" android:iconSource="res://browse">
-        <Frame defaultPage="browse/browse-page"></Frame>
-    </TabViewItem>
+            <TabStripItem title="Home" iconSource="res://tabIcons/home" />
 
-    <TabViewItem title="Search" ios:iconSource="res://tabIcons/search" android:iconSource="res://search">
-        <Frame defaultPage="search/search-page"></Frame>
-    </TabViewItem>
-</TabView>
+            Both shorthand and verbose syntax can use
+            TabStripItem Label {...} css selector to style the title label,
+            and TabStriptItem Image {...} css selector to style the icon image (see _app-common.scss).
+            Note that when working with font icons we recommend the usage of the verbose syntax as it
+            is explicit and describes better the need to provide font icon as well as set the respective font (e.g. via class name).
+         -->
+        <TabStripItem>
+            <!--
+                Note TabStripItem will only accept single Label and/or single Image elements that it
+                will "adopt"; any other layout elements you try to specify will be ignored
+            -->
+            <Label text="Home" />
+            <Image src="font://&#xf015;" class="fa" />
+        </TabStripItem>
+        <TabStripItem>
+            <Label text="Browse" />
+            <Image src="font://&#xf1ea;" class="fa" />
+        </TabStripItem>
+        <TabStripItem>
+            <Label text="Search" />
+            <Image src="font://&#xf002;" class="fa" />
+        </TabStripItem>
+    </TabStrip>
+
+    <TabContentItem>
+        <Frame defaultPage="home/home-items-page" />
+    </TabContentItem>
+
+    <TabContentItem>
+        <Frame defaultPage="browse/browse-page" />
+    </TabContentItem>
+
+    <TabContentItem>
+        <Frame defaultPage="search/search-page" />
+    </TabContentItem>
+</BottomNavigation>
diff --git a/packages/template-tab-navigation-ts/app/app.android.scss b/packages/template-tab-navigation-ts/app/app.android.scss
index f0668ef30..41ed9c87b 100644
--- a/packages/template-tab-navigation-ts/app/app.android.scss
+++ b/packages/template-tab-navigation-ts/app/app.android.scss
@@ -9,9 +9,8 @@
 @import 'app-common';
 
 // Place any CSS rules you want to apply only on Android here
-TabView {
-    tab-text-color: $blue-dark;
-    selected-tab-text-color: $item-active-color;
+TabStripItem Label {
+    text-transform: uppercase;
+    font-weight: bold;
 }
 
-
diff --git a/packages/template-tab-navigation-ts/app/app.ios.scss b/packages/template-tab-navigation-ts/app/app.ios.scss
index 00157a30d..5e7f30f85 100644
--- a/packages/template-tab-navigation-ts/app/app.ios.scss
+++ b/packages/template-tab-navigation-ts/app/app.ios.scss
@@ -9,6 +9,3 @@
 @import 'app-common';
 
 // Place any CSS rules you want to apply only on iOS here
-TabView {
-    selected-tab-text-color: $item-active-color;
-}
diff --git a/packages/template-tab-navigation-ts/package.json b/packages/template-tab-navigation-ts/package.json
index 8b2930e7b..ea6d5f852 100644
--- a/packages/template-tab-navigation-ts/package.json
+++ b/packages/template-tab-navigation-ts/package.json
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "nativescript-theme-core": "~1.0.6",
-    "tns-core-modules": "~6.0.0"
+    "tns-core-modules": "next"
   },
   "devDependencies": {
     "nativescript-dev-webpack": "~1.1.0",
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-hdpi/browse.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-hdpi/browse.png
deleted file mode 100644
index 26760d47b..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-hdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-hdpi/home.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-hdpi/home.png
deleted file mode 100644
index b9e32e4a1..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-hdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-hdpi/search.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-hdpi/search.png
deleted file mode 100644
index 40c311a90..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-hdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-mdpi/browse.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-mdpi/browse.png
deleted file mode 100644
index 50dccb475..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-mdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-mdpi/home.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-mdpi/home.png
deleted file mode 100644
index 22fd209ce..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-mdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-mdpi/search.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-mdpi/search.png
deleted file mode 100644
index 6beb756be..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-mdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xhdpi/browse.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xhdpi/browse.png
deleted file mode 100644
index 6dab5363b..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xhdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xhdpi/home.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xhdpi/home.png
deleted file mode 100644
index 5dc68a4e8..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xhdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xhdpi/search.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xhdpi/search.png
deleted file mode 100644
index edc52d42c..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xhdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxhdpi/browse.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxhdpi/browse.png
deleted file mode 100644
index 6b2acb40b..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxhdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxhdpi/home.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxhdpi/home.png
deleted file mode 100644
index a25d1a2e4..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxhdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxhdpi/search.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxhdpi/search.png
deleted file mode 100644
index 8e37b99fd..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxhdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png
deleted file mode 100644
index 9a4d6ce88..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png
deleted file mode 100644
index 372293f0f..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/search.png b/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/search.png
deleted file mode 100644
index f4e8e65d9..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/Android/src/main/res/drawable-xxxhdpi/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/browse.png b/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/browse.png
deleted file mode 100644
index cde8ecf30..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/browse.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/browse@2x.png b/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/browse@2x.png
deleted file mode 100644
index 37e94bd5c..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/browse@2x.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/browse@3x.png b/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/browse@3x.png
deleted file mode 100644
index 5adce0609..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/browse@3x.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/home.png b/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/home.png
deleted file mode 100644
index ca969cb8c..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/home.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/home@2x.png b/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/home@2x.png
deleted file mode 100644
index ace1ca2aa..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/home@2x.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/home@3x.png b/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/home@3x.png
deleted file mode 100644
index ca2bef9e8..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/home@3x.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/search.png b/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/search.png
deleted file mode 100644
index 68b6e1440..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/search.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/search@2x.png b/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/search@2x.png
deleted file mode 100644
index 097b02828..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/search@2x.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/search@3x.png b/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/search@3x.png
deleted file mode 100644
index b140301e2..000000000
Binary files a/packages/template-tab-navigation/app/App_Resources/iOS/tabIcons/search@3x.png and /dev/null differ
diff --git a/packages/template-tab-navigation/app/_app-common.scss b/packages/template-tab-navigation/app/_app-common.scss
index dd8d22ff3..9a3edc136 100644
--- a/packages/template-tab-navigation/app/_app-common.scss
+++ b/packages/template-tab-navigation/app/_app-common.scss
@@ -2,27 +2,43 @@
 // This is where the vast majority of your CSS code goes.
 // Font icon class
 .fa {
-   font-family: "FontAwesome";
-}
-// Common page class
-.page-content {
-    .page-placeholder {
-        color: $page-icon-color;
-        font-size: $page-content-placeholder-font-size;
-        vertical-align: center;
-        horizontal-align: center;
-    }
+    font-family: "FontAwesome";
+ }
+ // Common page class
+ .page-content {
+     .page-placeholder {
+         color: $page-icon-color;
+         font-size: $page-content-placeholder-font-size;
+         vertical-align: center;
+         horizontal-align: center;
+     }
 
-    .page-icon {
-        font-size: 72;
-        vertical-align: top;
-        horizontal-align: center;
-        color: $page-icon-color;
-        margin-top: 20%;
-    }
-}
+     .page-icon {
+         font-size: 72;
+         vertical-align: top;
+         horizontal-align: center;
+         color: $page-icon-color;
+         margin-top: 20%;
+     }
+ }
 
-//Action bar
-ActionBar .action-bar-title {
-    horizontal-align: center;
-}
\ No newline at end of file
+ //Action bar
+ ActionBar .action-bar-title {
+     horizontal-align: center;
+ }
+
+ TabStripItem Label {
+     color: $blue-dark;
+ }
+
+ TabStripItem:active Label {
+     color: $item-active-color;
+ }
+
+ TabStripItem Image {
+     color: $blue-dark;
+ }
+
+ TabStripItem:active Image {
+     color: $item-active-color;
+ }
diff --git a/packages/template-tab-navigation/app/app-root.xml b/packages/template-tab-navigation/app/app-root.xml
index 5722be046..f68ed82f9 100644
--- a/packages/template-tab-navigation/app/app-root.xml
+++ b/packages/template-tab-navigation/app/app-root.xml
@@ -1,19 +1,51 @@
 <!--
-The TabView component provides a simple way to navigate between different views by
-tapping on some of the tabs or by swiping between the views.
-Learn more about the TabView component in this documentation article:
-http://docs.nativescript.org/cookbook/ui/tab-view
+The BottomNavigation component provides a way for high level navigation between different views by
+tapping on some of the tabs. Learn more about the BottomNavigation component
+in this documentation article: https://docs.nativescript.org/ui/ns-ui-widgets/bottom-navigation.
+Tabs component is similar to BottomNavigation but suitable for mid level navigation scenarios thus
+supports swiping between the views. Learn more about the Tabs component in this documentation article:
+https://docs.nativescript.org/angular/ui/ng-ui-widgets/tabs.
 -->
-<TabView androidTabsPosition="bottom">
-    <TabViewItem title="Home" ios:iconSource="res://tabIcons/home" android:iconSource="res://home">
-        <Frame defaultPage="home/home-items-page"></Frame>
-    </TabViewItem>
+<BottomNavigation>
+    <TabStrip>
+        <!--
+            Besides the approach demonstrated below there is alternative shorthand syntax for setting TabStripItem title and icon:
 
-    <TabViewItem title="Browse" ios:iconSource="res://tabIcons/browse" android:iconSource="res://browse">
-        <Frame defaultPage="browse/browse-page"></Frame>
-    </TabViewItem>
+            <TabStripItem title="Home" iconSource="res://tabIcons/home" />
 
-    <TabViewItem title="Search" ios:iconSource="res://tabIcons/search" android:iconSource="res://search">
-        <Frame defaultPage="search/search-page"></Frame>
-    </TabViewItem>
-</TabView>
+            Both shorthand and verbose syntax can use
+            TabStripItem Label {...} css selector to style the title label,
+            and TabStriptItem Image {...} css selector to style the icon image (see _app-common.scss).
+            Note that when working with font icons we recommend the usage of the verbose syntax as it
+            is explicit and describes better the need to provide font icon as well as set the respective font (e.g. via class name).
+         -->
+        <TabStripItem>
+            <!--
+                Note TabStripItem will only accept single Label and/or single Image elements that it
+                will "adopt"; any other layout elements you try to specify will be ignored
+            -->
+            <Label text="Home" />
+            <Image src="font://&#xf015;" class="fa" />
+        </TabStripItem>
+        <TabStripItem>
+            <Label text="Browse" />
+            <Image src="font://&#xf1ea;" class="fa" />
+        </TabStripItem>
+        <TabStripItem>
+            <Label text="Search" />
+            <Image src="font://&#xf002;" class="fa" />
+        </TabStripItem>
+    </TabStrip>
+
+    <TabContentItem>
+        <Frame defaultPage="home/home-items-page" />
+    </TabContentItem>
+
+    <TabContentItem>
+        <Frame defaultPage="browse/browse-page" />
+    </TabContentItem>
+
+    <TabContentItem>
+        <Frame defaultPage="search/search-page" />
+    </TabContentItem>
+</BottomNavigation>
diff --git a/packages/template-tab-navigation/app/app.android.scss b/packages/template-tab-navigation/app/app.android.scss
index f0668ef30..5d0f36ffa 100644
--- a/packages/template-tab-navigation/app/app.android.scss
+++ b/packages/template-tab-navigation/app/app.android.scss
@@ -9,9 +9,7 @@
 @import 'app-common';
 
 // Place any CSS rules you want to apply only on Android here
-TabView {
-    tab-text-color: $blue-dark;
-    selected-tab-text-color: $item-active-color;
+TabStripItem Label {
+    text-transform: uppercase;
+    font-weight: bold;
 }
-
-
diff --git a/packages/template-tab-navigation/app/app.ios.scss b/packages/template-tab-navigation/app/app.ios.scss
index 0845945a0..5e7f30f85 100644
--- a/packages/template-tab-navigation/app/app.ios.scss
+++ b/packages/template-tab-navigation/app/app.ios.scss
@@ -9,6 +9,3 @@
 @import 'app-common';
 
 // Place any CSS rules you want to apply only on iOS here
-TabView {
-    selected-tab-text-color: $item-active-color;
-}
\ No newline at end of file
diff --git a/packages/template-tab-navigation/app/home/home-items-view-model.js b/packages/template-tab-navigation/app/home/home-items-view-model.js
index 5dcd735da..178665502 100644
--- a/packages/template-tab-navigation/app/home/home-items-view-model.js
+++ b/packages/template-tab-navigation/app/home/home-items-view-model.js
@@ -50,6 +50,22 @@ function HomeItemsViewModel() {
             {
                 name: "Item 12",
                 description: "Description for Item 12"
+            },
+            {
+                name: "Item 13",
+                description: "Description for Item 13"
+            },
+            {
+                name: "Item 14",
+                description: "Description for Item 14"
+            },
+            {
+                name: "Item 15",
+                description: "Description for Item 15"
+            },
+            {
+                name: "Item 16",
+                description: "Description for Item 16"
             }
         ]
     });
diff --git a/packages/template-tab-navigation/package.json b/packages/template-tab-navigation/package.json
index 7d8b55957..9ae20d1d2 100644
--- a/packages/template-tab-navigation/package.json
+++ b/packages/template-tab-navigation/package.json
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "nativescript-theme-core": "~1.0.6",
-    "tns-core-modules": "~6.0.0"
+    "tns-core-modules": "next"
   },
   "devDependencies": {
     "eslint": "~5.8.0",