diff --git a/.gitignore b/.gitignore
index 0d4ee63f..e5df7b91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,4 @@ captures/
 .idea/libraries
 
 # Keystore files
-*.jks
\ No newline at end of file
+*.jks
diff --git a/.travis.yml b/.travis.yml
index e4725cdb..a334babe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-25.0.1
+    - build-tools-25.0.2
     - android-25
     - extra-android-m2repository
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 980148f5..57a43657 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 ## Changelog
 
-(or: y u no add shiny new things?!)
+### 2.3.0
+
+* [#713](https://github.com/roughike/BottomBar/pull/713): Ripple touch feedback for tabs!
+* [#716](https://github.com/roughike/BottomBar/pull/716): Bugfix for misbehaving shadow. No more weird white spaces above the bar!
+* [#717](https://github.com/roughike/BottomBar/pull/717): Support for tabs with icons only, without titles!
+* [#722](https://github.com/roughike/BottomBar/pull/722): Showing / hiding the BottomBar when on shy mode.
+* [#714](https://github.com/roughike/BottomBar/pull/714): Controlling whether Toasts of tab titles are shown when long pressing tabs.
+* [#719](https://github.com/roughike/BottomBar/pull/719): Fix for wrong size in tabs
+* [#712](https://github.com/roughike/BottomBar/pull/712): Data binding fixes.
+
+Thanks for @yombunker, @MarcRubio and @tushar-acharya for their contributions!
+
+### 2.2.0
+
+* Ability to change icons when the tabs are selected, using drawable selectors
+* Overriding tab selections is now supported, by using [TabSelectionInterceptor](https://github.com/roughike/BottomBar/blob/master/bottom-bar/src/main/java/com/roughike/bottombar/TabSelectionInterceptor.java)
+* Internal code quality improvements and small changes
 
 ### 2.2.0
 
diff --git a/README.md b/README.md
index 5f31bf35..cbad3755 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ Nope. The minSDK version is **API level 11 (Honeycomb).**
 ## Gimme that Gradle sweetness, pls?
 
 ```groovy
-compile 'com.roughike:bottom-bar:2.2.0'
+compile 'com.roughike:bottom-bar:2.3.0'
 ```
 
 **Maven:**
@@ -37,7 +37,7 @@ compile 'com.roughike:bottom-bar:2.2.0'
 <dependency>
   <groupId>com.roughike</groupId>
   <artifactId>bottom-bar</artifactId>
-  <version>2.2.0</version>
+  <version>2.3.0</version>
   <type>pom</type>
 </dependency>
 ```
diff --git a/app/build.gradle b/app/build.gradle
index f3645884..434d4acd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,19 +19,19 @@ android {
     }
 }
 configurations.all {
-    resolutionStrategy.force 'com.android.support:support-annotations:23.1.0'
+    resolutionStrategy.force "com.android.support:support-annotations:${rootProject.ext.supportLibraryVersion}"
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':bottom-bar')
-    compile 'com.android.support:appcompat-v7:' + rootProject.ext.supportLibraryVersion
-    compile 'com.android.support:design:' + rootProject.ext.supportLibraryVersion
+    compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibraryVersion}"
+    compile "com.android.support:design:${rootProject.ext.supportLibraryVersion}"
 
     androidTestCompile 'junit:junit:4.12'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
-    androidTestCompile 'org.mockito:mockito-core:1.+'
+    androidTestCompile 'org.mockito:mockito-core:1.10.19'
     androidTestCompile "com.google.dexmaker:dexmaker:1.2"
     androidTestCompile "com.google.dexmaker:dexmaker-mockito:1.2"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0e04901e..fd181570 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".ThreeTabsActivity" />
+        <activity android:name=".IconsOnlyActivity" />
         <activity android:name=".FiveColorChangingTabsActivity" android:theme="@style/AppTheme.TransNav" />
         <activity android:name=".ThreeTabsQRActivity" android:theme="@style/AppTheme.TransNav" />
         <activity android:name=".BadgeActivity" />
diff --git a/app/src/main/java/com/example/bottombar/sample/IconsOnlyActivity.java b/app/src/main/java/com/example/bottombar/sample/IconsOnlyActivity.java
new file mode 100644
index 00000000..6a53d579
--- /dev/null
+++ b/app/src/main/java/com/example/bottombar/sample/IconsOnlyActivity.java
@@ -0,0 +1,39 @@
+package com.example.bottombar.sample;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.roughike.bottombar.BottomBar;
+import com.roughike.bottombar.OnTabReselectListener;
+import com.roughike.bottombar.OnTabSelectListener;
+
+public class IconsOnlyActivity extends Activity {
+    private TextView messageView;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_icons_only);
+
+        messageView = (TextView) findViewById(R.id.messageView);
+
+        BottomBar bottomBar = (BottomBar) findViewById(R.id.bottomBar);
+        bottomBar.setOnTabSelectListener(new OnTabSelectListener() {
+            @Override
+            public void onTabSelected(@IdRes int tabId) {
+                messageView.setText(TabMessage.get(tabId, false));
+            }
+        });
+
+        bottomBar.setOnTabReselectListener(new OnTabReselectListener() {
+            @Override
+            public void onTabReSelected(@IdRes int tabId) {
+                Toast.makeText(getApplicationContext(), TabMessage.get(tabId, true), Toast.LENGTH_LONG).show();
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/bottombar/sample/MainActivity.java b/app/src/main/java/com/example/bottombar/sample/MainActivity.java
index 2f22302b..87a23cd2 100644
--- a/app/src/main/java/com/example/bottombar/sample/MainActivity.java
+++ b/app/src/main/java/com/example/bottombar/sample/MainActivity.java
@@ -13,6 +13,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         findViewById(R.id.simple_three_tabs).setOnClickListener(this);
+        findViewById(R.id.icons_only).setOnClickListener(this);
         findViewById(R.id.five_tabs_changing_colors).setOnClickListener(this);
         findViewById(R.id.three_tabs_quick_return).setOnClickListener(this);
         findViewById(R.id.five_tabs_custom_colors).setOnClickListener(this);
@@ -27,6 +28,9 @@ public void onClick(View v) {
             case R.id.simple_three_tabs:
                 clazz = ThreeTabsActivity.class;
                 break;
+            case R.id.icons_only:
+                clazz = IconsOnlyActivity.class;
+                break;
             case R.id.five_tabs_changing_colors:
                 clazz = FiveColorChangingTabsActivity.class;
                 break;
diff --git a/app/src/main/res/layout/activity_color_changing_tabs.xml b/app/src/main/res/layout/activity_color_changing_tabs.xml
index f9412358..a39325bd 100644
--- a/app/src/main/res/layout/activity_color_changing_tabs.xml
+++ b/app/src/main/res/layout/activity_color_changing_tabs.xml
@@ -15,7 +15,7 @@
     <com.roughike.bottombar.BottomBar
         android:id="@+id/bottomBar"
         android:layout_width="match_parent"
-        android:layout_height="56dp"
+        android:layout_height="64dp"
         android:layout_alignParentBottom="true"
         app:bb_tabXmlResource="@xml/bottombar_tabs_color_changing"
         app:bb_behavior="shifting|underNavbar" />
diff --git a/app/src/main/res/layout/activity_icons_only.xml b/app/src/main/res/layout/activity_icons_only.xml
new file mode 100644
index 00000000..795454be
--- /dev/null
+++ b/app/src/main/res/layout/activity_icons_only.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        android:id="@+id/messageView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/bottomBar"
+        android:gravity="center"
+        android:text="Hi mom!" />
+
+    <com.roughike.bottombar.BottomBar
+        android:id="@+id/bottomBar"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:layout_alignParentBottom="true"
+        app:bb_tabXmlResource="@xml/bottombar_tabs_five"
+        app:bb_behavior="iconsOnly" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 48d4223e..e90ec527 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -19,6 +19,12 @@
         android:layout_height="wrap_content"
         android:text="Simple example with three tabs" />
 
+    <Button
+        android:id="@+id/icons_only"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Tabs with icons only" />
+
     <Button
         android:id="@+id/five_tabs_custom_colors"
         android:layout_width="wrap_content"
diff --git a/bottom-bar/build.gradle b/bottom-bar/build.gradle
index 4bd84578..571624a2 100644
--- a/bottom-bar/build.gradle
+++ b/bottom-bar/build.gradle
@@ -14,7 +14,7 @@ ext {
     siteUrl = 'https://github.com/roughike/BottomBar'
     gitUrl = 'https://github.com/roughike/BottomBar.git'
 
-    libraryVersion = '2.2.0'
+    libraryVersion = '2.3.0'
 
     developerId = 'roughike'
     developerName = 'Iiro Krankka'
diff --git a/bottom-bar/src/androidTest/java/com/roughike/bottombar/BottomBarTabTest.java b/bottom-bar/src/androidTest/java/com/roughike/bottombar/BottomBarTabTest.java
index 3cf2a122..64a1d7d1 100644
--- a/bottom-bar/src/androidTest/java/com/roughike/bottombar/BottomBarTabTest.java
+++ b/bottom-bar/src/androidTest/java/com/roughike/bottombar/BottomBarTabTest.java
@@ -11,9 +11,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-/**
- * Created by iiro on 22.8.2016.
- */
 @RunWith(AndroidJUnit4.class)
 public class BottomBarTabTest {
     private FrameLayout tabContainer;
@@ -28,19 +25,25 @@ public void setUp() {
     }
 
     @Test
-    public void correctLayoutReturned_ForFixedTab() {
+    public void correctLayoutReturnedForFixedTab() {
         tab.setType(BottomBarTab.Type.FIXED);
         assertEquals(R.layout.bb_bottom_bar_item_fixed, tab.getLayoutResource());
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void setIsTitleless_WhenTrueAndIconDoesNotExist_ThrowsException() {
+        tab.setIsTitleless(true);
+        assertEquals(R.layout.bb_bottom_bar_item_titleless, tab.getLayoutResource());
+    }
+
     @Test
-    public void correctLayoutReturned_ForShiftingTab() {
+    public void correctLayoutForShiftingTab() {
         tab.setType(BottomBarTab.Type.SHIFTING);
         assertEquals(R.layout.bb_bottom_bar_item_shifting, tab.getLayoutResource());
     }
 
     @Test
-    public void correctLayoutReturned_ForTabletTab() {
+    public void correctLayoutForTabletTab() {
         tab.setType(BottomBarTab.Type.TABLET);
         assertEquals(R.layout.bb_bottom_bar_item_fixed_tablet, tab.getLayoutResource());
     }
diff --git a/bottom-bar/src/androidTest/java/com/roughike/bottombar/TabParserTest.java b/bottom-bar/src/androidTest/java/com/roughike/bottombar/TabParserTest.java
index e753f948..e6709111 100644
--- a/bottom-bar/src/androidTest/java/com/roughike/bottombar/TabParserTest.java
+++ b/bottom-bar/src/androidTest/java/com/roughike/bottombar/TabParserTest.java
@@ -129,6 +129,15 @@ public void correctBadgeHidingPolicies() {
         assertTrue(tabs.get(4).getBadgeHidesWhenActive());
     }
 
+    @Test
+    public void titlelessTabsAsExpected() {
+        assertFalse(tabs.get(0).isTitleless());
+        assertFalse(tabs.get(1).isTitleless());
+        assertTrue(tabs.get(2).isTitleless());
+        assertFalse(tabs.get(3).isTitleless());
+        assertTrue(tabs.get(4).isTitleless());
+    }
+
     private Drawable getDrawableByResource(int iconResId) {
         return ContextCompat.getDrawable(context, iconResId);
     }
diff --git a/bottom-bar/src/androidTest/res/xml/dummy_tabs_five.xml b/bottom-bar/src/androidTest/res/xml/dummy_tabs_five.xml
index 8dea321f..97fa200f 100644
--- a/bottom-bar/src/androidTest/res/xml/dummy_tabs_five.xml
+++ b/bottom-bar/src/androidTest/res/xml/dummy_tabs_five.xml
@@ -2,7 +2,7 @@
 <tabs>
     <tab inActiveColor="#00FF00" activeColor="#FF0000" id="@+id/tab_recents" title="Recents" icon="@drawable/empty_icon" barColorWhenSelected="#FF0000" badgeBackgroundColor="#FF0000" badgeHidesWhenActive="false" />
     <tab inActiveColor="#0000FF" activeColor="@color/test_random_color" id="@+id/tab_favorites" title="@string/favorites" icon="@drawable/empty_icon" barColorWhenSelected="#00FF00" badgeBackgroundColor="#00FF00" />
-    <tab inActiveColor="#FF0000" activeColor="#0000FF" id="@+id/tab_nearby" title="Nearby" icon="@drawable/empty_icon" barColorWhenSelected="#F00000" badgeBackgroundColor="#F00000" badgeHidesWhenActive="false" />
+    <tab inActiveColor="#FF0000" activeColor="#0000FF" id="@+id/tab_nearby" title="Nearby" icon="@drawable/empty_icon" barColorWhenSelected="#F00000" badgeBackgroundColor="#F00000" badgeHidesWhenActive="false" iconOnly="true" />
     <tab inActiveColor="#F0F000" activeColor="@color/test_random_color_two" id="@+id/tab_friends" title="@string/friends" icon="@drawable/empty_icon" barColorWhenSelected="#00F000" badgeBackgroundColor="#00F000" badgeHidesWhenActive="true" />
-    <tab inActiveColor="#F00F00" activeColor="#F00F00" id="@+id/tab_food" title="Food" icon="@drawable/empty_icon" barColorWhenSelected="#00F0F0" badgeBackgroundColor="#00F0F0" />
+    <tab inActiveColor="#F00F00" activeColor="#F00F00" id="@+id/tab_food" title="Food" icon="@drawable/empty_icon" barColorWhenSelected="#00F0F0" badgeBackgroundColor="#00F0F0" iconOnly="true" />
 </tabs>
\ No newline at end of file
diff --git a/bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java b/bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java
index ff90c7a3..faa07b16 100644
--- a/bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java
+++ b/bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java
@@ -16,6 +16,7 @@
 import android.support.annotation.IdRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.XmlRes;
 import android.support.design.widget.CoordinatorLayout;
@@ -23,9 +24,11 @@
 import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
 import android.view.ViewParent;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -57,6 +60,8 @@ public class BottomBar extends LinearLayout implements View.OnClickListener, Vie
     private static final int BEHAVIOR_SHIFTING = 1;
     private static final int BEHAVIOR_SHY = 2;
     private static final int BEHAVIOR_DRAW_UNDER_NAV = 4;
+    private static final int BEHAVIOR_ICONS_ONLY = 8;
+
     private BatchTabPropertyApplier batchPropertyApplier;
     private int primaryColor;
     private int screenWidth;
@@ -73,14 +78,15 @@ public class BottomBar extends LinearLayout implements View.OnClickListener, Vie
     private int activeTabColor;
     private int badgeBackgroundColor;
     private boolean hideBadgeWhenActive;
+    private boolean longPressHintsEnabled;
     private int titleTextAppearance;
     private Typeface titleTypeFace;
     private boolean showShadow;
+    private float shadowElevation;
 
     private View backgroundOverlay;
     private ViewGroup outerContainer;
     private ViewGroup tabContainer;
-    private View shadowView;
 
     private int defaultBackgroundColor = Color.WHITE;
     private int currentBackgroundColor;
@@ -101,41 +107,84 @@ public class BottomBar extends LinearLayout implements View.OnClickListener, Vie
     private boolean isComingFromRestoredState;
     private boolean ignoreTabReselectionListener;
 
+    private ShySettings shySettings;
     private boolean shyHeightAlreadyCalculated;
     private boolean navBarAccountedHeightCalculated;
 
     private BottomBarTab[] currentTabs;
 
     public BottomBar(Context context) {
-        super(context);
-        init(context, null);
+        this(context, null);
     }
 
     public BottomBar(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs);
+        this(context, attrs, 0);
+    }
+
+    public BottomBar(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr, 0);
     }
 
-    private void init(Context context, AttributeSet attrs) {
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    public BottomBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    private void init(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         batchPropertyApplier = new BatchTabPropertyApplier(this);
 
-        populateAttributes(context, attrs);
+        populateAttributes(context, attrs, defStyleAttr, defStyleRes);
         initializeViews();
         determineInitialBackgroundColor();
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            init21(context);
+        }
+
         if (tabXmlResource != 0) {
             setItems(tabXmlResource);
         }
     }
 
-    private void populateAttributes(Context context, AttributeSet attrs) {
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        // This is so that in Pre-Lollipop devices there is a shadow BUT without pushing the content
+        if (showShadow) {
+            ViewGroup.LayoutParams params = getLayoutParams();
+            if (params instanceof MarginLayoutParams) {
+                MarginLayoutParams layoutParams = (MarginLayoutParams) params;
+                final int shadowHeight = getResources().getDimensionPixelSize(R.dimen.bb_fake_shadow_height);
+
+                layoutParams.setMargins(layoutParams.leftMargin,
+                        layoutParams.topMargin - shadowHeight,
+                        layoutParams.rightMargin,
+                        layoutParams.bottomMargin);
+                setLayoutParams(params);
+            }
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+    private void init21(Context context) {
+        shadowElevation = getElevation();
+        shadowElevation = shadowElevation > 0
+                ? shadowElevation
+                : getResources().getDimensionPixelSize(R.dimen.bb_default_elevation);
+        setElevation(MiscUtils.dpToPixel(context, shadowElevation));
+        setOutlineProvider(ViewOutlineProvider.BOUNDS);
+    }
+
+    private void populateAttributes(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         primaryColor = MiscUtils.getColor(getContext(), R.attr.colorPrimary);
         screenWidth = MiscUtils.getScreenWidth(getContext());
         tenDp = MiscUtils.dpToPixel(getContext(), 10);
         maxFixedItemWidth = MiscUtils.dpToPixel(getContext(), 168);
 
-        TypedArray ta = context.getTheme().obtainStyledAttributes(
-                attrs, R.styleable.BottomBar, 0, 0);
+        TypedArray ta = context.getTheme().obtainStyledAttributes(attrs, R.styleable.BottomBar, defStyleAttr, defStyleRes);
 
         try {
             tabXmlResource = ta.getResourceId(R.styleable.BottomBar_bb_tabXmlResource, 0);
@@ -150,6 +199,7 @@ private void populateAttributes(Context context, AttributeSet attrs) {
                     Color.WHITE : ContextCompat.getColor(context, R.color.bb_inActiveBottomBarItemColor);
             int defaultActiveColor = isShiftingMode() ? Color.WHITE : primaryColor;
 
+            longPressHintsEnabled = ta.getBoolean(R.styleable.BottomBar_bb_longPressHintsEnabled, true);
             inActiveTabColor = ta.getColor(R.styleable.BottomBar_bb_inActiveTabColor, defaultInActiveColor);
             activeTabColor = ta.getColor(R.styleable.BottomBar_bb_activeTabColor, defaultActiveColor);
             badgeBackgroundColor = ta.getColor(R.styleable.BottomBar_bb_badgeBackgroundColor, Color.RED);
@@ -172,10 +222,16 @@ && hasBehavior(BEHAVIOR_DRAW_UNDER_NAV)
                 && NavbarUtils.shouldDrawBehindNavbar(getContext());
     }
 
-    private boolean isShy() {
+    boolean isShy() {
         return !isTabletMode && hasBehavior(BEHAVIOR_SHY);
     }
 
+    boolean isShyHeightAlreadyCalculated() {
+        return shyHeightAlreadyCalculated;
+    }
+
+    private boolean isIconsOnlyMode() { return !isTabletMode && hasBehavior(BEHAVIOR_ICONS_ONLY); }
+
     private boolean hasBehavior(int behavior) {
         return (behaviors | behavior) == behaviors;
     }
@@ -196,7 +252,6 @@ private void initializeViews() {
 
         setLayoutParams(params);
         setOrientation(isTabletMode ? HORIZONTAL : VERTICAL);
-        ViewCompat.setElevation(this, MiscUtils.dpToPixel(getContext(), 8));
 
         View rootView = inflate(getContext(),
                 isTabletMode ? R.layout.bb_bottom_bar_item_container_tablet : R.layout.bb_bottom_bar_item_container, this);
@@ -205,11 +260,6 @@ private void initializeViews() {
         backgroundOverlay = rootView.findViewById(R.id.bb_bottom_bar_background_overlay);
         outerContainer = (ViewGroup) rootView.findViewById(R.id.bb_bottom_bar_outer_container);
         tabContainer = (ViewGroup) rootView.findViewById(R.id.bb_bottom_bar_item_container);
-        shadowView = rootView.findViewById(R.id.bb_bottom_bar_shadow);
-
-        if (!showShadow) {
-            shadowView.setVisibility(GONE);
-        }
     }
 
     private void determineInitialBackgroundColor() {
@@ -285,6 +335,10 @@ private void updateItems(final List<BottomBarTab> bottomBarItems) {
                 type = BottomBarTab.Type.FIXED;
             }
 
+            if (isIconsOnlyMode()) {
+                bottomBarTab.setIsTitleless(true);
+            }
+
             bottomBarTab.setType(type);
             bottomBarTab.prepareLayout();
 
@@ -352,8 +406,26 @@ private void resizeTabsToCorrectSizes(BottomBarTab[] tabsToAdd) {
                 tabContainer.addView(tabView);
             }
 
-            tabView.requestLayout();
+            tabView.setLayoutParams(params);
+        }
+    }
+
+    /**
+     * Returns the settings specific for a shy BottomBar.
+     *
+     * @throws UnsupportedOperationException, if this BottomBar is not shy.
+     */
+    public ShySettings getShySettings() {
+        if (!isShy()) {
+            Log.e("BottomBar", "Tried to get shy settings for a BottomBar " +
+                    "that is not shy.");
+        }
+
+        if (shySettings == null) {
+            shySettings = new ShySettings(this);
         }
+
+        return shySettings;
     }
 
     /**
@@ -538,6 +610,17 @@ public BottomBarTab getTabWithId(@IdRes int tabId) {
         return (BottomBarTab) tabContainer.findViewById(tabId);
     }
 
+    /**
+     * Controls whether the long pressed tab title should be displayed in
+     * a helpful Toast if the title is not currently visible.
+     *
+     * @param enabled true if toasts should be shown to indicate the title
+     *                of a long pressed tab, false otherwise.
+     */
+    public void setLongPressHintsEnabled(boolean enabled) {
+        longPressHintsEnabled = enabled;
+    }
+
     /**
      * Set alpha value used for inactive BottomBarTabs.
      */
@@ -682,6 +765,10 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
     }
 
     private void updateTitleBottomPadding() {
+        if (isIconsOnlyMode()) {
+            return;
+        }
+
         int tabCount = getTabCount();
 
         if (tabContainer == null || tabCount == 0 || !isShiftingMode()) {
@@ -724,6 +811,7 @@ private void initializeShyBehavior() {
 
             if (height != 0) {
                 updateShyHeight(height);
+                getShySettings().shyHeightCalculated();
                 shyHeightAlreadyCalculated = true;
             }
         }
@@ -830,7 +918,13 @@ private void handleClick(BottomBarTab newTab) {
     }
 
     private boolean handleLongClick(BottomBarTab longClickedTab) {
-        if ((isShiftingMode() || isTabletMode) && !longClickedTab.isActive()) {
+        boolean areInactiveTitlesHidden = isShiftingMode() || isTabletMode;
+        boolean isClickedTitleHidden = !longClickedTab.isActive();
+        boolean shouldShowHint = areInactiveTitlesHidden
+                && isClickedTitleHidden
+                && longPressHintsEnabled;
+
+        if (shouldShowHint) {
             Toast.makeText(getContext(), longClickedTab.getTitle(), Toast.LENGTH_SHORT).show();
         }
 
@@ -969,16 +1063,4 @@ private void onEnd() {
                     }
                 }).start();
     }
-
-    /**
-     * Toggle translation of BottomBar to hidden and visible in a CoordinatorLayout.
-     *
-     * @param visible true resets translation to 0, false translates view to hidden
-     */
-    private void toggleShyVisibility(boolean visible) {
-        BottomNavigationBehavior<BottomBar> from = BottomNavigationBehavior.from(this);
-        if (from != null) {
-            from.setHidden(this, visible);
-        }
-    }
 }
diff --git a/bottom-bar/src/main/java/com/roughike/bottombar/BottomBarTab.java b/bottom-bar/src/main/java/com/roughike/bottombar/BottomBarTab.java
index af9e2b3e..9ddb230f 100644
--- a/bottom-bar/src/main/java/com/roughike/bottombar/BottomBarTab.java
+++ b/bottom-bar/src/main/java/com/roughike/bottombar/BottomBarTab.java
@@ -43,13 +43,18 @@ public class BottomBarTab extends LinearLayout {
     private static final long ANIMATION_DURATION = 150;
     private static final float ACTIVE_TITLE_SCALE = 1;
     private static final float INACTIVE_FIXED_TITLE_SCALE = 0.86f;
+    private static final float ACTIVE_SHIFTING_TITLELESS_ICON_SCALE = 1.24f;
+    private static final float INACTIVE_SHIFTING_TITLELESS_ICON_SCALE = 1f;
 
     private final int sixDps;
     private final int eightDps;
     private final int sixteenDps;
+
     @VisibleForTesting
     BottomBarBadge badge;
+
     private Type type = Type.FIXED;
+    private boolean isTitleless;
     private int iconResId;
     private String title;
     private float inActiveAlpha;
@@ -89,14 +94,21 @@ void setConfig(@NonNull Config config) {
     void prepareLayout() {
         inflate(getContext(), getLayoutResource(), this);
         setOrientation(VERTICAL);
-        setGravity(Gravity.CENTER_HORIZONTAL);
+        setGravity(isTitleless? Gravity.CENTER : Gravity.CENTER_HORIZONTAL);
         setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+        setBackgroundResource(MiscUtils.getDrawableRes(getContext(), R.attr.selectableItemBackgroundBorderless));
 
         iconView = (AppCompatImageView) findViewById(R.id.bb_bottom_bar_icon);
         iconView.setImageResource(iconResId);
 
-        if (type != Type.TABLET) {
+        if (type != Type.TABLET && !isTitleless) {
             titleView = (TextView) findViewById(R.id.bb_bottom_bar_title);
+            titleView.setVisibility(VISIBLE);
+
+            if (type == Type.SHIFTING) {
+                findViewById(R.id.spacer).setVisibility(VISIBLE);
+            }
+
             updateTitle();
         }
 
@@ -142,7 +154,7 @@ private void updateCustomTextAppearance() {
             titleView.setTextAppearance(getContext(), titleTextAppearanceResId);
         }
 
-        titleView.setTag(titleTextAppearanceResId);
+        titleView.setTag(R.id.bb_bottom_bar_appearance_id, titleTextAppearanceResId);
     }
 
     private void updateCustomTypeface() {
@@ -159,6 +171,20 @@ void setType(Type type) {
         this.type = type;
     }
 
+    boolean isTitleless() {
+        return isTitleless;
+    }
+
+    void setIsTitleless(boolean isTitleless) {
+        if (isTitleless && getIconResId() == 0) {
+            throw new IllegalStateException("This tab is supposed to be " +
+                    "icon only, yet it has no icon specified. Index in " +
+                    "container: " + getIndexInTabContainer());
+        }
+
+        this.isTitleless = isTitleless;
+    }
+
     public ViewGroup getOuterView() {
         return (ViewGroup) getParent();
     }
@@ -265,10 +291,10 @@ public void setBadgeHidesWhenActive(boolean hideWhenActive) {
     }
 
     int getCurrentDisplayedIconColor() {
-        Object tag = iconView.getTag();
+        Object tag = iconView.getTag(R.id.bb_bottom_bar_color_id);
 
         if (tag instanceof Integer) {
-            return (int) iconView.getTag();
+            return (int) tag;
         }
 
         return 0;
@@ -283,10 +309,10 @@ int getCurrentDisplayedTitleColor() {
     }
 
     int getCurrentDisplayedTextAppearance() {
-        Object tag = titleView.getTag();
+        Object tag = titleView.getTag(R.id.bb_bottom_bar_appearance_id);
 
         if (titleView != null && tag instanceof Integer) {
-            return (int) titleView.getTag();
+            return (int) tag;
         }
 
         return 0;
@@ -361,18 +387,19 @@ void select(boolean animate) {
         isActive = true;
 
         if (animate) {
-            setTopPaddingAnimated(iconView.getPaddingTop(), sixDps);
-            animateIcon(activeAlpha);
-            animateTitle(ACTIVE_TITLE_SCALE, activeAlpha);
+            animateIcon(activeAlpha, ACTIVE_SHIFTING_TITLELESS_ICON_SCALE);
+            animateTitle(sixDps, ACTIVE_TITLE_SCALE, activeAlpha);
             animateColors(inActiveColor, activeColor);
         } else {
             setTitleScale(ACTIVE_TITLE_SCALE);
             setTopPadding(sixDps);
+            setIconScale(ACTIVE_SHIFTING_TITLELESS_ICON_SCALE);
             setColors(activeColor);
             setAlphas(activeAlpha);
         }
 
         setSelected(true);
+
         if (badge != null && badgeHidesWhenActive) {
             badge.hide();
         }
@@ -383,22 +410,23 @@ void deselect(boolean animate) {
 
         boolean isShifting = type == Type.SHIFTING;
 
-        float scale = isShifting ? 0 : INACTIVE_FIXED_TITLE_SCALE;
+        float titleScale = isShifting ? 0 : INACTIVE_FIXED_TITLE_SCALE;
         int iconPaddingTop = isShifting ? sixteenDps : eightDps;
 
         if (animate) {
-            setTopPaddingAnimated(iconView.getPaddingTop(), iconPaddingTop);
-            animateTitle(scale, inActiveAlpha);
-            animateIcon(inActiveAlpha);
+            animateTitle(iconPaddingTop, titleScale, inActiveAlpha);
+            animateIcon(inActiveAlpha, INACTIVE_SHIFTING_TITLELESS_ICON_SCALE);
             animateColors(activeColor, inActiveColor);
         } else {
-            setTitleScale(scale);
+            setTitleScale(titleScale);
             setTopPadding(iconPaddingTop);
+            setIconScale(INACTIVE_SHIFTING_TITLELESS_ICON_SCALE);
             setColors(inActiveColor);
             setAlphas(inActiveAlpha);
         }
 
         setSelected(false);
+
         if (!isShifting && badge != null && !badge.isVisible()) {
             badge.show();
         }
@@ -422,7 +450,7 @@ public void onAnimationUpdate(ValueAnimator valueAnimator) {
     private void setColors(int color) {
         if (iconView != null) {
             iconView.setColorFilter(color);
-            iconView.setTag(color);
+            iconView.setTag(R.id.bb_bottom_bar_color_id, color);
         }
 
         if (titleView != null) {
@@ -484,7 +512,7 @@ private void updateBadgePosition() {
     }
 
     private void setTopPaddingAnimated(int start, int end) {
-        if (type == Type.TABLET) {
+        if (type == Type.TABLET || isTitleless) {
             return;
         }
 
@@ -505,28 +533,42 @@ public void onAnimationUpdate(ValueAnimator animation) {
         paddingAnimator.start();
     }
 
-    private void animateTitle(float finalScale, float finalAlpha) {
-        if (type == Type.TABLET) {
+    private void animateTitle(int padding, float scale, float alpha) {
+        if (type == Type.TABLET && isTitleless) {
             return;
         }
 
+        setTopPaddingAnimated(iconView.getPaddingTop(), padding);
+
         ViewPropertyAnimatorCompat titleAnimator = ViewCompat.animate(titleView)
                 .setDuration(ANIMATION_DURATION)
-                .scaleX(finalScale)
-                .scaleY(finalScale);
-        titleAnimator.alpha(finalAlpha);
+                .scaleX(scale)
+                .scaleY(scale);
+        titleAnimator.alpha(alpha);
         titleAnimator.start();
     }
 
-    private void animateIcon(float finalAlpha) {
+    private void animateIconScale(float scale) {
+        ViewCompat.animate(iconView)
+                .setDuration(ANIMATION_DURATION)
+                .scaleX(scale)
+                .scaleY(scale)
+                .start();
+    }
+
+    private void animateIcon(float alpha, float scale) {
         ViewCompat.animate(iconView)
                 .setDuration(ANIMATION_DURATION)
-                .alpha(finalAlpha)
+                .alpha(alpha)
                 .start();
+
+        if (isTitleless && type == Type.SHIFTING) {
+            animateIconScale(scale);
+        }
     }
 
     private void setTopPadding(int topPadding) {
-        if (type == Type.TABLET) {
+        if (type == Type.TABLET || isTitleless) {
             return;
         }
 
@@ -539,7 +581,7 @@ private void setTopPadding(int topPadding) {
     }
 
     private void setTitleScale(float scale) {
-        if (type == Type.TABLET) {
+        if (type == Type.TABLET || isTitleless) {
             return;
         }
 
@@ -547,6 +589,13 @@ private void setTitleScale(float scale) {
         ViewCompat.setScaleY(titleView, scale);
     }
 
+    private void setIconScale(float scale) {
+        if (isTitleless && type == Type.SHIFTING) {
+            ViewCompat.setScaleX(iconView, scale);
+            ViewCompat.setScaleY(iconView, scale);
+        }
+    }
+
     @Override
     public Parcelable onSaveInstanceState() {
         if (badge != null) {
diff --git a/bottom-bar/src/main/java/com/roughike/bottombar/BottomNavigationBehavior.java b/bottom-bar/src/main/java/com/roughike/bottombar/BottomNavigationBehavior.java
index 41e7f94f..39f3d3b9 100644
--- a/bottom-bar/src/main/java/com/roughike/bottombar/BottomNavigationBehavior.java
+++ b/bottom-bar/src/main/java/com/roughike/bottombar/BottomNavigationBehavior.java
@@ -113,16 +113,20 @@ void setHidden(@NonNull  V view, boolean bottomLayoutHidden) {
 
     static <V extends View> BottomNavigationBehavior<V> from(@NonNull V view) {
         ViewGroup.LayoutParams params = view.getLayoutParams();
+
         if (!(params instanceof CoordinatorLayout.LayoutParams)) {
             throw new IllegalArgumentException("The view is not a child of CoordinatorLayout");
         }
+
         CoordinatorLayout.Behavior behavior = ((CoordinatorLayout.LayoutParams) params)
                 .getBehavior();
-        if (!(behavior instanceof BottomNavigationBehavior)) {
-            throw new IllegalArgumentException(
-                    "The view is not associated with BottomNavigationBehavior");
+
+        if (behavior instanceof BottomNavigationBehavior) {
+            // noinspection unchecked
+            return (BottomNavigationBehavior<V>) behavior;
         }
-        return (BottomNavigationBehavior<V>) behavior;
+
+        throw new IllegalArgumentException("The view is not associated with BottomNavigationBehavior");
     }
 
     private interface BottomNavigationWithSnackbar {
diff --git a/bottom-bar/src/main/java/com/roughike/bottombar/MiscUtils.java b/bottom-bar/src/main/java/com/roughike/bottombar/MiscUtils.java
index 7904ab61..84e0fc7d 100644
--- a/bottom-bar/src/main/java/com/roughike/bottombar/MiscUtils.java
+++ b/bottom-bar/src/main/java/com/roughike/bottombar/MiscUtils.java
@@ -4,9 +4,10 @@
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
+import android.support.annotation.AttrRes;
 import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
 import android.support.annotation.Dimension;
+import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Px;
 import android.support.annotation.StyleRes;
@@ -34,11 +35,20 @@
  */
 class MiscUtils {
 
-    @ColorInt
-    protected static int getColor(@NonNull Context context, @ColorRes int color) {
+    @NonNull protected static TypedValue getTypedValue(@NonNull Context context, @AttrRes int resId) {
         TypedValue tv = new TypedValue();
-        context.getTheme().resolveAttribute(color, tv, true);
-        return tv.data;
+        context.getTheme().resolveAttribute(resId, tv, true);
+        return tv;
+    }
+
+    @ColorInt
+    protected static int getColor(@NonNull Context context, @AttrRes int color) {
+        return getTypedValue(context, color).data;
+    }
+
+    @DrawableRes
+    protected static int getDrawableRes(@NonNull Context context, @AttrRes int drawable) {
+        return getTypedValue(context, drawable).resourceId;
     }
 
     /**
diff --git a/bottom-bar/src/main/java/com/roughike/bottombar/ShySettings.java b/bottom-bar/src/main/java/com/roughike/bottombar/ShySettings.java
new file mode 100644
index 00000000..3665dfc3
--- /dev/null
+++ b/bottom-bar/src/main/java/com/roughike/bottombar/ShySettings.java
@@ -0,0 +1,55 @@
+package com.roughike.bottombar;
+
+/**
+ * Settings specific for a shy BottomBar.
+ */
+public class ShySettings {
+    private BottomBar bottomBar;
+    private Boolean pendingIsVisibleInShyMode;
+
+    ShySettings(BottomBar bottomBar) {
+        this.bottomBar = bottomBar;
+    }
+
+    void shyHeightCalculated() {
+        updatePendingShyVisibility();
+    }
+
+    /**
+     * Shows the BottomBar if it was hidden, with a translate animation.
+     */
+    public void showBar() {
+        toggleIsVisibleInShyMode(true);
+    }
+
+    /**
+     * Hides the BottomBar in if it was visible, with a translate animation.
+     */
+    public void hideBar() {
+        toggleIsVisibleInShyMode(false);
+    }
+
+    private void toggleIsVisibleInShyMode(boolean visible) {
+        if (!bottomBar.isShy()) {
+            return;
+        }
+
+        if (bottomBar.isShyHeightAlreadyCalculated()) {
+            BottomNavigationBehavior<BottomBar> behavior = BottomNavigationBehavior.from(bottomBar);
+
+            if (behavior != null) {
+                boolean isHidden = !visible;
+                behavior.setHidden(bottomBar, isHidden);
+            }
+        } else {
+            pendingIsVisibleInShyMode = true;
+        }
+    }
+
+    private void updatePendingShyVisibility() {
+        if (pendingIsVisibleInShyMode != null) {
+            toggleIsVisibleInShyMode(pendingIsVisibleInShyMode);
+            pendingIsVisibleInShyMode = null;
+        }
+    }
+}
diff --git a/bottom-bar/src/main/java/com/roughike/bottombar/TabParser.java b/bottom-bar/src/main/java/com/roughike/bottombar/TabParser.java
index ff7ae7ac..65ec8fe2 100644
--- a/bottom-bar/src/main/java/com/roughike/bottombar/TabParser.java
+++ b/bottom-bar/src/main/java/com/roughike/bottombar/TabParser.java
@@ -27,6 +27,7 @@
 import static com.roughike.bottombar.TabParser.TabAttribute.ICON;
 import static com.roughike.bottombar.TabParser.TabAttribute.ID;
 import static com.roughike.bottombar.TabParser.TabAttribute.INACTIVE_COLOR;
+import static com.roughike.bottombar.TabParser.TabAttribute.IS_TITLELESS;
 import static com.roughike.bottombar.TabParser.TabAttribute.TITLE;
 
 /**
@@ -137,6 +138,10 @@ private BottomBarTab parseNewTab(@NonNull XmlResourceParser parser, @IntRange(fr
                     boolean badgeHidesWhenActive = parser.getAttributeBooleanValue(i, true);
                     workingTab.setBadgeHidesWhenActive(badgeHidesWhenActive);
                     break;
+                case IS_TITLELESS:
+                    boolean isTitleless = parser.getAttributeBooleanValue(i, false);
+                    workingTab.setIsTitleless(isTitleless);
+                    break;
             }
         }
 
@@ -175,7 +180,17 @@ private int getColorValue(@NonNull XmlResourceParser parser, @IntRange(from = 0)
     }
 
     @Retention(RetentionPolicy.SOURCE)
-    @StringDef({ID, ICON, TITLE, INACTIVE_COLOR, ACTIVE_COLOR, BAR_COLOR_WHEN_SELECTED, BADGE_BACKGROUND_COLOR, BADGE_HIDES_WHEN_ACTIVE})
+    @StringDef({
+            ID,
+            ICON,
+            TITLE,
+            INACTIVE_COLOR,
+            ACTIVE_COLOR,
+            BAR_COLOR_WHEN_SELECTED,
+            BADGE_BACKGROUND_COLOR,
+            BADGE_HIDES_WHEN_ACTIVE,
+            IS_TITLELESS
+    })
     @interface TabAttribute {
         String ID = "id";
         String ICON = "icon";
@@ -185,6 +200,7 @@ private int getColorValue(@NonNull XmlResourceParser parser, @IntRange(from = 0)
         String BAR_COLOR_WHEN_SELECTED = "barColorWhenSelected";
         String BADGE_BACKGROUND_COLOR = "badgeBackgroundColor";
         String BADGE_HIDES_WHEN_ACTIVE = "badgeHidesWhenActive";
+        String IS_TITLELESS = "iconOnly";
     }
 
     @SuppressWarnings("WeakerAccess")
diff --git a/bottom-bar/src/main/res/layout-v21/bb_bottom_bar_item_container.xml b/bottom-bar/src/main/res/layout-v21/bb_bottom_bar_item_container.xml
new file mode 100644
index 00000000..1185bd5f
--- /dev/null
+++ b/bottom-bar/src/main/res/layout-v21/bb_bottom_bar_item_container.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <FrameLayout
+        android:id="@+id/bb_bottom_bar_outer_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <View
+            android:id="@+id/bb_bottom_bar_background_overlay"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="invisible" />
+
+        <LinearLayout
+            android:id="@+id/bb_bottom_bar_item_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:orientation="horizontal" />
+
+    </FrameLayout>
+
+</merge>
\ No newline at end of file
diff --git a/bottom-bar/src/main/res/layout/bb_bottom_bar_item_container.xml b/bottom-bar/src/main/res/layout/bb_bottom_bar_item_container.xml
index fa763fd9..ef8f7b6e 100644
--- a/bottom-bar/src/main/res/layout/bb_bottom_bar_item_container.xml
+++ b/bottom-bar/src/main/res/layout/bb_bottom_bar_item_container.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <ImageView
+    <View
         android:id="@+id/bb_bottom_bar_shadow"
         android:layout_width="match_parent"
-        android:layout_height="4dp"
-        android:src="@drawable/bb_bottom_bar_top_shadow"/>
+        android:layout_height="@dimen/bb_fake_shadow_height"
+        android:background="@drawable/bb_bottom_bar_top_shadow" />
 
     <FrameLayout
         android:id="@+id/bb_bottom_bar_outer_container"
diff --git a/bottom-bar/src/main/res/layout/bb_bottom_bar_item_fixed.xml b/bottom-bar/src/main/res/layout/bb_bottom_bar_item_fixed.xml
index 30d0529a..f983ea56 100644
--- a/bottom-bar/src/main/res/layout/bb_bottom_bar_item_fixed.xml
+++ b/bottom-bar/src/main/res/layout/bb_bottom_bar_item_fixed.xml
@@ -3,7 +3,6 @@
 
     <android.support.v7.widget.AppCompatImageView
         android:id="@+id/bb_bottom_bar_icon"
-        android:paddingTop="8dp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|center_horizontal"/>
@@ -14,6 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
         android:textAppearance="@style/BB_BottomBarItem_Fixed.TitleAppearance"
+        android:visibility="gone"
         style="@style/BB_BottomBarItem_TitleStyle"/>
 
 </merge>
\ No newline at end of file
diff --git a/bottom-bar/src/main/res/layout/bb_bottom_bar_item_shifting.xml b/bottom-bar/src/main/res/layout/bb_bottom_bar_item_shifting.xml
index 432d7441..f7fa2a4d 100644
--- a/bottom-bar/src/main/res/layout/bb_bottom_bar_item_shifting.xml
+++ b/bottom-bar/src/main/res/layout/bb_bottom_bar_item_shifting.xml
@@ -9,15 +9,18 @@
 
     <!-- We use this empty space to push the text to the bottom -->
     <android.support.v4.widget.Space
+        android:id="@+id/spacer"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_weight="1"/>
+        android:layout_weight="1"
+        android:visibility="gone"/>
 
     <TextView
         android:id="@+id/bb_bottom_bar_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="@style/BB_BottomBarItem_Shifting.TitleAppearance"
+        android:visibility="gone"
         style="@style/BB_BottomBarItem_TitleStyle"/>
 
 </merge>
\ No newline at end of file
diff --git a/bottom-bar/src/main/res/layout/bb_bottom_bar_item_titleless.xml b/bottom-bar/src/main/res/layout/bb_bottom_bar_item_titleless.xml
new file mode 100644
index 00000000..6f4c238e
--- /dev/null
+++ b/bottom-bar/src/main/res/layout/bb_bottom_bar_item_titleless.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/bb_bottom_bar_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+</merge>
\ No newline at end of file
diff --git a/bottom-bar/src/main/res/values/attrs.xml b/bottom-bar/src/main/res/values/attrs.xml
index 6db8ea88..8b382f4d 100644
--- a/bottom-bar/src/main/res/values/attrs.xml
+++ b/bottom-bar/src/main/res/values/attrs.xml
@@ -7,7 +7,9 @@
             <flag name="shifting" value="1" />
             <flag name="shy" value="2" />
             <flag name="underNavbar" value="4" />
+            <flag name="iconsOnly" value="8" />
         </attr>
+        <attr name="bb_longPressHintsEnabled" format="boolean" />
         <attr name="bb_inActiveTabAlpha" format="float" />
         <attr name="bb_activeTabAlpha" format="float" />
         <attr name="bb_inActiveTabColor" format="color" />
diff --git a/bottom-bar/src/main/res/values/dimensions.xml b/bottom-bar/src/main/res/values/dimensions.xml
index 1c045b2b..9bc41bc4 100644
--- a/bottom-bar/src/main/res/values/dimensions.xml
+++ b/bottom-bar/src/main/res/values/dimensions.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="bb_height">56dp</dimen>
+    <dimen name="bb_default_elevation">8dp</dimen>
+    <dimen name="bb_fake_shadow_height">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/bottom-bar/src/main/res/values/ids.xml b/bottom-bar/src/main/res/values/ids.xml
new file mode 100644
index 00000000..3403bb0e
--- /dev/null
+++ b/bottom-bar/src/main/res/values/ids.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="bb_bottom_bar_color_id" type="id"/>
+    <item name="bb_bottom_bar_appearance_id" type="id"/>
+</resources>
\ No newline at end of file
diff --git a/bottom-bar/src/main/res/values/styles.xml b/bottom-bar/src/main/res/values/styles.xml
index 75223b0f..43bde5d7 100644
--- a/bottom-bar/src/main/res/values/styles.xml
+++ b/bottom-bar/src/main/res/values/styles.xml
@@ -24,7 +24,6 @@
     </style>
 
     <style name="BB_BottomBarItem_Tablet">
-        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
diff --git a/build.gradle b/build.gradle
index e751cb00..ed7d94f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0'
@@ -27,11 +27,10 @@ task clean(type: Delete) {
 
 ext {
     compileSdkVersion = 25
-    buildToolsVersion = "25.0.1"
+    buildToolsVersion = "25.0.2"
     minSdkVersion = 11
     targetSdkVersion = 25
-
-    supportLibraryVersion = "25.1.0"
+    supportLibraryVersion = "25.3.0"
 
     junitVersion = "4.12"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a93505cb..9cd61e61 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 09 17:20:00 EET 2017
+#Sat Mar 25 00:47:49 IST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip