diff --git a/Wino.Mail/JS/editor.js b/Wino.Mail/JS/editor.js
index a1cc0cba..b216b891 100644
--- a/Wino.Mail/JS/editor.js
+++ b/Wino.Mail/JS/editor.js
@@ -1,7 +1,7 @@
 const editor = Jodit.make("#editor", {
     "useSearch": false,
     "toolbar": true,
-    "buttons": "bold,italic,underline,strikethrough,brush,ul,ol,font,fontsize,paragraph,image,link,indent,outdent,align",
+    "buttons": "bold,italic,underline,strikethrough,brush,ul,ol,font,fontsize,paragraph,image,link,indent,outdent,align,lineHeight,table",
     "inline": true,
     "toolbarAdaptive": false,
     "toolbarInlineForSelection": false,
diff --git a/Wino.Mail/Views/ComposePage.xaml b/Wino.Mail/Views/ComposePage.xaml
index 2a8057eb..c8927716 100644
--- a/Wino.Mail/Views/ComposePage.xaml
+++ b/Wino.Mail/Views/ComposePage.xaml
@@ -151,13 +151,25 @@
                         OverflowButtonVisibility="Collapsed">
                         <CommandBar.PrimaryCommands>
                             <AppBarButton
-                                x:Name="ComposerThemeToggleButton"
                                 Click="InvertComposerThemeClicked"
-                                LabelPosition="Collapsed">
+                                LabelPosition="Collapsed"
+                                ToolTipService.ToolTip="Light Theme"
+                                Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay}">
+                                <AppBarButton.Icon>
+                                    <controls:WinoFontIcon Icon="LightEditor" />
+                                </AppBarButton.Icon>
+                            </AppBarButton>
+
+                            <AppBarButton
+                                Click="InvertComposerThemeClicked"
+                                LabelPosition="Collapsed"
+                                ToolTipService.ToolTip="Dark Theme"
+                                Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
                                 <AppBarButton.Icon>
                                     <controls:WinoFontIcon Icon="DarkEditor" />
                                 </AppBarButton.Icon>
                             </AppBarButton>
+
                             <AppBarButton Command="{x:Bind ViewModel.DiscardCommand}" Label="Discard">
                                 <AppBarButton.Icon>
                                     <controls:WinoFontIcon Icon="Delete" />
@@ -603,23 +615,6 @@
                 </Grid>
 
                 <VisualStateManager.VisualStateGroups>
-                    <VisualStateGroup x:Name="ComposerThemeToggleButtonStates">
-                        <VisualState x:Name="DarkMode">
-                            <VisualState.StateTriggers>
-                                <StateTrigger IsActive="{x:Bind IsComposerDarkMode, Mode=OneWay}" />
-                            </VisualState.StateTriggers>
-                            <VisualState.Setters>
-                                <Setter Target="ComposerThemeToggleButton.Label" Value="Light Reader" />
-                                <Setter Target="ComposerThemeToggleButton.Icon">
-                                    <Setter.Value>
-                                        <controls:WinoFontIcon Icon="LightEditor" />
-                                    </Setter.Value>
-                                </Setter>
-                            </VisualState.Setters>
-                        </VisualState>
-
-                        <VisualState x:Name="LightMode" />
-                    </VisualStateGroup>
                     <VisualStateGroup x:Name="DropZoneState">
                         <VisualState x:Name="Hovered">
                             <VisualState.StateTriggers>