diff --git a/README.md b/README.md
index f5bec951..0cde1a87 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ RetroBar is based on the [ManagedShell](https://github.com/cairoshell/ManagedShe
 - Dutch (Nederlands)
 - English
 - English (United Kingdom)
+- Finnish (Suomi)
 - French (français)
 - German (Deutsch)
 - Greek (ελληνικά)
diff --git a/RetroBar/Controls/NotifyIconList.xaml b/RetroBar/Controls/NotifyIconList.xaml
index b531a3b0..542014f9 100644
--- a/RetroBar/Controls/NotifyIconList.xaml
+++ b/RetroBar/Controls/NotifyIconList.xaml
@@ -8,6 +8,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <converters:EdgeOrientationConverter x:Key="edgeOrientationConverter" />
+            <converters:IconListOrientation x:Key="iconsOrientation" />
         </ResourceDictionary>
     </UserControl.Resources>
     <StackPanel>
@@ -22,11 +23,19 @@
                       Style="{DynamicResource TrayToggleButton}"/>
         <ItemsControl x:Name="NotifyIcons"
                       Focusable="False"
-                      HorizontalAlignment="Center"
-                      VerticalAlignment="Center">
+                      Style="{DynamicResource NotifyIconItems}">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <WrapPanel Orientation="Horizontal"></WrapPanel>
+                    <WrapPanel>
+                        <WrapPanel.Orientation>
+                            <MultiBinding Converter="{StaticResource iconsOrientation}">
+                                <Binding Path="Orientation"
+                                         RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=Window}" />
+                                <Binding Path="Rows"
+                                         RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=Window}" />
+                            </MultiBinding>
+                        </WrapPanel.Orientation>
+                    </WrapPanel>
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
diff --git a/RetroBar/Controls/TaskList.xaml.cs b/RetroBar/Controls/TaskList.xaml.cs
index ff8901a9..895cb9b3 100644
--- a/RetroBar/Controls/TaskList.xaml.cs
+++ b/RetroBar/Controls/TaskList.xaml.cs
@@ -159,6 +159,9 @@ private void TaskList_OnSizeChanged(object sender, SizeChangedEventArgs e)
 
         private void SetTaskButtonWidth()
         {
+            if (Host is null)
+                return; // The state is trashed, but presumably it's just a transition
+
             if (Settings.Instance.Edge == AppBarEdge.Left || Settings.Instance.Edge == AppBarEdge.Right)
             {
                 ButtonWidth = ActualWidth;
@@ -166,8 +169,12 @@ private void SetTaskButtonWidth()
                 return;
             }
 
+            double height = ActualHeight;
+            int rows = Host.Rows;
+
+            int taskCount = TasksList.Items.Count;
             double margin = TaskButtonLeftMargin + TaskButtonRightMargin;
-            double maxWidth = TasksList.ActualWidth / TasksList.Items.Count;
+            double maxWidth = TasksList.ActualWidth * rows / (taskCount + (taskCount % rows));
             double defaultWidth = DefaultButtonWidth + margin;
             double minWidth = MinButtonWidth + margin;
 
diff --git a/RetroBar/Controls/Toolbar.xaml b/RetroBar/Controls/Toolbar.xaml
index a22b7dd4..d25a1d52 100644
--- a/RetroBar/Controls/Toolbar.xaml
+++ b/RetroBar/Controls/Toolbar.xaml
@@ -10,6 +10,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <converters:DockOrientationConverter x:Key="dockOrientationConverter" />
+            <converters:IconListOrientation x:Key="iconsOrientation" />
         </ResourceDictionary>
     </UserControl.Resources>
     <DockPanel>
@@ -30,7 +31,16 @@
                       dd:DragDrop.DragDropContext="Toolbar">
             <ItemsControl.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <WrapPanel Orientation="Horizontal"></WrapPanel>
+                    <WrapPanel>
+                        <WrapPanel.Orientation>
+                            <MultiBinding Converter="{StaticResource iconsOrientation}">
+                                <Binding Path="Orientation"
+                                         RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=Window}" />
+                                <Binding Path="Rows"
+                                         RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=Window}" />
+                            </MultiBinding>
+                        </WrapPanel.Orientation>
+                    </WrapPanel>
                 </ItemsPanelTemplate>
             </ItemsControl.ItemsPanel>
             <ItemsControl.ItemTemplate>
