diff --git a/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs b/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
index afb917fa..3a41df09 100644
--- a/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
+++ b/Wino.Mail/Behaviors/BindableCommandBarBehavior.cs
@@ -115,6 +115,12 @@ namespace Wino.Behaviors
                             DataContext = mailOperationMenuItem,
                         };
 
+                        ToolTip toolTip = new ToolTip
+                        {
+                            Content = label
+                        };
+                        ToolTipService.SetToolTip((DependencyObject)menuItem, toolTip);
+
                         ((AppBarButton)menuItem).Click -= Button_Click;
                         ((AppBarButton)menuItem).Click += Button_Click;
                     }
diff --git a/Wino.Mail/Views/MailListPage.xaml b/Wino.Mail/Views/MailListPage.xaml
index 09e5d4dd..bd3a942a 100644
--- a/Wino.Mail/Views/MailListPage.xaml
+++ b/Wino.Mail/Views/MailListPage.xaml
@@ -326,11 +326,10 @@
                         Style="{StaticResource PivotSegmentedStyle}">
                         <toolkit:Segmented.ItemTemplate>
                             <DataTemplate x:DataType="viewModelData:FolderPivotViewModel">
-                                <StackPanel Orientation="Horizontal" Spacing="4">
+                                <StackPanel Orientation="Horizontal">
                                     <TextBlock Text="{x:Bind FolderTitle}" />
                                     <TextBlock
-                                        x:Name="CountTextBlock"
-                                        VerticalAlignment="Center"
+                                        Margin="4,0,0,0"
                                         FontWeight="SemiBold"
                                         Visibility="{x:Bind ShouldDisplaySelectedItemCount, Mode=OneWay}">
                                         <Run Text="(" /><Run Text="{x:Bind SelectedItemCount, Mode=OneWay}" /><Run Text=")" />
@@ -566,7 +565,6 @@
                 <controls:WinoFontIcon FontSize="80" Icon="Mail" />
 
                 <TextBlock
-                    x:Name="CountTextBlock"
                     HorizontalAlignment="Center"
                     FontSize="31"
                     Style="{StaticResource SubheaderTextBlockStyle}"