diff --git a/RetroBar/Controls/KeyboardLayout.xaml b/RetroBar/Controls/InputLanguage.xaml
similarity index 59%
rename from RetroBar/Controls/KeyboardLayout.xaml
rename to RetroBar/Controls/InputLanguage.xaml
index f2da8dbf..dc033fab 100644
--- a/RetroBar/Controls/KeyboardLayout.xaml
+++ b/RetroBar/Controls/InputLanguage.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="RetroBar.Controls.KeyboardLayout"
+<UserControl x:Class="RetroBar.Controls.InputLanguage"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:converters="clr-namespace:RetroBar.Converters"
@@ -7,17 +7,24 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <converters:CultureInfoToLocaleNameConverter x:Key="cultureInfoToLocaleNameConverter" />
+            <converters:DockOrientationConverter x:Key="dockOrientationConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
-    
-    <Viewbox Width="24"
-             Stretch="Fill" StretchDirection="DownOnly"
-             Style="{DynamicResource KeyboardLayoutViewBox}">
-        <TextBlock Style="{DynamicResource KeyboardLayout}"
+
+    <DockPanel>
+        <Thumb Style="{DynamicResource ToolbarThumb}">
+            <DockPanel.Dock>
+                <Binding Converter="{StaticResource dockOrientationConverter}"
+                         ConverterParameter="leading"
+                         Path="Orientation"
+                         RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=Window}" />
+            </DockPanel.Dock>
+        </Thumb>
+        <TextBlock Style="{DynamicResource InputLanguage}"
                    Text="{Binding Path=LocaleIdentifierProperty, Converter={StaticResource cultureInfoToLocaleNameConverter}, ConverterParameter=TwoLetterIsoLanguageName, Mode=OneWay}">
         </TextBlock>
-    </Viewbox>
-    
+    </DockPanel>
+
     <UserControl.ToolTip>
         <TextBlock Text="{Binding Path=LocaleIdentifierProperty, Converter={StaticResource cultureInfoToLocaleNameConverter}, ConverterParameter=EnglishName, Mode=OneWay}" />
     </UserControl.ToolTip>
