diff --git a/assets/css/um-profile.css b/assets/css/um-profile.css
index 1a316863..e14b2721 100644
--- a/assets/css/um-profile.css
+++ b/assets/css/um-profile.css
@@ -393,13 +393,31 @@ font-weight: normal;
 	border-bottom: 0 !important;
 }
 
-.um-profile-nav-item.without-icon a {padding-left: 10px}
-.um-profile-nav-item.without-icon span.title {display: inline;padding-left: 0;}
-.um-profile-nav-item.without-icon i {display: none}
+.um-profile-nav-item.without-icon a {
+    padding-left: 10px;
+}
+.um-profile-nav-item.without-icon span.title {
+    padding-left: 0;
+}
+.um-profile-nav-item.without-icon i {
+    display: none;
+}
 
-.um-profile-nav-item a:hover {background: #555}
-.um-profile-nav-item i {font-size: 18px;height: 18px;line-height: 18px;position: absolute;display: block;top: 8px;left: 10px}
-.um-profile-nav-item span.title {padding-left: 5px}
+.um-profile-nav-item a:hover {
+    background: #555;
+}
+.um-profile-nav-item i {
+    font-size: 18px;
+    height: 18px;
+    line-height: 18px;
+    position: absolute;
+    display: block;
+    top: 8px;
+    left: 10px;
+}
+.um-profile-nav-item span.title {
+    padding-left: 5px;
+}
 .um-profile-nav-item span.count {
 	font-size: 12px;
 	font-weight: 300;
diff --git a/includes/core/um-actions-profile.php b/includes/core/um-actions-profile.php
index 8d064021..4e035551 100644
--- a/includes/core/um-actions-profile.php
+++ b/includes/core/um-actions-profile.php
@@ -1377,40 +1377,46 @@ function um_profile_menu( $args ) {
 
 			<div class="um-profile-nav-item um-profile-nav-<?php echo $id . ' ' . $profile_nav_class; ?>">
 				<?php if ( UM()->options()->get( 'profile_menu_icons' ) ) { ?>
-					<a href="<?php echo $nav_link; ?>" class="um-tip-n uimob500-show uimob340-show uimob800-show"
+					<a href="<?php echo $nav_link; ?>" class="uimob800-show uimob500-show uimob340-show um-tip-n"
 					   title="<?php echo esc_attr( $tab['name'] ); ?>" original-title="<?php echo esc_attr( $tab['name'] ); ?>">
 
 						<i class="<?php echo $tab['icon']; ?>"></i>
 
 						<?php if ( isset( $tab['notifier'] ) && $tab['notifier'] > 0 ) { ?>
-							<span class="um-tab-notifier uimob500-show uimob340-show uimob800-show"><?php echo $tab['notifier']; ?></span>
+							<span class="um-tab-notifier uimob800-show uimob500-show uimob340-show"><?php echo $tab['notifier']; ?></span>
 						<?php } ?>
 
-						<span class="uimob500-hide uimob340-hide uimob800-hide title"><?php echo $tab['name']; ?></span>
-
+						<span class="uimob800-hide uimob500-hide uimob340-hide title"><?php echo $tab['name']; ?></span>
 					</a>
-					<a href="<?php echo $nav_link; ?>" class="uimob500-hide uimob340-hide uimob800-hide"
-					   title="<?php echo esc_attr( $tab['name'] ); ?>" original-title="<?php echo esc_attr( $tab['name'] ); ?>">
+					<a href="<?php echo $nav_link; ?>" class="uimob800-hide uimob500-hide uimob340-hide"
+					   title="<?php echo esc_attr( $tab['name'] ); ?>">
 
 						<i class="<?php echo $tab['icon']; ?>"></i>
 
 						<?php if ( isset( $tab['notifier'] ) && $tab['notifier'] > 0 ) { ?>
-							<span class="um-tab-notifier uimob500-show uimob340-show uimob800-show"><?php echo $tab['notifier']; ?></span>
+							<span class="um-tab-notifier uimob800-show uimob500-show uimob340-show"><?php echo $tab['notifier']; ?></span>
 						<?php } ?>
 
-						<span class="uimob500-hide uimob340-hide uimob800-hide title"><?php echo $tab['name']; ?></span>
-
+						<span class="title"><?php echo $tab['name']; ?></span>
 					</a>
 				<?php } else { ?>
-					<a href="<?php echo $nav_link; ?>" title="<?php echo esc_attr( $tab['name'] ); ?>"
-					   original-title="<?php echo esc_attr( $tab['name'] ); ?>">
+					<a href="<?php echo $nav_link; ?>" class="uimob800-show uimob500-show uimob340-show um-tip-n"
+					   title="<?php echo esc_attr( $tab['name'] ); ?>" original-title="<?php echo esc_attr( $tab['name'] ); ?>">
+
+						<i class="<?php echo $tab['icon']; ?>"></i>
+
+						<?php if ( isset( $tab['notifier'] ) && $tab['notifier'] > 0 ) { ?>
+							<span class="um-tab-notifier uimob800-show uimob500-show uimob340-show"><?php echo $tab['notifier']; ?></span>
+						<?php } ?>
+					</a>
+					<a href="<?php echo $nav_link; ?>" class="uimob800-hide uimob500-hide uimob340-hide"
+					   title="<?php echo esc_attr( $tab['name'] ); ?>">
 
 						<?php if ( isset( $tab['notifier'] ) && $tab['notifier'] > 0) { ?>
-							<span class="um-tab-notifier uimob500-show uimob340-show uimob800-show"><?php echo $tab['notifier']; ?></span>
+							<span class="um-tab-notifier uimob800-show uimob500-show uimob340-show"><?php echo $tab['notifier']; ?></span>
 						<?php } ?>
 
-						<span class="uimob500-hide uimob340-hide uimob800-hide title"><?php echo $tab['name']; ?></span>
-
+						<span class="title"><?php echo $tab['name']; ?></span>
 					</a>
 				<?php } ?>
 			</div>