diff --git a/Classes/BITArrowImageAnnotation.m b/Classes/BITArrowImageAnnotation.m
index 99b4d0d060..f3abe3a821 100644
--- a/Classes/BITArrowImageAnnotation.m
+++ b/Classes/BITArrowImageAnnotation.m
@@ -180,7 +180,9 @@
   UIColor *color = [self colorAtPoint:point];
   CGFloat alpha, white;
   [color getWhite:&white alpha:&alpha];
-  if (white || alpha){
+  NSLog(@"%f %f", alpha,white);
+
+  if ((int)white > 0 || (int)alpha > 0){
     return self;
   } else {
     return nil;
diff --git a/Classes/BITAttachmentGalleryViewController.m b/Classes/BITAttachmentGalleryViewController.m
index c1224ac647..bcee160260 100644
--- a/Classes/BITAttachmentGalleryViewController.m
+++ b/Classes/BITAttachmentGalleryViewController.m
@@ -177,13 +177,17 @@
 
 - (void)tapped:(UITapGestureRecognizer *)tapRecognizer {
   if (self.navigationController.navigationBarHidden){
-    [[UIApplication sharedApplication] setStatusBarHidden:NO];
-    [self.navigationController setNavigationBarHidden:NO animated:YES];
+    [UIView animateWithDuration:0.35f animations:^{
+      [[UIApplication sharedApplication] setStatusBarHidden:NO];
+      [self.navigationController setNavigationBarHidden:NO animated:NO];
+    } completion:nil];
   } else {
-    [self.navigationController setNavigationBarHidden:YES animated:YES];
-    [[UIApplication sharedApplication] setStatusBarHidden:YES];
-
+    [UIView animateWithDuration:0.35f animations:^{
+      [[UIApplication sharedApplication] setStatusBarHidden:YES];
+      [self.navigationController setNavigationBarHidden:YES animated:NO];
+    } completion:nil];
   }
+  
   [self layoutViews];
 }
 
diff --git a/Classes/BITImageAnnotationViewController.m b/Classes/BITImageAnnotationViewController.m
index 3a5d591222..0513544e55 100644
--- a/Classes/BITImageAnnotationViewController.m
+++ b/Classes/BITImageAnnotationViewController.m
@@ -308,23 +308,17 @@ typedef NS_ENUM(NSInteger, BITImageAnnotationViewControllerInteractionMode) {
 -(void)tapped:(UIGestureRecognizer *)tapRecognizer {
   if (self.navigationController.navigationBarHidden){
     [UIView animateWithDuration:0.35f animations:^{
-      self.navigationController.navigationBar.alpha = 1;
+      [[UIApplication sharedApplication] setStatusBarHidden:NO];
+      [self.navigationController setNavigationBarHidden:NO animated:NO];
     } completion:^(BOOL finished) {
       [self fitImageViewFrame];
-      [self.navigationController setNavigationBarHidden:NO animated:NO];
-      [[UIApplication sharedApplication] setStatusBarHidden:NO];
     }];
   } else {
     [UIView animateWithDuration:0.35f animations:^{
-      self.navigationController.navigationBar.alpha = 0;
-
-    } completion:^(BOOL finished) {
-      [self.navigationController setNavigationBarHidden:YES animated:NO];
       [[UIApplication sharedApplication] setStatusBarHidden:YES];
-
-
+      [self.navigationController setNavigationBarHidden:YES animated:NO];
+    } completion:^(BOOL finished) {
       [self fitImageViewFrame];
-      
     }];    
   }