diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b25e8e..d7cec27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.2.1] - 2018-11-04
+### Changes
+- Changed `BottomNavigationBar` to `CupertinoTabBar` to remove empty space underneath icons
+- Added highlighting for the active page on the `CupertinoTabBar` 
+
+
+
 ## [1.2.0] - 2018-10-26
 ### Changes
 - Added push notifications with Cloud Functions (Android)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9e9405b..6423261 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -27,7 +27,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
-        versionName "1.2"
+        versionName "1.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
diff --git a/app-release.apk b/app-release.apk
index e86ea75..7f07005 100644
Binary files a/app-release.apk and b/app-release.apk differ
diff --git a/lib/main.dart b/lib/main.dart
index c6728bf..102d8f6 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
 import 'feed.dart';
 import 'upload_page.dart';
 import 'dart:async';
@@ -239,32 +240,32 @@ class _HomePageState extends State<HomePage> {
               physics: new NeverScrollableScrollPhysics(),
               onPageChanged: onPageChanged,
             ),
-            bottomNavigationBar: new BottomNavigationBar(
+            bottomNavigationBar: new CupertinoTabBar(
+              activeColor: Colors.orange,
               items: <BottomNavigationBarItem>[
                 new BottomNavigationBarItem(
-                    icon: new Icon(Icons.home, color: Colors.grey),
-                    title: new Container(),
+                    icon: new Icon(Icons.home, color: (_page == 0) ? Colors.black : Colors.grey),
+                    title: new Container(height: 0.0),
                     backgroundColor: Colors.white),
                 new BottomNavigationBarItem(
-                    icon: new Icon(Icons.search, color: Colors.grey),
-                    title: new Container(),
+                    icon: new Icon(Icons.search, color: (_page == 1) ? Colors.black : Colors.grey),
+                    title: new Container(height: 0.0),
                     backgroundColor: Colors.white),
                 new BottomNavigationBarItem(
-                    icon: new Icon(Icons.add_circle, color: Colors.grey),
-                    title: new Container(),
+                    icon: new Icon(Icons.add_circle, color: (_page == 2) ? Colors.black : Colors.grey),
+                    title: new Container(height: 0.0),
                     backgroundColor: Colors.white),
                 new BottomNavigationBarItem(
-                    icon: new Icon(Icons.star, color: Colors.grey),
-                    title: new Container(),
+                    icon: new Icon(Icons.star, color: (_page == 3) ? Colors.black : Colors.grey),
+                    title: new Container(height: 0.0),
                     backgroundColor: Colors.white),
                 new BottomNavigationBarItem(
-                    icon: new Icon(Icons.person_outline, color: Colors.grey),
-                    title: new Container(),
+                    icon: new Icon(Icons.person, color: (_page == 4) ? Colors.black : Colors.grey),
+                    title: new Container(height: 0.0),
                     backgroundColor: Colors.white),
               ],
               onTap: navigationTapped,
               currentIndex: _page,
-              type: BottomNavigationBarType.fixed,
             ),
           );
   }