diff --git a/RetroBar/Controls/KeyboardLayout.xaml.cs b/RetroBar/Controls/InputLanguage.xaml.cs
similarity index 89%
rename from RetroBar/Controls/KeyboardLayout.xaml.cs
rename to RetroBar/Controls/InputLanguage.xaml.cs
index 13258f4f..f9b6097a 100644
--- a/RetroBar/Controls/KeyboardLayout.xaml.cs
+++ b/RetroBar/Controls/InputLanguage.xaml.cs
@@ -8,9 +8,9 @@
 
 namespace RetroBar.Controls
 {
-    public partial class KeyboardLayout : UserControl
+    public partial class InputLanguage : UserControl
     {
-        public static DependencyProperty LocaleIdentifierProperty = DependencyProperty.Register("LocaleIdentifierProperty", typeof(CultureInfo), typeof(KeyboardLayout));
+        public static DependencyProperty LocaleIdentifierProperty = DependencyProperty.Register("LocaleIdentifierProperty", typeof(CultureInfo), typeof(InputLanguage));
 
         public CultureInfo LocaleIdentifier
         {
@@ -22,7 +22,7 @@ public CultureInfo LocaleIdentifier
 
         private bool _isLoaded;
 
-        public KeyboardLayout()
+        public InputLanguage()
         {
             InitializeComponent();
             DataContext = this;
@@ -33,7 +33,7 @@ public KeyboardLayout()
 
         private void Initialize()
         {
-            if (Settings.Instance.ShowKeyboardLayout)
+            if (Settings.Instance.ShowInputLanguage)
             {
                 StartWatch();
             }
@@ -74,9 +74,9 @@ private void StopWatch()
 
         private void Settings_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == "ShowKeyboardLayout")
+            if (e.PropertyName == "ShowInputLanguage")
             {
-                if (Settings.Instance.ShowKeyboardLayout)
+                if (Settings.Instance.ShowInputLanguage)
                 {
                     StartWatch();
                 }
diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
index dc5603c0..4fce77b3 100644
--- a/RetroBar/Languages/English.xaml
+++ b/RetroBar/Languages/English.xaml
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">_Allow font smoothing</s:String>
     <s:String x:Key="collapse_tray_icons">Collapse _notification area icons</s:String>
     <s:String x:Key="customize">_Customize...</s:String>
-    <s:String x:Key="show_keyboard_layout">Show the keyboard _layout</s:String>
+    <s:String x:Key="show_input_language">Show the input _language</s:String>
     <s:String x:Key="show_clock">Show the cloc_k</s:String>
     <s:String x:Key="show_multi_mon">Show on _multiple displays</s:String>
     <s:String x:Key="show_quick_launch">Show _Quick Launch</s:String>
diff --git "a/RetroBar/Languages/T\303\274rk\303\247e.xaml" "b/RetroBar/Languages/T\303\274rk\303\247e.xaml"
index 57ec0b06..ebc56f3e 100644
--- "a/RetroBar/Languages/T\303\274rk\303\247e.xaml"
+++ "b/RetroBar/Languages/T\303\274rk\303\247e.xaml"
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">_Yazı tipi yumuşatmaya izin ver</s:String>
     <s:String x:Key="collapse_tray_icons">Bildirim _alanı simgelerini daralt</s:String>
     <s:String x:Key="customize">Ö_zelleştir...</s:String>
-    <s:String x:Key="show_keyboard_layout">_Klavye düzenini göster</s:String>
+    <s:String x:Key="show_input_language">_Klavye düzenini göster</s:String>
     <s:String x:Key="show_clock">_Saati göster</s:String>
     <s:String x:Key="show_multi_mon">Birden çok _ekranda göster</s:String>
     <s:String x:Key="show_quick_launch">_Hızlı Başlat'ı Göster</s:String>
diff --git a/RetroBar/Languages/hrvatski.xaml b/RetroBar/Languages/hrvatski.xaml
index 54c8d552..812a21c5 100644
--- a/RetroBar/Languages/hrvatski.xaml
+++ b/RetroBar/Languages/hrvatski.xaml
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">_Dopusti izglađivanje fonta</s:String>
     <s:String x:Key="collapse_tray_icons">Sakriji neaktivne ikone</s:String>
     <s:String x:Key="customize">Prilagod_i...</s:String>
-    <s:String x:Key="show_keyboard_layout">Prikaži raspored _tipkovnice</s:String>
+    <s:String x:Key="show_input_language">Prikaži raspored _tipkovnice</s:String>
     <s:String x:Key="show_clock">Prikaži  _sat</s:String>
     <s:String x:Key="show_multi_mon">Prikaži _na više zaslona</s:String>
     <s:String x:Key="show_quick_launch">Prika_ži brzo pokretanje</s:String>
diff --git a/RetroBar/Languages/srpski.xaml b/RetroBar/Languages/srpski.xaml
index 3de846d3..483e9402 100644
--- a/RetroBar/Languages/srpski.xaml
+++ b/RetroBar/Languages/srpski.xaml
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">Dozvoli izglađivanje _fontova</s:String>
     <s:String x:Key="collapse_tray_icons">Skupi _ikonice u sistemskoj paleti</s:String>
     <s:String x:Key="customize">Prilago_di...</s:String>
-    <s:String x:Key="show_keyboard_layout">Prikaži raspored _tastature</s:String>
+    <s:String x:Key="show_input_language">Prikaži raspored _tastature</s:String>
     <s:String x:Key="show_clock">Prikaži _sat</s:String>
     <s:String x:Key="show_multi_mon">Prikaži na _više ekrana</s:String>
     <s:String x:Key="show_quick_launch">Prikaži _brzo pokretanje</s:String>
diff --git "a/RetroBar/Languages/\321\200\321\203\321\201\321\201\320\272\320\270\320\271.xaml" "b/RetroBar/Languages/\321\200\321\203\321\201\321\201\320\272\320\270\320\271.xaml"
index 9c6af377..6a5f81c4 100644
--- "a/RetroBar/Languages/\321\200\321\203\321\201\321\201\320\272\320\270\320\271.xaml"
+++ "b/RetroBar/Languages/\321\200\321\203\321\201\321\201\320\272\320\270\320\271.xaml"
@@ -7,7 +7,7 @@
     <s:String x:Key="advanced_tab">Дополнительно</s:String>
     <s:String x:Key="taskbar_appearance">Оформление панели задач</s:String>
     <s:String x:Key="notification_area">Область уведомлений</s:String>
-    <s:String x:Key="autostart">Запускать при при в_ходе в систему</s:String>
+    <s:String x:Key="autostart">Запускать при в_ходе в систему</s:String>
     <s:String x:Key="language_text">_Язык:</s:String>
     <s:String x:Key="language_tip">Выберите язык, который хотите использовать.</s:String>
     <s:String x:Key="theme_text">_Тема оформления:</s:String>
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">Пр_именять сглаживание шрифтов</s:String>
     <s:String x:Key="collapse_tray_icons">Скр_ывать неиспользуемые значки</s:String>
     <s:String x:Key="customize">_Настроить...</s:String>
-    <s:String x:Key="show_keyboard_layout">Отображать раскладку _клавиатуры</s:String>
+    <s:String x:Key="show_input_language">Отображать раскладку _клавиатуры</s:String>
     <s:String x:Key="show_clock">Отображать _часы</s:String>
     <s:String x:Key="show_multi_mon">Показывать на н_ескольких дисплеях</s:String>
     <s:String x:Key="show_quick_launch">Отображать панель _быстого запуска</s:String>
diff --git "a/RetroBar/Languages/\321\201\321\200\320\277\321\201\320\272\320\270.xaml" "b/RetroBar/Languages/\321\201\321\200\320\277\321\201\320\272\320\270.xaml"
index a4510341..8f4d7a84 100644
--- "a/RetroBar/Languages/\321\201\321\200\320\277\321\201\320\272\320\270.xaml"
+++ "b/RetroBar/Languages/\321\201\321\200\320\277\321\201\320\272\320\270.xaml"
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">Дозволи изглађивање _фонтова</s:String>
     <s:String x:Key="collapse_tray_icons">Скупи _иконице у системској палети</s:String>
     <s:String x:Key="customize">Прилаго_ди...</s:String>
-    <s:String x:Key="show_keyboard_layout">Прикажи распоред _тастатуре</s:String>
+    <s:String x:Key="show_input_language">Прикажи распоред _тастатуре</s:String>
     <s:String x:Key="show_clock">Прикажи _сат</s:String>
     <s:String x:Key="show_multi_mon">Прикажи на _више екрана</s:String>
     <s:String x:Key="show_quick_launch">Прикажи _брзо покретање</s:String>
diff --git "a/RetroBar/Languages/\321\203\320\272\321\200\320\260\321\227\320\275\321\201\321\214\320\272\320\260.xaml" "b/RetroBar/Languages/\321\203\320\272\321\200\320\260\321\227\320\275\321\201\321\214\320\272\320\260.xaml"
index d9207e9f..eb2bf6cb 100644
--- "a/RetroBar/Languages/\321\203\320\272\321\200\320\260\321\227\320\275\321\201\321\214\320\272\320\260.xaml"
+++ "b/RetroBar/Languages/\321\203\320\272\321\200\320\260\321\227\320\275\321\201\321\214\320\272\320\260.xaml"
@@ -23,7 +23,7 @@
     <s:String x:Key="allow_font_smoothing">Згладжування шрифту</s:String>
     <s:String x:Key="collapse_tray_icons">Згорнути іконки панелі сповіщень</s:String>
     <s:String x:Key="customize">Змінити...</s:String>
-    <s:String x:Key="show_keyboard_layout">Показати розкладку _клавіатури</s:String>
+    <s:String x:Key="show_input_language">Показати розкладку _клавіатури</s:String>
     <s:String x:Key="show_clock">Показати годинник</s:String>
     <s:String x:Key="show_multi_mon">Показати на усіх дисплеях</s:String>
     <s:String x:Key="show_quick_launch">Показати ікони швидкого запуску</s:String>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index de94965b..947ca436 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -101,7 +101,7 @@
                     <GroupBox Header="{DynamicResource taskbar_appearance}">
                         <StackPanel Orientation="Vertical">
                             <Border Style="{StaticResource PreviewBorder}">
-                                <ContentControl Height="{DynamicResource TaskbarHeight}"
+                                <ContentControl x:Name="TaskbarAppearancePreviewControl"
                                                 IsHitTestVisible="False"
                                                 Focusable="False"
                                                 ClipToBounds="True"
@@ -230,7 +230,7 @@
                     <GroupBox Header="{DynamicResource notification_area}">
                         <StackPanel Orientation="Vertical">
                             <Border Style="{StaticResource PreviewBorder}">
-                                <ContentControl Height="{DynamicResource TaskbarHeight}"
+                                <ContentControl x:Name="NotificationAreaPreviewControl"
                                                 IsHitTestVisible="False"
                                                 Focusable="False"
                                                 ClipToBounds="True"
@@ -241,7 +241,7 @@
                                                  Converter="{StaticResource textRenderingModeConverter}" />
                                     </TextOptions.TextRenderingMode>
                                     <DockPanel>
-                                        <controls:ShowDesktopButton DockPanel.Dock="Right" HorizontalAlignment="Center" Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowDesktopButton, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource boolToVisibilityConverter}}" />
+                                        <controls:ShowDesktopButton DockPanel.Dock="Right" Visibility="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowDesktopButton, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource boolToVisibilityConverter}}" />
                                         <GroupBox Style="{DynamicResource Tray}"
                                                   DockPanel.Dock="Right">
                                             <StackPanel Orientation="Horizontal">
@@ -267,19 +267,19 @@
                                                 <controls:Clock VerticalAlignment="Center" />
                                             </StackPanel>
                                         </GroupBox>
+                                        <controls:InputLanguage VerticalAlignment="Stretch" DockPanel.Dock="Right" />
                                         <StackPanel></StackPanel>
-                                        <controls:KeyboardLayout VerticalAlignment="Center" HorizontalAlignment="Right"/>
                                     </DockPanel>
                                 </ContentControl>
                             </Border>
-                            <CheckBox x:Name="cbShowKeyboardLayout"
-                                      IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowKeyboardLayout, UpdateSourceTrigger=PropertyChanged}">
-                                <Label Content="{DynamicResource show_keyboard_layout}" />
-                            </CheckBox>
                             <CheckBox x:Name="cbShowClock"
                                       IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowClock, UpdateSourceTrigger=PropertyChanged}">
                                 <Label Content="{DynamicResource show_clock}" />
                             </CheckBox>
+                            <CheckBox x:Name="cbShowInputLanguage"
+                                      IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowInputLanguage, UpdateSourceTrigger=PropertyChanged}">
+                                <Label Content="{DynamicResource show_input_language}" />
+                            </CheckBox>
                             <CheckBox x:Name="cbShowDesktopButton"
                                       IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=ShowDesktopButton, UpdateSourceTrigger=PropertyChanged}">
                                 <Label Content="{DynamicResource add_show_desktop_button}" />
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index eff21af0..cffee5bb 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -10,13 +10,14 @@
 using ManagedShell.AppBar;
 using System.Windows.Forms;
 using ManagedShell.WindowsTray;
