diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index 566c1237..d04a96e7 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -874,11 +874,24 @@ public class MainActivity extends BaseActivity
 						if (response.code() == 200) {
 
 							assert notificationCount != null;
-							notificationCounter =
-									navNotifications
-											.getActionView()
-											.findViewById(R.id.counterBadgeNotification);
-							notificationCounter.setText(String.valueOf(notificationCount.getNew()));
+							if (notificationCount.getNew() > 0) {
+
+								navNotifications
+										.getActionView()
+										.findViewById(R.id.counterBadgeNotification)
+										.setVisibility(View.VISIBLE);
+								notificationCounter =
+										navNotifications
+												.getActionView()
+												.findViewById(R.id.counterBadgeNotification);
+								notificationCounter.setText(
+										String.valueOf(notificationCount.getNew()));
+							} else {
+								navNotifications
+										.getActionView()
+										.findViewById(R.id.counterBadgeNotification)
+										.setVisibility(View.GONE);
+							}
 						}
 					}
 
diff --git a/app/src/main/res/layout/badge_notification.xml b/app/src/main/res/layout/badge_notification.xml
index 7d68e627..8554cd85 100644
--- a/app/src/main/res/layout/badge_notification.xml
+++ b/app/src/main/res/layout/badge_notification.xml
@@ -15,7 +15,8 @@
         android:paddingStart="@dimen/dimen4dp"
         android:paddingEnd="@dimen/dimen4dp"
         android:singleLine="true"
-        android:textColor="@color/colorWhite"
-        android:textSize="@dimen/dimen12sp"/>
+        android:textColor="?attr/primaryTextColor"
+        android:textSize="@dimen/dimen12sp"
+        android:visibility="gone" />
 
 </LinearLayout>