diff --git a/RetroBar/Converters/EdgeIsHorizontalConverter.cs b/RetroBar/Converters/EdgeIsHorizontalConverter.cs
new file mode 100644
index 00000000..6857d921
--- /dev/null
+++ b/RetroBar/Converters/EdgeIsHorizontalConverter.cs
@@ -0,0 +1,21 @@
+using ManagedShell.AppBar;
+using RetroBar.Utilities;
+using System.Windows.Data;
+using System;
+
+namespace RetroBar.Converters
+{
+    [ValueConversion(typeof(AppBarEdge), typeof(bool))]
+    public class EdgeIsHorizontalConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            return Settings.Instance.Edge is AppBarEdge.Top or AppBarEdge.Bottom;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/RetroBar/Converters/IconListOrientation.cs b/RetroBar/Converters/IconListOrientation.cs
new file mode 100644
index 00000000..9541c712
--- /dev/null
+++ b/RetroBar/Converters/IconListOrientation.cs
@@ -0,0 +1,30 @@
+using ManagedShell.AppBar;
+using RetroBar.Utilities;
+using System.Windows.Controls;
+using System;
+using System.Windows.Data;
+using System.Globalization;
+
+namespace RetroBar.Converters
+{
+    public class IconListOrientation : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool horizontal = Settings.Instance.Edge is AppBarEdge.Top or AppBarEdge.Bottom;
+            int rows = Settings.Instance.RowCount;
+
+            if (horizontal && rows > 1)
+            {
+                return Orientation.Vertical;
+            }
+
+            return Orientation.Horizontal;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/RetroBar/Languages/English.xaml b/RetroBar/Languages/English.xaml
index 57ab4924..00e4fdda 100644
--- a/RetroBar/Languages/English.xaml
+++ b/RetroBar/Languages/English.xaml
@@ -20,6 +20,15 @@
         <s:String>Right</s:String>
         <s:String>Bottom</s:String>
     </x:Array>
+    <s:String x:Key="rowcount_text">Number of _rows:</s:String>
+    <s:String x:Key="rowcount_tip">The number of rows on the taskbar when on top or bottom.</s:String>
+    <x:Array x:Key="rowcount_options" Type="s:Int32">
+        <s:Int32>1</s:Int32>
+        <s:Int32>2</s:Int32>
+        <s:Int32>3</s:Int32>
+        <s:Int32>4</s:Int32>
+        <s:Int32>5</s:Int32>
+    </x:Array>
     <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>
diff --git a/RetroBar/Languages/Suomi.xaml b/RetroBar/Languages/Suomi.xaml
new file mode 100644
index 00000000..7abee33d
--- /dev/null
+++ b/RetroBar/Languages/Suomi.xaml
@@ -0,0 +1,135 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:s="clr-namespace:System;assembly=mscorlib">
+
+    <s:String x:Key="retrobar_properties">RetroBar Ominaisuudet</s:String>
+    <s:String x:Key="taskbar_tab">Tehtäväpalkki</s:String>
+    <s:String x:Key="advanced_tab">Lisäasetukset</s:String>
+    <s:String x:Key="taskbar_appearance">Tehtäväpalkin ulkoasu</s:String>
+    <s:String x:Key="notification_area">Ilmoitusalue</s:String>
+    <s:String x:Key="autostart">Käynnistä automaattisesti _sisäänkirjautuessa</s:String>
+    <s:String x:Key="language_text">_Kieli:</s:String>
+    <s:String x:Key="language_tip">Valitse käytettävä kieli.</s:String>
+    <s:String x:Key="theme_text">_Teema:</s:String>
+    <s:String x:Key="theme_tip">Asenna teemoja Themes-kansioon.</s:String>
+    <s:String x:Key="location_text">Sijaint_i:</s:String>
+    <s:String x:Key="location_tip">Vaihda tehtäväpalkin sijaintia näytöllä.</s:String>
+    <x:Array x:Key="location_values" Type="s:String">
+        <s:String>Vasemmalla</s:String>
+        <s:String>Ylhäällä</s:String>
+        <s:String>Oikealla</s:String>
+        <s:String>Alhaalla</s:String>
+    </x:Array>
+    <s:String x:Key="rowcount_text">Rivien lukumäärä:</s:String>
+    <s:String x:Key="rowcount_tip">Rivien määrä tehtäväpalkissa, kun se on ylhäällä tai alhaalla.</s:String>
+    <x:Array x:Key="rowcount_options" Type="s:Int32">
+        <s:Int32>1</s:Int32>
+        <s:Int32>2</s:Int32>
+        <s:Int32>3</s:Int32>
+        <s:Int32>4</s:Int32>
+        <s:Int32>5</s:Int32>
+    </x:Array>
+    <s:String x:Key="allow_font_smoothing">_Salli fontin pehmennys</s:String>
+    <s:String x:Key="collapse_tray_icons">Piilota _ilmoitusalueen kuvakkeet</s:String>
+    <s:String x:Key="customize">_Mukauta...</s:String>
+    <s:String x:Key="show_input_language">Näytä syötteen _kieli</s:String>
+    <s:String x:Key="show_clock">Näytä kell_o</s:String>
+    <s:String x:Key="show_multi_mon">Näytä _useilla näytöillä</s:String>
+    <s:String x:Key="show_quick_launch">Näytä _Pika-käynnistys</s:String>
+    <s:String x:Key="select_location">_Valitse sijainti...</s:String>
+    <s:String x:Key="quick_launch_folder">Pika-käynnistys - Valitse kansio</s:String>
+    <s:String x:Key="show_badges">Näytä _merkit</s:String>
+    <s:String x:Key="show_window_previews">Näytä _ikkunoiden esikatselut (pienoiskuvat)</s:String>
+    <s:String x:Key="use_software_rendering">_Käytä ohjelmisto renderöintiä</s:String>
+    <s:String x:Key="add_show_desktop_button">Lisää Näytä _työpöytä -painike</s:String>
+    <s:String x:Key="enable_auto_hide">P_iilota automaattisesti</s:String>
+    <s:String x:Key="lock_taskbar">_Lukitse tehtäväpalkki</s:String>
+    <s:String x:Key="multiple_displays">Useita näyttöjä</s:String>
+    <s:String x:Key="show_tasks_on">Näytä tehtävät _seuraavilla:</s:String>
+    <x:Array x:Key="show_tasks_on_values" Type="s:String">
+        <s:String>Kaikilla tehtäväpalkkeilla</s:String>
+        <s:String>Saman ikkunan tehtäväpalkilla</s:String>
+        <s:String>Pää- ja ikkunan tehtäväpalkilla</s:String>
+    </x:Array>
+    <s:String x:Key="invert_system_icons">_Käännä järjestelmäkuvakkeet:</s:String>
+    <x:Array x:Key="invert_system_icons_values" Type="s:String">
+        <s:String>Kun teema tarvitsee</s:String>
+        <s:String>Aina</s:String>
+        <s:String>Ei koskaan</s:String>
+    </x:Array>
+    <s:String x:Key="middle_mouse_task_action">Keskipainike-toiminto:</s:String>
+    <x:Array x:Key="middle_mouse_task_action_values" Type="s:String">
+        <s:String>Älä tee mitään</s:String>
+        <s:String>Avaa uusi ikkuna</s:String>
+        <s:String>Sulje tehtävä</s:String>
+    </x:Array>
+    <s:String x:Key="version">Versio {0}</s:String>
+    <s:String x:Key="visit_on_github">RetroBarin GitHub</s:String>
+    <s:String x:Key="taskbar_scale">Tehtäväpalkin skaalaus</s:String>
+    <s:String x:Key="taskbar_scale_1x">100%</s:String>
+    <s:String x:Key="taskbar_scale_2x">200%</s:String>
+    <s:String x:Key="taskbar_scale_current">Nykyinen asetus: {0}%</s:String>
+    <s:String x:Key="debug_logging">Ota käyttöön virheenkorjausloki</s:String>
+    <s:String x:Key="check_for_updates">Tarkista päivitykset automaattisesti</s:String>
+    <s:String x:Key="ok_dialog">OK</s:String>
+
+    <s:String x:Key="customize_notifications">Mukauta ilmoitukset</s:String>
+    <s:String x:Key="customize_notifications_info">RetroBar näyttää aktiivisten ja kiireellisten ilmoitusten kuvakkeet ja piilottaa passiiviset. Voit muuttaa tätä asetusta alla olevien kohteiden kohdalla.</s:String>
+    <s:String x:Key="customize_notifications_instruction">Valitse kohde ja valitse sitten sen ilmoitustoiminta:</s:String>
+    <s:String x:Key="hide_when_inactive">Piilota, kun passiivinen</s:String>
+    <s:String x:Key="always_show">Näytä aina</s:String>
+    <s:String x:Key="always_hide">Piilota aina</s:String>
+    <s:String x:Key="remove">Poista</s:String>
+    <s:String x:Key="name_heading">Nimi</s:String>
+    <s:String x:Key="behavior_heading">Käyttäytyminen</s:String>
+    <s:String x:Key="invert_heading">Käännä</s:String>
+
+    <s:String x:Key="start_text">Käynnistä</s:String>
+    <s:String x:Key="start_text_xp">Käynnistä</s:String>
+    <s:String x:Key="start_button_tip_98">Avaa käynnistä-valikko</s:String>
+    <s:String x:Key="start_button_tip">Avaa käynnistä-valikko</s:String>
+    <s:String x:Key="start_button_tip_vista">Avaa käynnistä-valikko</s:String>
+
+    <s:String x:Key="retrobar_title">RetroBar Tehtäväpalkki</s:String>
+    <s:String x:Key="toolbars">Työkalupalkit</s:String>
+    <s:String x:Key="quick_launch">Pika-käynnistys</s:String>
+    <s:String x:Key="new_toolbar">Uusi työkalupalkki...</s:String>
+    <s:String x:Key="set_time">Muuta päivämäärää/aikaa</s:String>
+    <s:String x:Key="cascade">Ikkunat kaskadina</s:String>
+    <s:String x:Key="horiz_tile">Laatikoi ikkunat vaakasuunnassa</s:String>
+    <s:String x:Key="vert_tile">Laatikoi ikkunat pystysuunnassa</s:String>
+    <s:String x:Key="toggle_desktop">Näytä työpöytä</s:String>
+    <s:String x:Key="hide_desktop">Näytä avoimet ikkunat</s:String>
+    <s:String x:Key="undo_cascade">Peruuta kaskadi</s:String>
+    <s:String x:Key="undo_tile">Peruuta laatikointi</s:String>
+    <s:String x:Key="undo_minimize_all">Peruuta pienennys kaikille</s:String>
+    <s:String x:Key="show_taskman_2k">Tehtävienhallinta...</s:String>
+    <s:String x:Key="show_taskman">Tehtävienhallinta</s:String>
+    <s:String x:Key="tray_properties">Ominaisuudet</s:String>
+    <s:String x:Key="update_available">Päivitys saatavilla...</s:String>
+    <s:String x:Key="exit_retrobar">_Sulje RetroBar</s:String>
+    <s:String x:Key="customize_notifications_menu">Mukauta ilmoitukset...</s:String>
+    <s:String x:Key="lock_taskbar_menu">Lukitse tehtäväpalkki</s:String>
+
+    <s:String x:Key="show_desktop_tip_95">Näytä työpöytä</s:String>
+    <s:String x:Key="show_desktop_tip">Näytä työpöytä</s:String>
+    <s:String x:Key="show_desktop_95">Näytä työpöytä</s:String>
+    <s:String x:Key="show_desktop">Näytä työpöytä</s:String>
+    <s:String x:Key="peek_at_desktop">Näytä työpöytä</s:String>
+
+    <s:String x:Key="restore">Palauta</s:String>
+    <s:String x:Key="move">Siirrä</s:String>
+    <s:String x:Key="size">Koko</s:String>
+    <s:String x:Key="minimize">Pienennä</s:String>
+    <s:String x:Key="maximize">Suurenna</s:String>
+    <s:String x:Key="close">Sulje</s:String>
+
+    <s:String x:Key="show_hidden">Näytä piilotetut kuvakkeet</s:String>
+    <s:String x:Key="hide">Piilota</s:String>
+
+    <s:String x:Key="open_folder">&amp;Avaa kansio</s:String>
+
+    <!-- Items below are settings, and should always be in English -->
+    <FlowDirection x:Key="flow_direction">LeftToRight</FlowDirection>
+    <FontFamily x:Key="start_text_xp_font_family">Franklin Gothic</FontFamily>
+</ResourceDictionary>
diff --git "a/RetroBar/Languages/\327\242\327\221\327\250\327\231\327\252.xaml" "b/RetroBar/Languages/\327\242\327\221\327\250\327\231\327\252.xaml"
index 6653a90c..cf6670dc 100644
--- "a/RetroBar/Languages/\327\242\327\221\327\250\327\231\327\252.xaml"
+++ "b/RetroBar/Languages/\327\242\327\221\327\250\327\231\327\252.xaml"
@@ -20,6 +20,8 @@
         <s:String>ימין</s:String>
         <s:String>ישבן</s:String>
     </x:Array>
+    <s:String x:Key="rowcount_text">מספר שורות:</s:String>
+    <s:String x:Key="rowcount_tip">מספר השורות בשורת המשימות כאשר למעלה או למטה.</s:String>
     <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>
diff --git a/RetroBar/PropertiesWindow.xaml b/RetroBar/PropertiesWindow.xaml
index db069aea..e7467f21 100644
--- a/RetroBar/PropertiesWindow.xaml
+++ b/RetroBar/PropertiesWindow.xaml
@@ -23,6 +23,7 @@
             <converters:BoolToInvertedVisibilityConverter x:Key="boolToInvertedVisibilityConverter" />
             <converters:DoubleToPercentConverter x:Key="doubleToPercentConverter" />
             <converters:EnumConverter x:Key="enumConverter" />
+            <converters:EdgeIsHorizontalConverter x:Key="isHorizontalConverter" />
             <Style TargetType="{x:Type TextBlock}">
                 <Setter Property="VerticalAlignment"
                         Value="Center" />
@@ -203,6 +204,16 @@
                                           SelectedIndex="{Binding Source={x:Static Settings:Settings.Instance}, Path=Edge, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource enumConverter}}"
                                           SelectionChanged="cboEdgeSelect_SelectionChanged" />
                             </DockPanel>
+                            <DockPanel IsEnabled="{Binding Source={x:Static Settings:Settings.Instance}, Path=Edge, Converter={StaticResource isHorizontalConverter}}">
+                                <Label VerticalAlignment="Center"
+                                       Target="{Binding ElementName=cbRowCount}">
+                                    <AccessText Text="{DynamicResource rowcount_text}"
+                                                ToolTip="{DynamicResource rowcount_tip}" />
+                                </Label>
+                                <ComboBox x:Name="cbRowCount"
+                                          ItemsSource="{DynamicResource rowcount_options}"
+                                          SelectedValue="{Binding Source={x:Static Settings:Settings.Instance}, Path=RowCount, UpdateSourceTrigger=PropertyChanged}" />
+                            </DockPanel>
                             <CheckBox IsChecked="{Binding Source={x:Static Settings:Settings.Instance}, Path=AllowFontSmoothing, UpdateSourceTrigger=PropertyChanged}">
                                 <Label Content="{DynamicResource allow_font_smoothing}" />
                             </CheckBox>
diff --git a/RetroBar/PropertiesWindow.xaml.cs b/RetroBar/PropertiesWindow.xaml.cs
index 080f5b5a..0e116b4d 100644
--- a/RetroBar/PropertiesWindow.xaml.cs
+++ b/RetroBar/PropertiesWindow.xaml.cs
@@ -53,6 +53,12 @@ public bool IsLocked
             get => Settings.Instance.LockTaskbar;
         }
 
+        // Previews should always assume 1 row
+        public int Rows
+        {
+            get => 1;
+        }
+
         private PropertiesWindow(NotificationArea notificationArea, DictionaryManager dictionaryManager, AppBarScreen screen, double dpiScale, double barSize)
         {
             _barSize = barSize;
diff --git a/RetroBar/Taskbar.xaml b/RetroBar/Taskbar.xaml
index 134f8787..4a985040 100644
--- a/RetroBar/Taskbar.xaml
+++ b/RetroBar/Taskbar.xaml
@@ -10,6 +10,7 @@
         LocationChanged="Taskbar_OnLocationChanged"
         SizeChanged="Taskbar_OnSizeChanged"
         MouseLeftButtonDown="Taskbar_OnMouseLeftButtonDown"
+        MouseMove="Taskbar_MouseMove"
         Deactivated="Taskbar_Deactivated"
         AllowDrop="True"
         Style="{DynamicResource TaskbarWindow}">
diff --git a/RetroBar/Taskbar.xaml.cs b/RetroBar/Taskbar.xaml.cs
index 1e323469..ef998960 100644
--- a/RetroBar/Taskbar.xaml.cs
+++ b/RetroBar/Taskbar.xaml.cs
@@ -13,6 +13,7 @@
 using System.Diagnostics;
 using System.Windows.Input;
 using ManagedShell.Common.Logging;
+using System.Windows.Threading;
 
 namespace RetroBar
 {
@@ -37,11 +38,21 @@ public bool IsScaled
             }
         }
 
+        private double _unlockedMargin;
+        public double DesiredRowHeight { get; private set; }
+
+        public int Rows
+        {
+            get => Settings.Instance.RowCount;
+            set => Settings.Instance.RowCount = value;
+        }
+
         private bool _clockRightClicked;
         private bool _notifyAreaRightClicked;
         private bool _startMenuOpen;
         private LowLevelMouseHook _mouseDragHook;
         private Point? _mouseDragStart = null;
+        private bool _mouseDragResize = false;
         private ShellManager _shellManager;
         private Updater _updater;
 
@@ -58,14 +69,16 @@ public Taskbar(WindowManager windowManager, ShellManager shellManager, StartMenu
             DataContext = _shellManager;
             StartButton.StartMenuMonitor = startMenuMonitor;
 
-            DesiredHeight = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarHeight") as double? ?? 0);
+            
+            _unlockedMargin = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarUnlockedSize") as double? ?? 0);
+            DesiredRowHeight = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarRowHeight") as double? ?? 0);
             DesiredWidth = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarWidth") as double? ?? 0);
+            DesiredHeight = (Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarHeight") as double? ?? 0)) + DesiredRowHeight * (Rows - 1);
 
             if (AppBarMode == AppBarMode.AutoHide || !Settings.Instance.LockTaskbar)
             {
-                double unlockedSize = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarUnlockedSize") as double? ?? 0);
-                DesiredHeight += unlockedSize;
-                DesiredWidth += unlockedSize;
+                DesiredHeight += _unlockedMargin;
+                DesiredWidth += _unlockedMargin;
             }
 
             AllowsTransparency = mode == AppBarMode.AutoHide || (Application.Current.FindResource("AllowsTransparency") as bool? ?? false);
@@ -94,7 +107,7 @@ public Taskbar(WindowManager windowManager, ShellManager shellManager, StartMenu
 
             PropertyChanged += Taskbar_PropertyChanged;
         }
-
+        
         private void Taskbar_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == nameof(DpiScale))
@@ -152,14 +165,16 @@ private void UpdateTrayPosition()
 
         private void RecalculateSize()
         {
-            double newHeight = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarHeight") as double? ?? 0);
+            _unlockedMargin = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarUnlockedSize") as double? ?? 0);
+            DesiredRowHeight = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarRowHeight") as double? ?? 0);
             double newWidth = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarWidth") as double? ?? 0);
 
+            double newHeight = (Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarHeight") as double? ?? 0)) + DesiredRowHeight * (Rows - 1);
+
             if (AppBarMode == AppBarMode.AutoHide || !Settings.Instance.LockTaskbar)
             {
-                double unlockedSize = Settings.Instance.TaskbarScale * (Application.Current.FindResource("TaskbarUnlockedSize") as double? ?? 0);
-                newHeight += unlockedSize;
-                newWidth += unlockedSize;
+                newHeight += _unlockedMargin;
+                newWidth += _unlockedMargin;
             }
 
             bool heightChanged = newHeight != DesiredHeight;
@@ -263,6 +278,11 @@ private void Settings_PropertyChanged(object sender, PropertyChangedEventArgs e)
                 PeekDuringAutoHide();
                 RecalculateSize();
             }
+            else if (e.PropertyName == nameof(Settings.RowCount))
+            {
+                RecalculateSize();
+                OnPropertyChanged(nameof(Rows));
+            }
         }
 
         private void Taskbar_OnLocationChanged(object sender, EventArgs e)
@@ -543,6 +563,31 @@ private void MouseDragHook_LowLevelMouseEvent(object sender, LowLevelMouseHook.L
                         return;
                     }
 
+                    if (_mouseDragResize)
+                    {
+                        Dispatcher.BeginInvoke(() => {
+                            int mouseY = e.HookStruct.pt.Y;
+                            // Calculate where the resize edge should be, in case the actual resize operation is lagging behind the mouse
+                            double taskbarEdge = AppBarEdge == AppBarEdge.Top ? Screen.Bounds.Top + (DesiredHeight * DpiScale) : Screen.Bounds.Bottom - (DesiredHeight * DpiScale);
+                            double scaledRowHeight = DesiredRowHeight * DpiScale;
+                            if ((AppBarEdge == AppBarEdge.Top && mouseY < taskbarEdge - SystemParameters.MinimumVerticalDragDistance ||
+                                 AppBarEdge == AppBarEdge.Bottom && mouseY > taskbarEdge + SystemParameters.MinimumVerticalDragDistance) &&
+                                 Settings.Instance.RowCount > 1)
+                            {
+                                // If mouse is inside the taskbar and more than the minimum drag distance away, decrement size
+                                Settings.Instance.RowCount -= 1;
+                            }
+                            else if ((AppBarEdge == AppBarEdge.Top && mouseY >= taskbarEdge + scaledRowHeight ||
+                                      AppBarEdge == AppBarEdge.Bottom && mouseY <= taskbarEdge - scaledRowHeight) &&
+                                      Settings.Instance.RowCount < 5)
+                            {
+                                // If mouse is outside the taskbar and at least one row height away, increment size
+                                Settings.Instance.RowCount += 1;
+                            }
+                        });
+                        return;
+                    }
+
                     if (Math.Abs(e.HookStruct.pt.X - (double)(_mouseDragStart?.X)) <= SystemParameters.MinimumHorizontalDragDistance ||
                         Math.Abs(e.HookStruct.pt.Y - (double)(_mouseDragStart?.Y)) <= SystemParameters.MinimumVerticalDragDistance)
                     {
@@ -579,6 +624,7 @@ private void StartMouseDragHook()
             _mouseDragHook.LowLevelMouseEvent += MouseDragHook_LowLevelMouseEvent;
             _mouseDragHook.Initialize();
             _mouseDragStart = new Point(System.Windows.Forms.Cursor.Position.X, System.Windows.Forms.Cursor.Position.Y);
+            _mouseDragResize = IsMouseInResizeArea();
 
             ShellLogger.Debug($"Mouse drag hook started");
         }
@@ -589,8 +635,41 @@ private void StopMouseDragHook()
             _mouseDragHook.Dispose();
             _mouseDragHook = null;
             _mouseDragStart = null;
+            _mouseDragResize = false;
 
             ShellLogger.Debug("Mouse drag hook removed");
         }
+
+        private bool IsMouseInResizeArea()
+        {
+            if (IsLocked || Orientation == Orientation.Vertical) return false;
+
+            int resizeRegionSize = (int)(_unlockedMargin > 0 ? _unlockedMargin : SystemParameters.MinimumVerticalDragDistance * Settings.Instance.TaskbarScale);
+            int mouseY = System.Windows.Forms.Cursor.Position.Y;
+
+            if (AppBarEdge == AppBarEdge.Bottom && mouseY <= (int)(Top * DpiScale) + resizeRegionSize)
+            {
+                return true;
+            }
+            else if (AppBarEdge == AppBarEdge.Top && mouseY >= (int)((Top + Height) * DpiScale) - resizeRegionSize)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private void Taskbar_MouseMove(object sender, MouseEventArgs e)
+        {
+            // Show resize cursor for resizable taskbars
+            if (IsMouseInResizeArea() || _mouseDragResize)
+            {
+                Cursor = Cursors.SizeNS;
+            }
+            else
+            {
+                Cursor = Cursors.Arrow;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/RetroBar/Themes/System XP.xaml b/RetroBar/Themes/System XP.xaml
index 9be652b5..793ca1c2 100644
--- a/RetroBar/Themes/System XP.xaml	
+++ b/RetroBar/Themes/System XP.xaml	
@@ -34,7 +34,28 @@
            x:Key="Clock"
            BasedOn="{StaticResource Clock}">
         <Setter Property="Margin"
-                Value="5,-1,5,0" />
+                Value="5,3" />
+        <Style.Triggers>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="1"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="5,-1,5,0" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <DataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="0,3" />
+                </DataTrigger.Setters>
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <ControlTemplate TargetType="{x:Type UserControl}"
@@ -47,26 +68,44 @@
             <TextBlock Text="{Binding Path=Now, StringFormat=dddd, Mode=OneWay}"
                        Style="{DynamicResource Clock}"
                        Name="ClockVerticalDayOfWeek"
-                       Visibility="Collapsed">
+                       Visibility="Visible">
             </TextBlock>
             <TextBlock Text="{Binding Path=Now, StringFormat=d, Mode=OneWay}"
                        Style="{DynamicResource Clock}"
                        Name="ClockVerticalDate"
-                       Visibility="Collapsed">
+                       Visibility="Visible">
             </TextBlock>
         </StackPanel>
         <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
-                         Value="Vertical">
-                <DataTrigger.Setters>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="1"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
                     <Setter TargetName="ClockVerticalDayOfWeek"
                             Property="Visibility"
-                            Value="Visible" />
+                            Value="Collapsed" />
                     <Setter TargetName="ClockVerticalDate"
                             Property="Visibility"
-                            Value="Visible" />
-                </DataTrigger.Setters>
-            </DataTrigger>
+                            Value="Collapsed" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="2"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter TargetName="ClockVerticalDate"
+                            Property="Visibility"
+                            Value="Collapsed" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
diff --git a/RetroBar/Themes/System.xaml b/RetroBar/Themes/System.xaml
index f3ce0a79..c7fc32c5 100644
--- a/RetroBar/Themes/System.xaml
+++ b/RetroBar/Themes/System.xaml
@@ -3,6 +3,7 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <system:Double x:Key="TaskbarHeight">28</system:Double>
+    <system:Double x:Key="TaskbarRowHeight">25</system:Double>
     <system:Double x:Key="TaskbarWidth">98</system:Double>
     <system:Double x:Key="TaskbarUnlockedSize">0</system:Double>
     <system:Double x:Key="TaskButtonWidth">160</system:Double>
@@ -217,7 +218,7 @@
         <Setter Property="Foreground"
                 Value="{DynamicResource ButtonForeground}" />
         <Setter Property="Margin"
-                Value="{DynamicResource TaskButtonMargin}" />
+                Value="0,0,3,-1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -273,6 +274,18 @@
             </Setter.Value>
         </Setter>
         <Style.Triggers>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="1"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="{DynamicResource TaskButtonMargin}" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
             <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                          Value="Vertical">
                 <DataTrigger.Setters>
@@ -406,6 +419,7 @@
                                         Padding="4,0"
                                         x:Name="ButtonInnerTopBorder">
                                     <ContentPresenter HorizontalAlignment="Center"
+                                                      VerticalAlignment="Center"
                                                       Margin="0,-5,0,-3" />
                                 </Border>
                             </Border>
@@ -568,6 +582,8 @@
                 Value="{DynamicResource ButtonForeground}" />
         <Setter Property="HorizontalAlignment"
                 Value="Left" />
+        <Setter Property="VerticalAlignment"
+                Value="Top" />
         <Setter Property="BorderThickness"
                 Value="0,0,1,1" />
         <Setter Property="FocusVisualStyle"
@@ -807,6 +823,14 @@
         </Style.Triggers>
     </Style>
 
+    <Style TargetType="ItemsControl"
+           x:Key="NotifyIconItems">
+        <Setter Property="HorizontalAlignment"
+                Value="Center" />
+        <Setter Property="VerticalAlignment"
+                Value="Center"/>
+    </Style>
+
     <Style TargetType="TextBlock"
            x:Key="TaskLabel"
            BasedOn="{StaticResource GlobalFonts}">
@@ -898,7 +922,7 @@
         <Setter Property="Background"
                 Value="{DynamicResource ButtonFace}" />
         <Setter Property="Margin"
-                Value="0" />
+                Value="0,0,0,-1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -948,6 +972,13 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <Setter Property="Margin"
+                        Value="0" />
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <Style TargetType="Image"
@@ -963,6 +994,8 @@
                 Value="Stretch" />
         <Setter Property="Margin"
                 Value="4,0,0,0" />
+        <Setter Property="VerticalAlignment"
+                Value="Top"/>
         <Style.Triggers>
             <MultiDataTrigger>
                 <MultiDataTrigger.Conditions>
diff --git a/RetroBar/Themes/Watercolor.xaml b/RetroBar/Themes/Watercolor.xaml
index 915f8bc2..1f03bed0 100644
--- a/RetroBar/Themes/Watercolor.xaml
+++ b/RetroBar/Themes/Watercolor.xaml
@@ -152,7 +152,7 @@
         <Setter Property="Foreground"
                 Value="{DynamicResource ButtonForeground}" />
         <Setter Property="Margin"
-                Value="0,0,3,0" />
+                Value="0,0,3,-1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -202,6 +202,18 @@
             </Setter.Value>
         </Setter>
         <Style.Triggers>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="1"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="0,0,3,0" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
             <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                          Value="Vertical">
                 <DataTrigger.Setters>
@@ -415,7 +427,7 @@
         <Setter Property="Background"
                 Value="{DynamicResource ButtonFace}" />
         <Setter Property="Margin"
-                Value="0" />
+                Value="0,0,0,-1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -464,6 +476,13 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <Setter Property="Margin"
+                        Value="0" />
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <Style TargetType="Thumb"
@@ -548,7 +567,8 @@
                             Background="{TemplateBinding Background}"
                             x:Name="ButtonBorder">
                         <ContentPresenter HorizontalAlignment="Center"
-                                          Margin="4,-4,4,-2"
+                                          VerticalAlignment="Center"
+                                          Margin="4,-5,4,-1"
                                           x:Name="Content" />
                     </Border>
                     <ControlTemplate.Triggers>
diff --git a/RetroBar/Themes/Windows Longhorn Aero.xaml b/RetroBar/Themes/Windows Longhorn Aero.xaml
index ebb6434a..411de402 100644
--- a/RetroBar/Themes/Windows Longhorn Aero.xaml	
+++ b/RetroBar/Themes/Windows Longhorn Aero.xaml	
@@ -3,6 +3,7 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <system:Double x:Key="TaskbarHeight">30</system:Double>
+    <system:Double x:Key="TaskbarRowHeight">30</system:Double>
     <system:Boolean x:Key="AllowsTransparency">True</system:Boolean>
     <Thickness x:Key="TaskButtonMargin" Right="2" />
 
@@ -529,6 +530,8 @@
     <Style TargetType="Button"
            x:Key="TaskButton"
            BasedOn="{StaticResource TaskButton}">
+        <Setter Property="Margin"
+                Value="{DynamicResource TaskButtonMargin}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -1115,6 +1118,8 @@
                 Value="30" />
         <Setter Property="HorizontalAlignment"
                 Value="Left" />
+        <Setter Property="VerticalAlignment"
+                Value="Top" />
         <Setter Property="FocusVisualStyle"
                 Value="{x:Null}" />
         <Setter Property="Template">
@@ -1213,7 +1218,7 @@
            x:Key="Clock"
            BasedOn="{StaticResource Clock}">
         <Setter Property="Margin"
-                Value="6,0,10,0" />
+                Value="6,2,10,2" />
         <Setter Property="Effect"
                 Value="{StaticResource ForegroundShadow}" />
         <Style.Triggers>
@@ -1237,26 +1242,31 @@
             <TextBlock Text="{Binding Path=Now, StringFormat=dddd, Mode=OneWay}"
                        Style="{DynamicResource Clock}"
                        Name="ClockVerticalDayOfWeek"
-                       Visibility="Collapsed">
+                       Visibility="Visible">
             </TextBlock>
             <TextBlock Text="{Binding Path=Now, StringFormat=d, Mode=OneWay}"
                        Style="{DynamicResource Clock}"
                        Name="ClockVerticalDate"
-                       Visibility="Collapsed">
+                       Visibility="Visible">
             </TextBlock>
         </StackPanel>
         <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
-                         Value="Vertical">
-                <DataTrigger.Setters>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="1"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
                     <Setter TargetName="ClockVerticalDayOfWeek"
                             Property="Visibility"
-                            Value="Visible" />
+                            Value="Collapsed" />
                     <Setter TargetName="ClockVerticalDate"
                             Property="Visibility"
-                            Value="Visible" />
-                </DataTrigger.Setters>
-            </DataTrigger>
+                            Value="Collapsed" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
@@ -1264,7 +1274,14 @@
            x:Key="NotifyIcon"
            BasedOn="{StaticResource NotifyIcon}">
         <Setter Property="Margin"
-                Value="0,2,4,2" />
+                Value="0,1,4,1" />
+    </Style>
+
+    <Style TargetType="ItemsControl"
+           x:Key="NotifyIconItems"
+           BasedOn="{StaticResource NotifyIconItems}">
+        <Setter Property="Margin"
+                Value="0,1" />
     </Style>
 
     <Style TargetType="ItemsControl"
diff --git a/RetroBar/Themes/Windows Vista Aero.xaml b/RetroBar/Themes/Windows Vista Aero.xaml
index e2c67d2a..7da41892 100644
--- a/RetroBar/Themes/Windows Vista Aero.xaml	
+++ b/RetroBar/Themes/Windows Vista Aero.xaml	
@@ -3,14 +3,16 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <system:Double x:Key="TaskbarHeight">30</system:Double>
+    <system:Double x:Key="TaskbarRowHeight">30</system:Double>
     <system:Double x:Key="TaskbarWidth">80</system:Double>
     <system:Boolean x:Key="AllowsTransparency">True</system:Boolean>
     <system:Boolean x:Key="UseFloatingStartButton">True</system:Boolean>
     <Thickness x:Key="TaskButtonMargin" Right="2" />
 
     <LinearGradientBrush x:Key="TaskbarBackground"
+                         MappingMode="Absolute"
                          StartPoint="0,0"
-                         EndPoint="0,1">
+                         EndPoint="0,26">
         <GradientStop Color="#c7767676"
                       Offset="0.0" />
         <GradientStop Color="#c7323232"
@@ -519,6 +521,8 @@
     <Style TargetType="Button"
            x:Key="TaskButton"
            BasedOn="{StaticResource TaskButton}">
+        <Setter Property="Margin"
+                Value="{DynamicResource TaskButtonMargin}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -1042,9 +1046,14 @@
                                 </Setter>
                             </MultiDataTrigger.Setters>
                         </MultiDataTrigger>
-                        <DataTrigger Binding="{Binding Path=AppBarEdge, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
-                                     Value="Bottom">
-                            <DataTrigger.Setters>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=AppBarEdge, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="Bottom" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
                                         Property="Background">
                                     <Setter.Value>
@@ -1053,14 +1062,16 @@
                                                     Viewbox="0,0,1,0.3333" />
                                     </Setter.Value>
                                 </Setter>
-                            </DataTrigger.Setters>
-                        </DataTrigger>
+                            </MultiDataTrigger.Setters>
+                        </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=AppBarEdge, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="Bottom" />
                                 <Condition Binding="{Binding Path=IsScaled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1079,6 +1090,8 @@
                                            Value="Bottom" />
                                 <Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1099,6 +1112,8 @@
                                            Value="True" />
                                 <Condition Binding="{Binding Path=IsScaled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1117,6 +1132,8 @@
                                            Value="Bottom" />
                                 <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1137,6 +1154,8 @@
                                            Value="True" />
                                 <Condition Binding="{Binding Path=IsScaled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1155,6 +1174,8 @@
                                            Value="Bottom" />
                                 <Condition Binding="{Binding Path=IsPressed, RelativeSource={RelativeSource Self}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1175,6 +1196,8 @@
                                            Value="True" />
                                 <Condition Binding="{Binding Path=IsScaled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1187,9 +1210,14 @@
                                 </Setter>
                             </MultiDataTrigger.Setters>
                         </MultiDataTrigger>
-                        <DataTrigger Binding="{Binding Path=AppBarEdge, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
-                                     Value="Top">
-                            <DataTrigger.Setters>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=AppBarEdge, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                     Value="Top"/>
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
                                         Property="Background">
                                     <Setter.Value>
@@ -1198,14 +1226,16 @@
                                                     Viewbox="0,0,1,0.3333" />
                                     </Setter.Value>
                                 </Setter>
-                            </DataTrigger.Setters>
-                        </DataTrigger>
+                            </MultiDataTrigger.Setters>
+                        </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=AppBarEdge, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="Top" />
                                 <Condition Binding="{Binding Path=IsScaled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1224,6 +1254,8 @@
                                            Value="Top" />
                                 <Condition Binding="{Binding Path=IsMouseOver, RelativeSource={RelativeSource Self}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1244,6 +1276,8 @@
                                            Value="True" />
                                 <Condition Binding="{Binding Path=IsScaled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1262,6 +1296,8 @@
                                            Value="Top" />
                                 <Condition Binding="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1282,6 +1318,8 @@
                                            Value="True" />
                                 <Condition Binding="{Binding Path=IsScaled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1300,6 +1338,8 @@
                                            Value="Top" />
                                 <Condition Binding="{Binding Path=IsPressed, RelativeSource={RelativeSource Self}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1320,6 +1360,8 @@
                                            Value="True" />
                                 <Condition Binding="{Binding Path=IsScaled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                            Value="True" />
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
                             </MultiDataTrigger.Conditions>
                             <MultiDataTrigger.Setters>
                                 <Setter TargetName="StartButtonBorder"
@@ -1374,14 +1416,27 @@
            x:Key="InputLanguage"
            BasedOn="{StaticResource InputLanguage}">
         <Setter Property="Margin"
-                Value="0,-2,0,0" />
+                Value="4,6,0,0" />
+        <Setter Property="HorizontalAlignment"
+                Value="Left" />
+        <Setter Property="VerticalAlignment"
+                Value="Top" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <DataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="2,6,0,0" />
+                </DataTrigger.Setters>
+            </DataTrigger>
+        </Style.Triggers>
     </Style>
 
     <Style TargetType="TextBlock"
            x:Key="Clock"
            BasedOn="{StaticResource Clock}">
         <Setter Property="Margin"
-                Value="6,0,10,1" />
+                Value="6,1,10,2" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                          Value="Vertical">
@@ -1403,26 +1458,31 @@
             <TextBlock Text="{Binding Path=Now, StringFormat=dddd, Mode=OneWay}"
                        Style="{DynamicResource Clock}"
                        Name="ClockVerticalDayOfWeek"
-                       Visibility="Collapsed">
+                       Visibility="Visible">
             </TextBlock>
             <TextBlock Text="{Binding Path=Now, StringFormat=d, Mode=OneWay}"
                        Style="{DynamicResource Clock}"
                        Name="ClockVerticalDate"
-                       Visibility="Collapsed">
+                       Visibility="Visible">
             </TextBlock>
         </StackPanel>
         <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
-                         Value="Vertical">
-                <DataTrigger.Setters>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="1"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
                     <Setter TargetName="ClockVerticalDayOfWeek"
                             Property="Visibility"
-                            Value="Visible" />
+                            Value="Collapsed" />
                     <Setter TargetName="ClockVerticalDate"
                             Property="Visibility"
-                            Value="Visible" />
-                </DataTrigger.Setters>
-            </DataTrigger>
+                            Value="Collapsed" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
@@ -1437,7 +1497,7 @@
            x:Key="NotifyIcon"
            BasedOn="{StaticResource NotifyIcon}">
         <Setter Property="Margin"
-                Value="0,1,4,3" />
+                Value="0,1,4,1" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                          Value="Vertical">
@@ -1449,6 +1509,34 @@
         </Style.Triggers>
     </Style>
 
+    <Style TargetType="ItemsControl"
+           x:Key="NotifyIconItems"
+           BasedOn="{StaticResource NotifyIconItems}">
+        <Setter Property="Margin"
+                Value="0,1" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <DataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="0" />
+                </DataTrigger.Setters>
+            </DataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="1"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="0,0,0,2" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
+        </Style.Triggers>
+    </Style>
+
     <Style TargetType="ItemsControl"
            x:Key="ToolbarItems"
            BasedOn="{StaticResource ToolbarItems}">
diff --git a/RetroBar/Themes/Windows Vista Basic.xaml b/RetroBar/Themes/Windows Vista Basic.xaml
index d95f438d..c294ec39 100644
--- a/RetroBar/Themes/Windows Vista Basic.xaml	
+++ b/RetroBar/Themes/Windows Vista Basic.xaml	
@@ -8,8 +8,9 @@
     <system:Boolean x:Key="AllowsTransparency">False</system:Boolean>
 
     <LinearGradientBrush x:Key="TaskbarBackground"
+                         MappingMode="Absolute"
                          StartPoint="0,0"
-                         EndPoint="0,1">
+                         EndPoint="0,26">
         <GradientStop Color="#8B8C8C"
                       Offset="0.0" />
         <GradientStop Color="#828383"
diff --git a/RetroBar/Themes/Windows XP Blue.xaml b/RetroBar/Themes/Windows XP Blue.xaml
index 3331a0e7..bb13ec7a 100644
--- a/RetroBar/Themes/Windows XP Blue.xaml	
+++ b/RetroBar/Themes/Windows XP Blue.xaml	
@@ -3,6 +3,7 @@
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
     <system:Double x:Key="TaskbarHeight">30</system:Double>
+    <system:Double x:Key="TaskbarRowHeight">30</system:Double>
     <system:Double x:Key="TaskbarUnlockedSize">4</system:Double>
     <Thickness x:Key="TaskButtonMargin" />
 
@@ -20,6 +21,20 @@
         <GradientStop Color="#1941a5"
                       Offset="1.0" />
     </LinearGradientBrush>
+    <LinearGradientBrush x:Key="TaskbarBackgroundTall"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <GradientStop Color="#3888e9"
+                      Offset="0.0" />
+        <GradientStop Color="#4993e6"
+                      Offset="0.05" />
+        <GradientStop Color="#2257d5"
+                      Offset="0.18" />
+        <GradientStop Color="#2663e0"
+                      Offset="0.9" />
+        <GradientStop Color="#1941a5"
+                      Offset="1.0" />
+    </LinearGradientBrush>
     <LinearGradientBrush x:Key="TaskbarVerticalBackground"
                          StartPoint="0,0"
                          EndPoint="1,0">
@@ -429,7 +444,7 @@
                                 x:Name="TaskbarUnlockedBorder">
                             <Border BorderThickness="0,1,0,0"
                                     BorderBrush="{DynamicResource TaskbarBorder}"
-                                    Background="{DynamicResource TaskbarBackground}"
+                                    Background="{DynamicResource TaskbarBackgroundTall}"
                                     x:Name="TaskbarBorder">
                                 <ContentPresenter Margin="0,-1,0,0"
                                                   Name="Content" />
@@ -451,6 +466,19 @@
                                         Value="0" />
                             </DataTrigger.Setters>
                         </DataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="Horizontal"/>
+                                <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                                           Value="1"/>
+                            </MultiDataTrigger.Conditions>
+                            <MultiDataTrigger.Setters>
+                                <Setter TargetName="TaskbarBorder"
+                                        Property="Background"
+                                        Value="{DynamicResource TaskbarBackground}" />
+                            </MultiDataTrigger.Setters>
+                        </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding Path=AppBarMode, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"
@@ -768,6 +796,8 @@
     <Style TargetType="Button"
            x:Key="TaskButton"
            BasedOn="{StaticResource TaskButton}">
+        <Setter Property="Margin"
+                Value="{DynamicResource TaskButtonMargin}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
@@ -1486,6 +1516,8 @@
                 Value="32" />
         <Setter Property="FocusVisualStyle"
                 Value="{x:Null}" />
+        <Setter Property="VerticalAlignment"
+                Value="Top" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
@@ -1596,15 +1628,27 @@
            x:Key="Clock"
            BasedOn="{StaticResource Clock}">
         <Setter Property="Margin"
-                Value="8,-1,11,0" />
+                Value="8,1,11,6" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                          Value="Vertical">
                 <DataTrigger.Setters>
                     <Setter Property="Margin"
-                            Value="0,1,1,6" />
+                            Value="0,1,0,6" />
                 </DataTrigger.Setters>
             </DataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="1"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="8,-1,11,0" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
         </Style.Triggers>
     </Style>
 
@@ -1617,15 +1661,15 @@
             </TextBlock>
             <TextBlock Text="{Binding Path=Now, StringFormat=dddd, Mode=OneWay}"
                        Style="{DynamicResource Clock}"
-                       Margin="0,0,0,6"
+                       Margin="8,0,11,6"
                        Name="ClockVerticalDayOfWeek"
-                       Visibility="Collapsed">
+                       Visibility="Visible">
             </TextBlock>
             <TextBlock Text="{Binding Path=Now, StringFormat=d, Mode=OneWay}"
                        Style="{DynamicResource Clock}"
-                       Margin="0,0,0,3"
+                       Margin="8,0,11,3"
                        Name="ClockVerticalDate"
-                       Visibility="Collapsed">
+                       Visibility="Visible">
             </TextBlock>
         </StackPanel>
         <ControlTemplate.Triggers>
@@ -1633,13 +1677,29 @@
                          Value="Vertical">
                 <DataTrigger.Setters>
                     <Setter TargetName="ClockVerticalDayOfWeek"
-                            Property="Visibility"
-                            Value="Visible" />
+                            Property="Margin"
+                            Value="0,0,0,6" />
                     <Setter TargetName="ClockVerticalDate"
-                            Property="Visibility"
-                            Value="Visible" />
+                            Property="Margin"
+                            Value="0,0,0,3" />
                 </DataTrigger.Setters>
             </DataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Horizontal"/>
+                    <Condition Binding="{Binding Path=Rows, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                               Value="1"/>
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.Setters>
+                    <Setter TargetName="ClockVerticalDayOfWeek"
+                            Property="Visibility"
+                            Value="Collapsed" />
+                    <Setter TargetName="ClockVerticalDate"
+                            Property="Visibility"
+                            Value="Collapsed" />
+                </MultiDataTrigger.Setters>
+            </MultiDataTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
@@ -1647,13 +1707,29 @@
            x:Key="NotifyIcon"
            BasedOn="{StaticResource NotifyIcon}">
         <Setter Property="Margin"
-                Value="0,2,2,2" />
+                Value="0,1,2,1" />
         <Style.Triggers>
             <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                          Value="Vertical">
                 <DataTrigger.Setters>
                     <Setter Property="Margin"
-                            Value="2,2,0,2" />
+                            Value="1,2,1,2" />
+                </DataTrigger.Setters>
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="ItemsControl"
+           x:Key="NotifyIconItems"
+           BasedOn="{StaticResource NotifyIconItems}">
+        <Setter Property="Margin"
+                Value="0,-1" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                         Value="Vertical">
+                <DataTrigger.Setters>
+                    <Setter Property="Margin"
+                            Value="0" />
                 </DataTrigger.Setters>
             </DataTrigger>
         </Style.Triggers>
diff --git a/RetroBar/Themes/Windows XP Embedded Style.xaml b/RetroBar/Themes/Windows XP Embedded Style.xaml
index 9b0abde8..834dcd40 100644
--- a/RetroBar/Themes/Windows XP Embedded Style.xaml	
+++ b/RetroBar/Themes/Windows XP Embedded Style.xaml	
@@ -30,6 +30,26 @@
         <GradientStop Color="#01223d"
                       Offset="1.0" />
     </LinearGradientBrush>
+    <LinearGradientBrush x:Key="TaskbarBackgroundTall"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <GradientStop Color="#4d94cc"
+                      Offset="0.0" />
+        <GradientStop Color="#4d94cc"
+                      Offset="0.05" />
+        <GradientStop Color="#377eb6"
+                      Offset="0.05" />
+        <GradientStop Color="#1c639b"
+                      Offset="0.50" />
+        <GradientStop Color="#054c84"
+                      Offset="0.50" />
+        <GradientStop Color="#01345d"
+                      Offset="0.97" />
+        <GradientStop Color="#01223d"
+                      Offset="0.97" />
+        <GradientStop Color="#01223d"
+                      Offset="1.0" />
+    </LinearGradientBrush>
     <LinearGradientBrush x:Key="TaskbarVerticalBackground"
                          StartPoint="0,0"
                          EndPoint="1,0">
diff --git a/RetroBar/Themes/Windows XP Olive Green.xaml b/RetroBar/Themes/Windows XP Olive Green.xaml
index 071be13b..71f20f3d 100644
--- a/RetroBar/Themes/Windows XP Olive Green.xaml	
+++ b/RetroBar/Themes/Windows XP Olive Green.xaml	
@@ -22,6 +22,20 @@
         <GradientStop Color="#96a867"
                       Offset="1.0" />
     </LinearGradientBrush>
+    <LinearGradientBrush x:Key="TaskbarBackgroundTall"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <GradientStop Color="#eaf5c9"
+                      Offset="0.0" />
+        <GradientStop Color="#e0e7b8"
+                      Offset="0.05" />
+        <GradientStop Color="#a8b680"
+                      Offset="0.18" />
+        <GradientStop Color="#c2cd95"
+                      Offset="0.9" />
+        <GradientStop Color="#96a867"
+                      Offset="1.0" />
+    </LinearGradientBrush>
     <LinearGradientBrush x:Key="TaskbarVerticalBackground"
                          StartPoint="0,0"
                          EndPoint="1,0">
diff --git a/RetroBar/Themes/Windows XP Royale Noir.xaml b/RetroBar/Themes/Windows XP Royale Noir.xaml
index 22c7a4c6..2df82a0d 100644
--- a/RetroBar/Themes/Windows XP Royale Noir.xaml	
+++ b/RetroBar/Themes/Windows XP Royale Noir.xaml	
@@ -31,6 +31,28 @@
         <GradientStop Color="#161c2d"
                       Offset="1.0" />
     </LinearGradientBrush>
+    <LinearGradientBrush x:Key="TaskbarBackgroundTall"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <GradientStop Color="#737c84"
+                      Offset="0.0" />
+        <GradientStop Color="#737c84"
+                      Offset="0.05" />
+        <GradientStop Color="#66737c"
+                      Offset="0.05" />
+        <GradientStop Color="#4c5868"
+                      Offset="0.49" />
+        <GradientStop Color="#4c5868"
+                      Offset="0.53" />
+        <GradientStop Color="#334151"
+                      Offset="0.53" />
+        <GradientStop Color="#232a3d"
+                      Offset="0.97" />
+        <GradientStop Color="#161c2d"
+                      Offset="0.97" />
+        <GradientStop Color="#161c2d"
+                      Offset="1.0" />
+    </LinearGradientBrush>
     <LinearGradientBrush x:Key="TaskbarVerticalBackground"
                          StartPoint="0,0"
                          EndPoint="1,0">
diff --git a/RetroBar/Themes/Windows XP Royale.xaml b/RetroBar/Themes/Windows XP Royale.xaml
index 4a11c5d3..fe83f301 100644
--- a/RetroBar/Themes/Windows XP Royale.xaml	
+++ b/RetroBar/Themes/Windows XP Royale.xaml	
@@ -34,6 +34,30 @@
         <GradientStop Color="#254394"
                       Offset="1.0" />
     </LinearGradientBrush>
+    <LinearGradientBrush x:Key="TaskbarBackgroundTall"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <GradientStop Color="#99c6f1"
+                      Offset="0.0" />
+        <GradientStop Color="#99c6f1"
+                      Offset="0.05" />
+        <GradientStop Color="#83c2ed"
+                      Offset="0.05" />
+        <GradientStop Color="#5896df"
+                      Offset="0.40" />
+        <GradientStop Color="#5896df"
+                      Offset="0.53" />
+        <GradientStop Color="#397dd0"
+                      Offset="0.53" />
+        <GradientStop Color="#2c55b1"
+                      Offset="0.90" />
+        <GradientStop Color="#2c55b1"
+                      Offset="0.97" />
+        <GradientStop Color="#254394"
+                      Offset="0.97" />
+        <GradientStop Color="#254394"
+                      Offset="1.0" />
+    </LinearGradientBrush>
     <LinearGradientBrush x:Key="TaskbarVerticalBackground"
                          StartPoint="0,0"
                          EndPoint="1,0">
diff --git a/RetroBar/Themes/Windows XP Zune Style.xaml b/RetroBar/Themes/Windows XP Zune Style.xaml
index cdd8b478..0d32e857 100644
--- a/RetroBar/Themes/Windows XP Zune Style.xaml	
+++ b/RetroBar/Themes/Windows XP Zune Style.xaml	
@@ -30,6 +30,26 @@
         <GradientStop Color="#1b1b1b"
                       Offset="1.0" />
     </LinearGradientBrush>
+    <LinearGradientBrush x:Key="TaskbarBackgroundTall"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <GradientStop Color="#858585"
+                      Offset="0.0" />
+        <GradientStop Color="#858585"
+                      Offset="0.05" />
+        <GradientStop Color="#6f6f6f"
+                      Offset="0.05" />
+        <GradientStop Color="#545454"
+                      Offset="0.50" />
+        <GradientStop Color="#3d3d3d"
+                      Offset="0.50" />
+        <GradientStop Color="#292929"
+                      Offset="0.97" />
+        <GradientStop Color="#1b1b1b"
+                      Offset="0.97" />
+        <GradientStop Color="#1b1b1b"
+                      Offset="1.0" />
+    </LinearGradientBrush>
     <LinearGradientBrush x:Key="TaskbarVerticalBackground"
                          StartPoint="0,0"
                          EndPoint="1,0">
diff --git a/RetroBar/Utilities/Settings.cs b/RetroBar/Utilities/Settings.cs
index a7e948b8..0737c8f5 100644
--- a/RetroBar/Utilities/Settings.cs
+++ b/RetroBar/Utilities/Settings.cs
@@ -206,6 +206,13 @@ public AppBarEdge Edge
             set => SetEnum(ref _edge, value);
         }
 
+        private int _rowCount = 1;
+        public int RowCount
+        {
+            get => _rowCount;
+            set => Set(ref _rowCount, value);
+        }
+
         private List<string> _quickLaunchOrder = [];
         public List<string> QuickLaunchOrder
         {