+using System.Runtime.CompilerServices;
 
 namespace RetroBar
 {
     /// <summary>
     /// Interaction logic for PropertiesWindow.xaml
     /// </summary>
-    public partial class PropertiesWindow : Window
+    public partial class PropertiesWindow : Window, INotifyPropertyChanged
     {
         private static PropertiesWindow _instance;
 
@@ -26,6 +27,8 @@ public partial class PropertiesWindow : Window
         private readonly NotificationArea _notificationArea;
         private readonly AppBarScreen _screen;
 
+        public event PropertyChangedEventHandler PropertyChanged;
+
         // Previews should always assume bottom edge
         public AppBarEdge AppBarEdge
         {
@@ -38,6 +41,12 @@ public Orientation Orientation
             get => Orientation.Horizontal;
         }
 
+        // Previews should reflect the locked setting
+        public bool IsLocked
+        {
+            get => Settings.Instance.LockTaskbar;
+        }
+
         private PropertiesWindow(NotificationArea notificationArea, DictionaryManager dictionaryManager, AppBarScreen screen, double dpiScale, double barSize)
         {
             _barSize = barSize;
@@ -48,10 +57,26 @@ private PropertiesWindow(NotificationArea notificationArea, DictionaryManager di
 
             InitializeComponent();
 
+            LoadPreviewHeight();
             LoadAutoStart();
             LoadLanguages();
             LoadThemes();
             LoadVersion();
+
+            Settings.Instance.PropertyChanged += Settings_PropertyChanged;
+        }
+
+        private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "LockTaskbar")
+            {
+                OnPropertyChanged("IsLocked");
+                LoadPreviewHeight();
+            }
+            else if (e.PropertyName == "Theme")
+            {
+                LoadPreviewHeight();
+            }
         }
 
         public static PropertiesWindow Open(NotificationArea notificationArea, DictionaryManager dictionaryManager, AppBarScreen screen, double dpiScale, double barSize)
@@ -69,6 +94,24 @@ public static PropertiesWindow Open(NotificationArea notificationArea, Dictionar
             return _instance;
         }
 
+        private void OnPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        private void LoadPreviewHeight()
+        {
+            double size = System.Windows.Application.Current.FindResource("TaskbarHeight") as double? ?? 0;
+
+            if (!IsLocked)
+            {
+                size += System.Windows.Application.Current.FindResource("TaskbarUnlockedSize") as double? ?? 0;
+            }
+
+            TaskbarAppearancePreviewControl.Height = size;
+            NotificationAreaPreviewControl.Height = size;
+        }
+
         private void LoadAutoStart()
         {
             try
diff --git a/RetroBar/Taskbar.xaml b/RetroBar/Taskbar.xaml
index 4b9d8c37..134f8787 100644
--- a/RetroBar/Taskbar.xaml
+++ b/RetroBar/Taskbar.xaml
@@ -102,14 +102,15 @@
                                     PreviewMouseRightButtonUp="Clock_PreviewMouseRightButtonUp" />
                 </StackPanel>
             </GroupBox>
-            <controls:KeyboardLayout VerticalAlignment="Center">
+            <controls:InputLanguage VerticalAlignment="Stretch"
+                                     HorizontalAlignment="Stretch">
                 <DockPanel.Dock>
                     <Binding Converter="{StaticResource dockOrientationConverter}"
                              ConverterParameter="trailing"
                              Path="Orientation"
                              RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=Window}" />
                 </DockPanel.Dock>
-            </controls:KeyboardLayout>
+            </controls:InputLanguage>
             <controls:TaskList VerticalAlignment="Stretch"
                                Host="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
                                Tasks="{Binding Tasks}"></controls:TaskList>
diff --git a/RetroBar/Themes/System XP.xaml b/RetroBar/Themes/System XP.xaml
index 8d1593d9..9be652b5 100644
--- a/RetroBar/Themes/System XP.xaml	
+++ b/RetroBar/Themes/System XP.xaml	
@@ -30,13 +30,6 @@
                 Value="{DynamicResource show_taskman}" />
     </Style>
 
-    <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
-           BasedOn="{StaticResource KeyboardLayout}">
-        <Setter Property="Padding"
-                Value="0" />
-    </Style>
-
     <Style TargetType="TextBlock"
            x:Key="Clock"
            BasedOn="{StaticResource Clock}">
diff --git a/RetroBar/Themes/System.xaml b/RetroBar/Themes/System.xaml
index 1d1b6141..ae8bb17c 100644
--- a/RetroBar/Themes/System.xaml
+++ b/RetroBar/Themes/System.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib"
-                    xmlns:converters="clr-namespace:RetroBar.Converters">
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <system:Double x:Key="TaskbarHeight">28</system:Double>
     <system:Double x:Key="TaskbarWidth">98</system:Double>
@@ -22,8 +21,8 @@
     <SolidColorBrush x:Key="ButtonForeground" Color="{x:Static SystemColors.ControlTextColor}" />
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="{x:Static SystemColors.HighlightTextColor}" />
     <SolidColorBrush x:Key="ClockForeground" Color="{x:Static SystemColors.ControlTextColor}" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="{x:Static SystemColors.HighlightTextColor}" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="{x:Static SystemColors.HighlightColor}" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="{x:Static SystemColors.HighlightTextColor}" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="{x:Static SystemColors.HighlightColor}" />
 
     <SolidColorBrush x:Key="ToolTipBackground" Color="{x:Static SystemColors.InfoColor}" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="{x:Static SystemColors.InfoTextColor}" />
@@ -53,8 +52,6 @@
     <system:Boolean x:Key="InvertSystemNotifyIcons">False</system:Boolean>
     <system:Boolean x:Key="UseLargeIcons">False</system:Boolean>
     <system:Boolean x:Key="UseFloatingStartButton">False</system:Boolean>
-    
-    <converters:CultureInfoToLocaleNameConverter x:Key="cultureInfoToLocaleNameConverter" />
 
     <Style x:Key="GlobalFonts">
         <Setter Property="Control.FontFamily"
@@ -846,43 +843,36 @@
                    Name="ClockText">
         </TextBlock>
     </ControlTemplate>
-    
-    <Style TargetType="Viewbox"
-           x:Key="KeyboardLayoutViewBox">
-        <Setter Property="Margin"
-                Value="0,0,1,0" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
-                         Value="Vertical">
-                <DataTrigger.Setters>
-                    <Setter Property="Margin"
-                            Value="0,3,0,3" />
-                </DataTrigger.Setters>
-            </DataTrigger>
-        </Style.Triggers>
-    </Style>
-    
+
     <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
+           x:Key="InputLanguage"
            BasedOn="{StaticResource GlobalFonts}">
-        <Setter Property="TextOptions.TextRenderingMode"
-                Value="Auto" />
         <Setter Property="Foreground"
-                Value="{DynamicResource KeyboardLayoutForeground}" />
+                Value="{DynamicResource InputLanguageForeground}" />
         <Setter Property="Background" 
-                Value="{DynamicResource KeyboardLayoutBackground}"/>
+                Value="{DynamicResource InputLanguageBackground}"/>
         <Setter Property="MinWidth" 
-                Value="19"/>
+                Value="16"/>
         <Setter Property="Height"
-                Value="14"/>
+                Value="16"/>
         <Setter Property="Padding"
                 Value="0,1,0,0" />
+        <Setter Property="Margin"
+                Value="3,0,3,0" />
+        <Setter Property="HorizontalAlignment"
+                Value="Center" />
         <Setter Property="TextAlignment"
                 Value="Center" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <DataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="0,3,0,3" />
+                </DataTrigger.Setters>
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
-    
-    <ControlTemplate TargetType="{x:Type UserControl}"
-                     x:Key="KeyboardLayoutTemplateKey"/>
 
     <Style TargetType="Button"
            x:Key="ToolbarButton">
diff --git a/RetroBar/Themes/Watercolor.xaml b/RetroBar/Themes/Watercolor.xaml
index f4e9cc3f..915f8bc2 100644
--- a/RetroBar/Themes/Watercolor.xaml
+++ b/RetroBar/Themes/Watercolor.xaml
@@ -55,9 +55,11 @@
 
     <SolidColorBrush x:Key="ButtonForeground" Color="#000000" />
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#006ec3" />
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
 
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#316ac5" />
+
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
 
@@ -804,11 +806,4 @@
             </Setter.Value>
         </Setter>
     </Style>
-
-    <Style TargetType="Viewbox"
-           x:Key="KeyboardLayoutViewBox"
-           BasedOn="{StaticResource KeyboardLayoutViewBox}">
-        <Setter Property="Margin"
-                Value="0,0,2,0" />
-    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows 2000.xaml b/RetroBar/Themes/Windows 2000.xaml
index 7a5b1088..587fe73e 100644
--- a/RetroBar/Themes/Windows 2000.xaml	
+++ b/RetroBar/Themes/Windows 2000.xaml	
@@ -15,6 +15,9 @@
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#FFFFFF" />
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
 
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#0A246A" />
+
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
 
@@ -24,13 +27,6 @@
         <Setter Property="Margin"
                 Value="0,-1,0,0" />
     </Style>
-
-    <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
-           BasedOn="{StaticResource KeyboardLayout}">
-        <Setter Property="Padding"
-                Value="0,1,0,1" />
-    </Style>
     
     <Style TargetType="TextBlock"
            x:Key="Clock"
diff --git a/RetroBar/Themes/Windows 95-98.xaml b/RetroBar/Themes/Windows 95-98.xaml
index 68bb0f4d..9ac169b5 100644
--- a/RetroBar/Themes/Windows 95-98.xaml	
+++ b/RetroBar/Themes/Windows 95-98.xaml	
@@ -15,8 +15,8 @@
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#FFFFFF" />
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
     
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#0000aa" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#000080" />
     
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
diff --git a/RetroBar/Themes/Windows Longhorn Aero.xaml b/RetroBar/Themes/Windows Longhorn Aero.xaml
index 9e70df45..80bc860e 100644
--- a/RetroBar/Themes/Windows Longhorn Aero.xaml	
+++ b/RetroBar/Themes/Windows Longhorn Aero.xaml	
@@ -337,8 +337,8 @@
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="Transparent" />
 
     <SolidColorBrush x:Key="ToolTipBackground" Color="#f4f4f4" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#00025c" />
@@ -1195,18 +1195,9 @@
                 Value="{StaticResource ForegroundShadow}" />
     </Style>
 
-    <Style TargetType="Viewbox"
-           x:Key="KeyboardLayoutViewBox"
-           BasedOn="{StaticResource KeyboardLayoutViewBox}">
-        <Setter Property="Margin"
-                Value="0,1,0,0" />
-    </Style>
-
     <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
-           BasedOn="{StaticResource KeyboardLayout}">
-        <Setter Property="Height"
-                Value="17" />
+           x:Key="InputLanguage"
+           BasedOn="{StaticResource InputLanguage}">
         <Setter Property="Effect"
                 Value="{StaticResource ForegroundShadow}" />
     </Style>
diff --git a/RetroBar/Themes/Windows Me.xaml b/RetroBar/Themes/Windows Me.xaml
index 99579578..0a5c4f9f 100644
--- a/RetroBar/Themes/Windows Me.xaml	
+++ b/RetroBar/Themes/Windows Me.xaml	
@@ -18,13 +18,6 @@
                 Value="{StaticResource ClassicFocusVisual}" />
     </Style>
 
-    <Style TargetType="Viewbox"
-           x:Key="KeyboardLayoutViewBox"
-           BasedOn="{StaticResource KeyboardLayoutViewBox}">
-        <Setter Property="Margin"
-                Value="0,0,1,0" />
-    </Style>
-    
     <Style TargetType="TextBlock"
            x:Key="Clock"
            BasedOn="{StaticResource Clock}">
diff --git a/RetroBar/Themes/Windows Vista Aero.xaml b/RetroBar/Themes/Windows Vista Aero.xaml
index 717ea3c2..33368bb8 100644
--- a/RetroBar/Themes/Windows Vista Aero.xaml	
+++ b/RetroBar/Themes/Windows Vista Aero.xaml	
@@ -278,8 +278,8 @@
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="Transparent" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="Transparent" />
 
     <LinearGradientBrush x:Key="ShowDesktopButtonBorderHorizontal"
                          StartPoint="0,0"
@@ -1363,11 +1363,11 @@
                 Value="0" />
     </Style>
 
-    <Style TargetType="Viewbox"
-           x:Key="KeyboardLayoutViewBox"
-           BasedOn="{StaticResource KeyboardLayoutViewBox}">
+    <Style TargetType="TextBlock"
+           x:Key="InputLanguage"
+           BasedOn="{StaticResource InputLanguage}">
         <Setter Property="Margin"
-                Value="0,-4,0,0" />
+                Value="0,-2,0,0" />
     </Style>
 
     <Style TargetType="TextBlock"
diff --git a/RetroBar/Themes/Windows Vista Classic.xaml b/RetroBar/Themes/Windows Vista Classic.xaml
index fbd40c02..ddcc7f83 100644
--- a/RetroBar/Themes/Windows Vista Classic.xaml	
+++ b/RetroBar/Themes/Windows Vista Classic.xaml	
@@ -23,13 +23,6 @@
         <Setter Property="Margin"
                 Value="0,0,0,1" />
     </Style>
-
-    <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
-           BasedOn="{StaticResource KeyboardLayout}">
-        <Setter Property="Padding"
-                Value="0,0,0,2" />
-    </Style>
     
     <Style TargetType="TextBlock"
            x:Key="Clock"
diff --git a/RetroBar/Themes/Windows XP Blue.xaml b/RetroBar/Themes/Windows XP Blue.xaml
index d2ec4d0b..124e69a5 100644
--- a/RetroBar/Themes/Windows XP Blue.xaml	
+++ b/RetroBar/Themes/Windows XP Blue.xaml	
@@ -348,7 +348,8 @@
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonFlashingForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#316ac5" />
 
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
@@ -690,6 +691,8 @@
            x:Key="Tray">
         <Setter Property="OverridesDefaultStyle"
                 Value="True" />
+        <Setter Property="Margin"
+                Value="10,0,0,0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GroupBox">
@@ -751,6 +754,15 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <DataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="0,10,0,0" />
+                </DataTrigger.Setters>
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <Style TargetType="Button"
@@ -1573,22 +1585,6 @@
                 Value="Grayscale" />
     </Style>
 
-    <Style TargetType="Viewbox"
-           x:Key="KeyboardLayoutViewBox"
-           BasedOn="{StaticResource KeyboardLayoutViewBox}">
-        <Setter Property="Margin"
-                Value="0,0,13,0" />
-    </Style>
-    
-    <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
-           BasedOn="{StaticResource KeyboardLayout}">
-        <Setter Property="Height"
-                Value="15" />
-        <Setter Property="Padding"
-                Value="0" />
-    </Style>
-
     <Style TargetType="TextBlock"
            x:Key="Clock"
            BasedOn="{StaticResource Clock}">
@@ -2012,7 +2008,7 @@
            TargetType="ScrollViewer"
            BasedOn="{StaticResource TaskListScrollViewer}">
         <Setter Property="Margin"
-                Value="4,0,10,0" />
+                Value="4,0,0,0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
@@ -2112,7 +2108,7 @@
                         </Setter.Value>
                     </Setter>
                     <Setter Property="Margin"
-                            Value="0,3,0,10" />
+                            Value="0,3,0,0" />
                 </DataTrigger.Setters>
             </DataTrigger>
         </Style.Triggers>
diff --git a/RetroBar/Themes/Windows XP Classic.xaml b/RetroBar/Themes/Windows XP Classic.xaml
index fd631227..b6a62e07 100644
--- a/RetroBar/Themes/Windows XP Classic.xaml	
+++ b/RetroBar/Themes/Windows XP Classic.xaml	
@@ -4,11 +4,4 @@
         <ResourceDictionary Source="Windows 2000.xaml" />
         <ResourceDictionary Source="System XP.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    
-    <Style TargetType="TextBlock"
-           x:Key="KeyboardLayout"
-           BasedOn="{StaticResource KeyboardLayout}">
-        <Setter Property="Padding"
-                Value="0,0,0,2" />
-    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows XP Embedded Style.xaml b/RetroBar/Themes/Windows XP Embedded Style.xaml
index 2d1f2b0f..9b0abde8 100644
--- a/RetroBar/Themes/Windows XP Embedded Style.xaml	
+++ b/RetroBar/Themes/Windows XP Embedded Style.xaml	
@@ -448,7 +448,7 @@
     </LinearGradientBrush>
 
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#3e9de8" />
 
     <BitmapImage x:Key="StartButtonImage"
                  UriSource="../Resources/startxpembeddedbutton.png" />
diff --git a/RetroBar/Themes/Windows XP Olive Green.xaml b/RetroBar/Themes/Windows XP Olive Green.xaml
index 737648d0..071be13b 100644
--- a/RetroBar/Themes/Windows XP Olive Green.xaml	
+++ b/RetroBar/Themes/Windows XP Olive Green.xaml	
@@ -388,6 +388,5 @@
     <SolidColorBrush x:Key="ButtonActiveForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#41400a" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#fdfde5" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#808000" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#93a070" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows XP Royale Noir.xaml b/RetroBar/Themes/Windows XP Royale Noir.xaml
index 19a2a3fa..22c7a4c6 100644
--- a/RetroBar/Themes/Windows XP Royale Noir.xaml	
+++ b/RetroBar/Themes/Windows XP Royale Noir.xaml	
@@ -402,7 +402,7 @@
                       Opacity="1" />
 
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#5e80bc" />
 
     <BitmapImage x:Key="StartButtonImage"
                  UriSource="../Resources/startnoir.png" />
diff --git a/RetroBar/Themes/Windows XP Royale.xaml b/RetroBar/Themes/Windows XP Royale.xaml
index b9f46909..4a11c5d3 100644
--- a/RetroBar/Themes/Windows XP Royale.xaml	
+++ b/RetroBar/Themes/Windows XP Royale.xaml	
@@ -463,7 +463,7 @@
     </LinearGradientBrush>
 
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#335ea8" />
 
     <BitmapImage x:Key="StartButtonImage"
                  UriSource="../Resources/startxproyalebutton.png" />
@@ -474,6 +474,8 @@
            x:Key="Tray">
         <Setter Property="OverridesDefaultStyle"
                 Value="True" />
+        <Setter Property="Margin"
+                Value="10,0,0,0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GroupBox">
@@ -527,6 +529,15 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <DataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="0,10,0,0" />
+                </DataTrigger.Setters>
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <Style TargetType="ToggleButton"
diff --git a/RetroBar/Themes/Windows XP Silver.xaml b/RetroBar/Themes/Windows XP Silver.xaml
index aa3e59a8..f3088287 100644
--- a/RetroBar/Themes/Windows XP Silver.xaml	
+++ b/RetroBar/Themes/Windows XP Silver.xaml	
@@ -711,6 +711,8 @@
            x:Key="Tray">
         <Setter Property="OverridesDefaultStyle"
                 Value="True" />
+        <Setter Property="Margin"
+                Value="10,0,0,0" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="GroupBox">
@@ -772,6 +774,15 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <DataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="0,10,0,0" />
+                </DataTrigger.Setters>
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <SolidColorBrush x:Key="ItemButtonForeground" Color="#ffffff" />
@@ -779,6 +790,6 @@
     <SolidColorBrush x:Key="ButtonActiveForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ButtonPressedForeground" Color="#ffffff" />
     <SolidColorBrush x:Key="ClockForeground" Color="#000000" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutBackground" Color="#808080" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#000000" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#b2b4bf" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows XP Zune Style.xaml b/RetroBar/Themes/Windows XP Zune Style.xaml
index 69c29fe7..cdd8b478 100644
--- a/RetroBar/Themes/Windows XP Zune Style.xaml	
+++ b/RetroBar/Themes/Windows XP Zune Style.xaml	
@@ -450,7 +450,8 @@
     </LinearGradientBrush>
 
     <SolidColorBrush x:Key="ClockForeground" Color="#ffffff" />
-    <SolidColorBrush x:Key="KeyboardLayoutForeground" Color="#ffffff" />
+    <SolidColorBrush x:Key="InputLanguageForeground" Color="#000000" />
+    <SolidColorBrush x:Key="InputLanguageBackground" Color="#bebebe" />
 
     <BitmapImage x:Key="StartButtonImage"
                  UriSource="../Resources/startxpzunebutton.png" />
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index 064879d8..8a6c5572 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -87,18 +87,18 @@ public string Theme
             }
         }
 
-        private bool _showKeyboardLayout = false;
-        public bool ShowKeyboardLayout
+        private bool _showInputLanguage = false;
+        public bool ShowInputLanguage
         {
             get
             {
-                return _showKeyboardLayout;
+                return _showInputLanguage;
             }
             set
             {
-                if (_showKeyboardLayout != value)
+                if (_showInputLanguage != value)
                 {
-                    _showKeyboardLayout = value;
+                    _showInputLanguage = value;
                     OnPropertyChanged();
                 }
             }