diff --git a/app/build.gradle b/app/build.gradle
index b1c29763..79b48057 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         applicationId "com.fastaccess.github"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 160
-        versionName "1.6.0"
+        versionCode 170
+        versionName "1.7.0"
         signingConfig signingConfigs.signing
         buildConfigString "GITHUB_CLIENT_ID", (buildProperties.secrets['github_client_id'] | buildProperties.notThere['github_client_id']).string
         buildConfigString "GITHUB_SECRET", (buildProperties.secrets['github_secret'] | buildProperties.notThere['github_secret']).string
diff --git a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
index ee11179b..21901479 100644
--- a/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
+++ b/app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
@@ -384,6 +384,8 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
                             dropDownIcon.setTag(null);
                             dropDownIcon.setRotation(0.0F);
                         }
+                    } else {
+                        showErrorMessage(getString(R.string.no_orgs));
                     }
                 });
     }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/create/CreateLableView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/create/CreateLableView.java
index d3eb5229..b1bba5f9 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/create/CreateLableView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/labels/create/CreateLableView.java
@@ -83,6 +83,7 @@ public class CreateLableView extends BaseDialogFragment<CreateLabelMvp.View, Cre
         toolbar.setNavigationIcon(R.drawable.ic_clear);
         toolbar.setNavigationOnClickListener(item -> dismiss());
         toolbar.inflateMenu(R.menu.add_menu);
+        toolbar.getMenu().findItem(R.id.add).setIcon(R.drawable.ic_send);
         toolbar.setOnMenuItemClickListener(item -> {
             boolean emptyColor = InputHelper.isEmpty(description);
             boolean emptyName = InputHelper.isEmpty(name);
diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneView.java b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneView.java
index 91072e7d..c951bf58 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneView.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/repos/extras/milestone/create/CreateMilestoneView.java
@@ -76,6 +76,7 @@ public class CreateMilestoneView extends BaseDialogFragment<CreateMilestoneMvp.V
         toolbar.setNavigationIcon(R.drawable.ic_clear);
         toolbar.setNavigationOnClickListener(item -> dismiss());
         toolbar.inflateMenu(R.menu.add_menu);
+        toolbar.getMenu().findItem(R.id.add).setIcon(R.drawable.ic_send);
         toolbar.setOnMenuItemClickListener(item -> {
             getPresenter().onSubmit(InputHelper.toString(title), InputHelper.toString(dueOnEditText), InputHelper.toString(description), login, repo);
             return true;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0210cd21..9e39f354 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -336,4 +336,5 @@
     <string name="members">Members</string>
     <string name="no_members">No members</string>
     <string name="no_teams">No teams</string>
+    <string name="no_orgs">No Organizations</string>
 </resources>
\ No newline at end of file