diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertExpandableView.m b/MVMCoreUI/TopAlert/MVMCoreUITopAlertExpandableView.m
index f215fa0b..cc25cd9b 100644
--- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertExpandableView.m
+++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertExpandableView.m
@@ -109,6 +109,7 @@
             self.backgroundColor = [[MVMCoreUITopAlertView sharedGlobal] getBackgroundColorForType:topAlertObject.type];
             UIColor *contentColor = [[MVMCoreUITopAlertView sharedGlobal] getContentColorForType:topAlertObject.type];
             [self setupTopMessage:nil];
+            self.shortView.label.textColor = contentColor;
             MVMCoreUITopAlertMainView *topAlertWithButton = [[MVMCoreUITopAlertMainView alloc] initWithColor:self.backgroundColor contentColor:contentColor message:topAlertObject.message subMessage:nil closeButton:YES animationDelegate:animationDelegate];
             [self setupTopAlertWithButton:topAlertWithButton];
             [self expand:NO];
@@ -173,6 +174,7 @@
 - (void)setupViewWithTopMessage:(nullable NSString *)topMessage message:(nullable NSString *)message subMessage:(nullable NSString *)subMessage contentColor:(nonnull UIColor *)contentColor buttonTitle:(nullable NSString *)buttonTitle {
     
     [self setupTopMessage:topMessage];
+    self.shortView.label.textColor = contentColor;
 
     MVMCoreUITopAlertMainView *topAlertWithButton = [[MVMCoreUITopAlertMainView alloc] initWithColor:[UIColor clearColor] contentColor:contentColor message:message subMessage:subMessage buttonTitle:buttonTitle userActionHandler:nil];
     [self setupTopAlertWithButton:topAlertWithButton];
@@ -181,7 +183,8 @@
 - (void)setupViewWithTopMessage:(nullable NSString *)topMessage message:(nullable NSString *)message subMessage:(nullable NSString *)subMessage contentColor:(nonnull UIColor *)contentColor actionMap:(nullable NSDictionary *)actionMap additionalData:(nullable NSDictionary *)additionalData {
     
     [self setupTopMessage:topMessage];
-    
+    self.shortView.label.textColor = contentColor;
+
     MVMCoreUITopAlertMainView *topAlertWithButton = [[MVMCoreUITopAlertMainView alloc] initWithColor:[UIColor clearColor] contentColor:contentColor message:message subMessage:subMessage actionMap:actionMap additionalData:additionalData];
     [self setupTopAlertWithButton:topAlertWithButton];
 }
diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h
index ca9520f3..ec11530a 100644
--- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h
+++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.h
@@ -45,7 +45,7 @@
 - (void)resetDefaultBackgroundColor:(nullable UIColor *)backgroundColor basedOnStatusBarStyle:(UIStatusBarStyle)style;
 
 // Can be subclassed for custom views.
-- (nonnull MVMCoreUITopAlertBaseView *)topAlertViewForTopAlertObject:(nullable MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nonnull id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate statusBarColor:(UIColor *_Nullable *_Nullable)statusBarColor;
+- (nonnull MVMCoreUITopAlertBaseView *)topAlertViewForTopAlertObject:(nullable MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nonnull id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate statusBarColor:(UIColor *_Nullable *_Nullable)statusBarColor statusBarStyle:(UIStatusBarStyle *_Nullable)statusBarStyle;
 
 /// Get the background color based on the type
 - (nonnull UIColor *)getBackgroundColorForType:(nullable NSString *)type;
diff --git a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m
index d0a027b3..930828f6 100644
--- a/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m
+++ b/MVMCoreUI/TopAlert/MVMCoreUITopAlertView.m
@@ -98,10 +98,17 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed.";
     }
 }
 
-- (nonnull MVMCoreUITopAlertBaseView *)topAlertViewForTopAlertObject:(nullable MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nonnull id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate statusBarColor:(UIColor *_Nullable *_Nullable)statusBarColor {
+- (nonnull MVMCoreUITopAlertBaseView *)topAlertViewForTopAlertObject:(nullable MVMCoreTopAlertObject *)topAlertObject animationDelegate:(nonnull id <MVMCoreTopAlertAnimationDelegateProtocol>)animationDelegate statusBarColor:(UIColor *_Nullable *_Nullable)statusBarColor statusBarStyle:(UIStatusBarStyle *_Nullable)statusBarStyle {
     MVMCoreUITopAlertExpandableView *view = [[MVMCoreUITopAlertExpandableView alloc] initWithTopAlertObject:topAlertObject animationDelegate:animationDelegate viewToLayout:self.superview];
     if (statusBarColor && view.shortView.label.text) {
         *statusBarColor = view.backgroundColor;
+        
+        if (statusBarStyle) {
+            CGFloat greyScale = 0;
+            if ([view.shortView.label.textColor getWhite:&greyScale alpha:nil]) {
+                *statusBarStyle = greyScale > 0.5 ? UIStatusBarStyleLightContent : UIStatusBarStyleDefault;
+            }
+        }
     }
     return view;
 }
@@ -131,12 +138,11 @@ NSString * const MFAccTopAlertClosed = @"Top alert notification is closed.";
         self.topAlertClearspotView = nil;
         
         UIColor *statusBarColor = nil;
-        MVMCoreUITopAlertBaseView *view = [self topAlertViewForTopAlertObject:topAlertObject animationDelegate:animationDelegate statusBarColor:&statusBarColor];
+        UIStatusBarStyle statusBarStyle = UIStatusBarStyleDefault;
+        MVMCoreUITopAlertBaseView *view = [self topAlertViewForTopAlertObject:topAlertObject animationDelegate:animationDelegate statusBarColor:&statusBarColor statusBarStyle:&statusBarStyle];
         if (!statusBarColor) {
             statusBarColor = [UIColor whiteColor];
         }
-#warning This logic is incomplete, it is possible to show the wrong status bar color here if the background is yellow or pumpkin.
-        UIStatusBarStyle statusBarStyle = statusBarColor == [UIColor whiteColor] ? UIStatusBarStyleDefault : UIStatusBarStyleLightContent;
         [self setStatusBarColor:statusBarColor statusBarStyle:statusBarStyle];
         [self showAlertView:view topAlertObject:topAlertObject completionHandler:completionHandler];
     });