diff --git a/dev/PipsPager/InteractionTests/PipsPagerElements.cs b/dev/PipsPager/InteractionTests/PipsPagerElements.cs
index 7535fc76f2..94c663a6a9 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerElements.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerElements.cs
@@ -19,6 +19,7 @@ public class PipsPagerElements
         private UIObject PipsPager;
         private UIObject NextPageButton;
         private UIObject PreviousPageButton;
+        private Button RetrievePipsPagerButtonSizesButton;
         private ComboBox PreviousPageButtonVisibilityComboBox;
         private ComboBox NextPageButtonVisibilityComboBox;
         private ComboBox NumberOfPagesComboBox;
@@ -33,7 +34,10 @@ public class PipsPagerElements
         private TextBlock CurrentNumberOfPagesTextBlock;
         private TextBlock CurrentMaxVisualIndicatorsTextBlock;
         private TextBlock CurrentOrientationTextBlock;
-
+        private TextBlock HorizontalOrientationPipsPagerButtonWidthTextBlock;
+        private TextBlock HorizontalOrientationPipsPagerButtonHeightTextBlock;
+        private TextBlock VerticalOrientationPipsPagerButtonWidthTextBlock;
+        private TextBlock VerticalOrientationPipsPagerButtonHeightTextBlock;
         public UIObject GetPipsPager()
         {
             return GetElement(ref PipsPager, "TestPipsPager");
@@ -113,6 +117,28 @@ public TextBlock GetCurrentOrientationTextBlock()
             return GetElement(ref CurrentOrientationTextBlock, "CurrentOrientationTextBlock");
         }
 
+        public TextBlock GetHorizontalOrientationPipsPagerButtonWidthTextBlock()
+        {
+            return GetElement(ref HorizontalOrientationPipsPagerButtonWidthTextBlock, "HorizontalOrientationPipsPagerButtonWidthTextBlock");
+        }
+        public TextBlock GetHorizontalOrientationPipsPagerButtonHeightTextBlock()
+        {
+            return GetElement(ref HorizontalOrientationPipsPagerButtonHeightTextBlock, "HorizontalOrientationPipsPagerButtonHeightTextBlock");
+        }
+        public TextBlock GetVerticalOrientationPipsPagerButtonWidthTextBlock()
+        {
+            return GetElement(ref VerticalOrientationPipsPagerButtonWidthTextBlock, "VerticalOrientationPipsPagerButtonWidthTextBlock");
+        }
+        public TextBlock GetVerticalOrientationPipsPagerButtonHeightTextBlock()
+        {
+            return GetElement(ref VerticalOrientationPipsPagerButtonHeightTextBlock, "VerticalOrientationPipsPagerButtonHeightTextBlock");
+        }
+
+        public Button GetPipsPagerButtonSizesButton()
+        {
+            return GetElement(ref RetrievePipsPagerButtonSizesButton, "GetPipsPagersButtonSizesButton");
+        }
+
         public UIObject GetPipWithPageNumber(string elementName)
         {
             foreach (var element in GetPipsPager().Children)
diff --git a/dev/PipsPager/InteractionTests/PipsPagerTests.cs b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
index 91779db175..7fb218abfa 100755
--- a/dev/PipsPager/InteractionTests/PipsPagerTests.cs
+++ b/dev/PipsPager/InteractionTests/PipsPagerTests.cs
@@ -4,6 +4,8 @@
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
 using Common;
+using Microsoft.Windows.Apps.Test.Foundation.Controls;
+using Microsoft.Windows.Apps.Test.Foundation;
 #if USING_TAEF
 using WEX.TestExecution;
 using WEX.TestExecution.Markup;
@@ -315,5 +317,52 @@ public void KeyboardPageSelectTest()
                 VerifySelectedPageIndex(2);
             }
         }
+        [TestMethod]
+        [TestProperty("TestSuite", "F")]
+        public void PipSizeWithDifferentOrientationsTest()
+        {
+            using (var setup = new TestSetupHelper("PipsPager Tests"))
+            {
+                elements = new PipsPagerElements();
+                Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
+                getButtonSizesButton.InvokeAndWait();
+                
+                TextBlock horizontalOrientationPipsPagerButtonWidth = elements.GetHorizontalOrientationPipsPagerButtonWidthTextBlock();
+                TextBlock horizontalOrientationPipsPagerButtonHeight = elements.GetHorizontalOrientationPipsPagerButtonHeightTextBlock();
+
+                TextBlock verticalOrientationPipsPagerButtonWidth = elements.GetVerticalOrientationPipsPagerButtonWidthTextBlock();
+                TextBlock verticalOrientationPipsPagerButtonHeight = elements.GetVerticalOrientationPipsPagerButtonHeightTextBlock();
+
+                Verify.AreEqual("12", horizontalOrientationPipsPagerButtonWidth.DocumentText);
+                Verify.AreEqual("20", horizontalOrientationPipsPagerButtonHeight.DocumentText);
+                Verify.AreEqual("20", verticalOrientationPipsPagerButtonWidth.DocumentText);
+                Verify.AreEqual("12", verticalOrientationPipsPagerButtonHeight.DocumentText);
+            }
+        }
+
+        [TestMethod]
+        [TestProperty("TestSuite", "F")]
+        public void PipSizeAfterOrientationChangeTest()
+        {
+            using (var setup = new TestSetupHelper("PipsPager Tests"))
+            {
+                elements = new PipsPagerElements();
+                Button getButtonSizesButton = elements.GetPipsPagerButtonSizesButton();
+                getButtonSizesButton.InvokeAndWait();
+
+                TextBlock horizontalOrientationPipsPagerButtonWidth = elements.GetHorizontalOrientationPipsPagerButtonWidthTextBlock();
+                TextBlock horizontalOrientationPipsPagerButtonHeight = elements.GetHorizontalOrientationPipsPagerButtonHeightTextBlock();
+                Verify.AreEqual("12", horizontalOrientationPipsPagerButtonWidth.DocumentText);
+                Verify.AreEqual("20", horizontalOrientationPipsPagerButtonHeight.DocumentText);
+
+                SetOrientation(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
+                VerifyOrientationChanged(Microsoft.Windows.Apps.Test.Automation.OrientationType.Vertical);
+
+                getButtonSizesButton.InvokeAndWait();
+
+                Verify.AreEqual("20", horizontalOrientationPipsPagerButtonWidth.DocumentText);
+                Verify.AreEqual("12", horizontalOrientationPipsPagerButtonHeight.DocumentText);
+            }
+        }
     }
 }
diff --git a/dev/PipsPager/PipsPager.cpp b/dev/PipsPager/PipsPager.cpp
index 826efbe22e..35af8e9f66 100755
--- a/dev/PipsPager/PipsPager.cpp
+++ b/dev/PipsPager/PipsPager.cpp
@@ -35,12 +35,19 @@ constexpr auto c_nextPageButtonName = L"NextPageButton"sv;
 constexpr auto c_pipsPagerRepeaterName = L"PipsPagerItemsRepeater"sv;
 constexpr auto c_pipsPagerScrollViewerName = L"PipsPagerScrollViewer"sv;
 
-constexpr auto c_pipsPagerButtonWidthPropertyName = L"PipsPagerButtonWidth"sv;
-constexpr auto c_pipsPagerButtonHeightPropertyName = L"PipsPagerButtonHeight"sv;
+constexpr auto c_pipsPagerVerticalOrientationButtonWidthPropertyName = L"PipsPagerVerticalOrientationButtonWidth"sv;
+constexpr auto c_pipsPagerVerticalOrientationButtonHeightPropertyName = L"PipsPagerVerticalOrientationButtonHeight"sv;
+
+constexpr auto c_pipsPagerHorizontalOrientationButtonWidthPropertyName = L"PipsPagerHorizontalOrientationButtonWidth"sv;
+constexpr auto c_pipsPagerHorizontalOrientationButtonHeightPropertyName = L"PipsPagerHorizontalOrientationButtonHeight"sv;
 
 constexpr auto c_pipsPagerHorizontalOrientationVisualState = L"HorizontalOrientationView"sv;
 constexpr auto c_pipsPagerVerticalOrientationVisualState = L"VerticalOrientationView"sv;
 
+constexpr auto c_pipsPagerButtonVerticalOrientationVisualState = L"VerticalOrientation"sv;
+constexpr auto c_pipsPagerButtonHorizontalOrientationVisualState = L"HorizontalOrientation"sv;
+
+
 PipsPager::PipsPager()
 {
     __RP_Marker_ClassById(RuntimeProfiler::ProfId_PipsPager);
@@ -124,7 +131,7 @@ void PipsPager::OnApplyTemplate()
 
 void PipsPager::RaiseSelectedIndexChanged()
 {
-    const auto args = winrt::make_self<PipsPagerSelectedIndexChangedEventArgs>(m_lastSelectedPageIndex, SelectedPageIndex());
+    const auto args = winrt::make_self<PipsPagerSelectedIndexChangedEventArgs>();
     m_selectedIndexChangedEventSource(*this, *args);
 }
 
@@ -135,16 +142,14 @@ winrt::Size PipsPager::GetDesiredPipSize(const winrt::Style& style) {
         {
             if (auto const element = itemTemplate.LoadContent().try_as<winrt::FrameworkElement>())
             {
-                element.Style(style);
+                ApplyStyleToPipAndUpdateOrientation(element, style);
                 element.Measure({ std::numeric_limits<float>::infinity(), std::numeric_limits<float>::infinity() });
                 return element.DesiredSize();
             }
         }
     }
-    /* Extract default sizes and return in case the code above fails */
-    auto pipHeight = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerButtonHeightPropertyName)));
-    auto pipWidth = unbox_value<double>(ResourceAccessor::ResourceLookup(*this, box_value(c_pipsPagerButtonWidthPropertyName)));
-    return { static_cast<float>(pipWidth), static_cast<float>(pipHeight) };
+   
+    return { 0.0, 0.0 };
 }
 
 void PipsPager::OnKeyDown(const winrt::KeyRoutedEventArgs& args) {
@@ -267,14 +272,14 @@ void PipsPager::UpdateSelectedPip(const int index) {
         if (const auto repeater = m_pipsPagerRepeater.get())
         {
             repeater.UpdateLayout();
-            if (const auto element = repeater.TryGetElement(m_lastSelectedPageIndex).try_as<winrt::Button>())
+            if (const auto pip = repeater.TryGetElement(m_lastSelectedPageIndex).try_as<winrt::FrameworkElement>())
             {
-                element.Style(NormalPipStyle());
+                ApplyStyleToPipAndUpdateOrientation(pip, NormalPipStyle());
             }
-            if (const auto element = repeater.GetOrCreateElement(index).try_as<winrt::Button>())
+            if (const auto pip = repeater.GetOrCreateElement(index).try_as<winrt::FrameworkElement>())
             {
-                element.Style(SelectedPipStyle());
-                ScrollToCenterOfViewport(element, index);
+                ApplyStyleToPipAndUpdateOrientation(pip, SelectedPipStyle());
+                ScrollToCenterOfViewport(pip, index);
             }
         }
     }
@@ -356,21 +361,18 @@ void PipsPager::UpdatePipsItems(const int numberOfPages, int maxVisualIndicators
 
 void PipsPager::OnElementPrepared(winrt::ItemsRepeater sender, winrt::ItemsRepeaterElementPreparedEventArgs args)
 {
-    if (auto const element = args.Element())
+    if (auto const element = args.Element().try_as<winrt::FrameworkElement>())
     {
-        if (const auto pip = element.try_as<winrt::Button>())
-        {
-            auto const index = args.Index();
-            if (index != SelectedPageIndex())
-            {
-                pip.Style(NormalPipStyle());
-            }
+        auto const index = args.Index();
+        auto const style = index == SelectedPageIndex() ? SelectedPipStyle() : NormalPipStyle();
+        ApplyStyleToPipAndUpdateOrientation(element, style);
 
-            // Narrator says: Page 5, Button 5 of 30. Is it expected behavior?
-            winrt::AutomationProperties::SetName(pip, ResourceAccessor::GetLocalizedStringResource(SR_PipsPagerPageText) + L" " + winrt::to_hstring(index + 1));
-            winrt::AutomationProperties::SetPositionInSet(pip, index + 1);
-            winrt::AutomationProperties::SetSizeOfSet(pip, NumberOfPages());
+        winrt::AutomationProperties::SetName(element, ResourceAccessor::GetLocalizedStringResource(SR_PipsPagerPageText) + L" " + winrt::to_hstring(index + 1));
+        winrt::AutomationProperties::SetPositionInSet(element, index + 1);
+        winrt::AutomationProperties::SetSizeOfSet(element, NumberOfPages());
 
+        if (const auto pip = element.try_as<winrt::ButtonBase>())
+        {
             auto pciRevokers = winrt::make_self<PipsPagerViewItemRevokers>();
             pciRevokers->clickRevoker = pip.Click(winrt::auto_revoke,
                 [this, index](auto const& sender, auto const& args)
@@ -468,9 +470,49 @@ void PipsPager::OnOrientationChanged()
     {
         winrt::VisualStateManager::GoToState(*this, c_pipsPagerVerticalOrientationVisualState, false);
     }
+    if (const auto repeater = m_pipsPagerRepeater.get())
+    {
+        if (const auto itemsSourceView = repeater.ItemsSourceView())
+        {
+            const auto itemCount = itemsSourceView.Count();
+            for (int i = 0; i < itemCount; i++)
+            {
+                if (const auto pip = repeater.TryGetElement(i).try_as<winrt::Control>())
+                {
+                    UpdatePipOrientation(pip);
+                }
+            }
+        }
+    }
+    m_defaultPipSize = GetDesiredPipSize(NormalPipStyle());
+    m_selectedPipSize = GetDesiredPipSize(SelectedPipStyle());
     SetScrollViewerMaxSize();
-    UpdateSelectedPip(SelectedPageIndex());
+    if (const auto selectedPip = GetSelectedItem())
+    {
+        ScrollToCenterOfViewport(selectedPip, SelectedPageIndex());
+    }
+}
 
+void PipsPager::ApplyStyleToPipAndUpdateOrientation(const winrt::FrameworkElement& pip, const winrt::Style& style)
+{
+    pip.Style(style);
+    if (const auto control = pip.try_as<winrt::Control>())
+    {
+        control.ApplyTemplate();
+        UpdatePipOrientation(control);
+    }
+}
+
+void PipsPager::UpdatePipOrientation(const winrt::Control& pip)
+{
+    if (Orientation() == winrt::Orientation::Horizontal)
+    {
+        winrt::VisualStateManager::GoToState(pip, c_pipsPagerButtonHorizontalOrientationVisualState, false);
+    }
+    else
+    {
+        winrt::VisualStateManager::GoToState(pip, c_pipsPagerButtonVerticalOrientationVisualState, false);
+    }
 }
 
 void PipsPager::OnNavigationButtonVisibilityChanged(const ButtonVisibility visibility, const wstring_view& collapsedStateName, const wstring_view& disabledStateName) {
@@ -692,6 +734,14 @@ void PipsPager::OnPropertyChanged(const winrt::DependencyPropertyChangedEventArg
     }
 }
 
+winrt::UIElement PipsPager::GetSelectedItem() {
+    if (auto const repeater = m_pipsPagerRepeater.get())
+    {
+        return repeater.TryGetElement(SelectedPageIndex());
+    }
+    return nullptr;
+}
+
 winrt::AutomationPeer PipsPager::OnCreateAutomationPeer()
 {
     return winrt::make<PipsPagerAutomationPeer>(*this);
diff --git a/dev/PipsPager/PipsPager.h b/dev/PipsPager/PipsPager.h
index 44aaf6331c..4451b3c3d5 100755
--- a/dev/PipsPager/PipsPager.h
+++ b/dev/PipsPager/PipsPager.h
@@ -47,6 +47,8 @@ class PipsPager :
         const wstring_view& disabledStateName);
     void OnOrientationChanged();
 
+    winrt::UIElement GetSelectedItem();
+
     /* Dependency property for pip buttons revokers */
     GlobalDependencyProperty s_pipButtonHandlersProperty;
 
@@ -66,7 +68,8 @@ class PipsPager :
     void ScrollToCenterOfViewport(const winrt::UIElement sender, const int index);
     double CalculateScrollViewerSize(const double defaultPipSize, const double selectedPipSize, const int numberOfPages, int maxVisualIndicators);
     void UpdateSelectedPip(const int index);
-
+    void UpdatePipOrientation(const winrt::Control& pip);
+    void ApplyStyleToPipAndUpdateOrientation(const winrt::FrameworkElement& pip, const winrt::Style& style);
     /* Eventing */
     void RaiseSelectedIndexChanged();
 
diff --git a/dev/PipsPager/PipsPager.xaml b/dev/PipsPager/PipsPager.xaml
index f81c440e4a..6ba2039880 100755
--- a/dev/PipsPager/PipsPager.xaml
+++ b/dev/PipsPager/PipsPager.xaml
@@ -88,13 +88,20 @@
 
                         <Button x:Name="PreviousPageButton"
                                 ToolTipService.ToolTip="{Binding ElementName=PreviousPageButton, Path=(AutomationProperties.Name)}"
-                                Style="{TemplateBinding PreviousButtonStyle}"/>
+                                Style="{TemplateBinding PreviousButtonStyle}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center" />
 
                         <ScrollViewer x:Name="PipsPagerScrollViewer"
                                       VerticalScrollBarVisibility="Hidden"
                                       VerticalScrollMode="Disabled"
                                       HorizontalScrollBarVisibility="Hidden"
-                                      HorizontalScrollMode="Disabled">
+                                      HorizontalScrollMode="Disabled"
+                                      IsHorizontalScrollChainingEnabled="False"
+                                      IsVerticalScrollChainingEnabled="False"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      >
                             <muxc:ItemsRepeater x:Name="PipsPagerItemsRepeater"
                                 ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PipsPagerItems}">
                                 <muxc:ItemsRepeater.Layout>
@@ -110,7 +117,9 @@
 
                         <Button x:Name="NextPageButton"
                                 ToolTipService.ToolTip="{Binding ElementName=NextPageButton, Path=(AutomationProperties.Name)}"
-                                Style="{TemplateBinding NextButtonStyle}"/>
+                                Style="{TemplateBinding NextButtonStyle}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"/>
                     </StackPanel>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/dev/PipsPager/PipsPagerAutomationPeer.cpp b/dev/PipsPager/PipsPagerAutomationPeer.cpp
index a0bf413715..2545ccadaf 100755
--- a/dev/PipsPager/PipsPagerAutomationPeer.cpp
+++ b/dev/PipsPager/PipsPagerAutomationPeer.cpp
@@ -63,11 +63,17 @@ com_ptr<PipsPager> PipsPagerAutomationPeer::GetImpl()
     return impl;
 }
 
-winrt::com_array<winrt::IInspectable> PipsPagerAutomationPeer::GetSelection()
+winrt::com_array<winrt::Windows::UI::Xaml::Automation::Provider::IRawElementProviderSimple> PipsPagerAutomationPeer::GetSelection()
 {
     if (const auto pager = GetImpl())
     {
-        return { winrt::box_value(pager->SelectedPageIndex()) };
+        if (auto pip = pager->GetSelectedItem())
+        {
+            if (auto peer = winrt::FrameworkElementAutomationPeer::CreatePeerForElement(pip))
+            {
+                return { ProviderFromPeer(peer) };
+            }
+        }
     }
     return {};
 }
diff --git a/dev/PipsPager/PipsPagerAutomationPeer.h b/dev/PipsPager/PipsPagerAutomationPeer.h
index f380ba0ab6..04f204055a 100755
--- a/dev/PipsPager/PipsPagerAutomationPeer.h
+++ b/dev/PipsPager/PipsPagerAutomationPeer.h
@@ -22,7 +22,7 @@ class PipsPagerAutomationPeer :
     // ISelectionProvider
     bool CanSelectMultiple() { return false; };
     bool IsSelectionRequired() { return true; };
-    winrt::com_array<winrt::IInspectable> GetSelection();
+    winrt::com_array<winrt::Windows::UI::Xaml::Automation::Provider::IRawElementProviderSimple> GetSelection();
 
     void RaiseSelectionChanged(double oldIndex, double newIndex);
 
diff --git a/dev/PipsPager/PipsPagerSelectedIndexChangedEventArgs.h b/dev/PipsPager/PipsPagerSelectedIndexChangedEventArgs.h
index 89a9126b0c..b2716092e2 100755
--- a/dev/PipsPager/PipsPagerSelectedIndexChangedEventArgs.h
+++ b/dev/PipsPager/PipsPagerSelectedIndexChangedEventArgs.h
@@ -7,15 +7,4 @@
 
 class PipsPagerSelectedIndexChangedEventArgs :
     public winrt::implementation::PipsPagerSelectedIndexChangedEventArgsT<PipsPagerSelectedIndexChangedEventArgs>
-{
-public:
-    PipsPagerSelectedIndexChangedEventArgs(const int previousIndex, const int newIndex) :
-        m_previousPageIndex(previousIndex), m_newPageIndex(newIndex) {};
-
-    int NewPageIndex() { return m_newPageIndex; };
-    int PreviousPageIndex() { return m_previousPageIndex; };
-
-private:
-    int m_newPageIndex = -1;
-    int m_previousPageIndex = -1;
-};
+{};
diff --git a/dev/PipsPager/PipsPager_themeresources.xaml b/dev/PipsPager/PipsPager_themeresources.xaml
old mode 100644
new mode 100755
index 9fc25ddcd7..a21aee4e0d
--- a/dev/PipsPager/PipsPager_themeresources.xaml
+++ b/dev/PipsPager/PipsPager_themeresources.xaml
@@ -98,8 +98,18 @@
     </ResourceDictionary.ThemeDictionaries>
 
     <!-- PipsPager Resources -->
+
+    <!-- Deprecated Resources: might be removed later -->
     <x:Double x:Key="PipsPagerButtonWidth">20</x:Double>
     <x:Double x:Key="PipsPagerButtonHeight">12</x:Double>
+    <!-- Deprecated Resources: might be removed later -->
+
+    <x:Double x:Key="PipsPagerHorizontalOrientationButtonWidth">12</x:Double>
+    <x:Double x:Key="PipsPagerHorizontalOrientationButtonHeight">20</x:Double>
+
+    <x:Double x:Key="PipsPagerVerticalOrientationButtonWidth">20</x:Double>
+    <x:Double x:Key="PipsPagerVerticalOrientationButtonHeight">12</x:Double>
+
 
     <Thickness x:Key="PipsPagerButtonBorderThickness">1</Thickness>
     <Thickness x:Key="PipsPagerNavigationButtonBorderThickness">1</Thickness>
@@ -221,8 +231,6 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
         <Setter Property="FocusVisualMargin" Value="0" />
-        <Setter Property="Width" Value="{StaticResource PipsPagerButtonWidth}" />
-        <Setter Property="Height" Value="{StaticResource PipsPagerButtonHeight}" />
         <Setter Property="Content" Value="{StaticResource PipsPagerNormalGlyph}" />
         <Setter Property="FontSize" Value="{StaticResource PipsPagerNormalGlyphFontSize}" />
         <Setter Property="contract7Present:CornerRadius" Value="{StaticResource ControlCornerRadius}"/>
@@ -234,6 +242,8 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        Width="{StaticResource PipsPagerHorizontalOrientationButtonWidth}"
+                        Height="{StaticResource PipsPagerHorizontalOrientationButtonHeight}"
                         contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                         contract7NotPresent:CornerRadius="{StaticResource ControlCornerRadius}">
                         <VisualStateManager.VisualStateGroups>
@@ -285,6 +295,15 @@
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
+                            <VisualStateGroup x:Name="OrientationStates">
+                                <VisualState x:Name="HorizontalOrientation"/>
+                                <VisualState x:Name="VerticalOrientation">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootGrid.Width" Value="{ThemeResource PipsPagerVerticalOrientationButtonWidth}"/>
+                                        <Setter Target="RootGrid.Height" Value="{ThemeResource PipsPagerVerticalOrientationButtonHeight}"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup> 
                         </VisualStateManager.VisualStateGroups>
                         <FontIcon
                             x:Name="Content"
diff --git a/dev/PipsPager/TestUI/PipsPagerPage.xaml b/dev/PipsPager/TestUI/PipsPagerPage.xaml
index 6c800d0b9f..c50c291ec8 100755
--- a/dev/PipsPager/TestUI/PipsPagerPage.xaml
+++ b/dev/PipsPager/TestUI/PipsPagerPage.xaml
@@ -9,10 +9,10 @@
     xmlns:local="using:MUXControlsTestApp"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d">
-    
+
     <Grid Background="Transparent">
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="300"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
@@ -25,7 +25,7 @@
                             AutomationProperties.Name="TestPipsPager"
                             SelectedIndexChanged="OnSelectedIndexChanged"
                             HorizontalAlignment="Left"
-                            VerticalAlignment="Center"                        
+                            VerticalAlignment="Center"
                             Margin="0,0,100,0"/>
 
         <StackPanel Orientation="Vertical" Grid.Column="1" >
@@ -82,10 +82,47 @@
             <TextBlock x:Name="FocusedPageIndexTextBlock" Text="Current focused page index: "/>
             <TextBlock x:Name="CurrentOrientationTextBlock"/>
         </StackPanel>
+
+        <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Vertical">
+            <StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Horizontal Orientation PipsPager ButtonWidth:"/>
+                    <TextBlock x:Name="HorizontalOrientationPipsPagerButtonWidthTextBlock" AutomationProperties.Name="HorizontalOrientationPipsPagerButtonWidthTextBlock" Text="0" Margin="10,0,0,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Horizontal Orientation PipsPager ButtonHeight:"/>
+                    <TextBlock x:Name="HorizontalOrientationPipsPagerButtonHeightTextBlock" AutomationProperties.Name="HorizontalOrientationPipsPagerButtonHeightTextBlock" Text="0" Margin="10,0,0,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Vertical Orientation PipsPager ButtonWidth:"/>
+                    <TextBlock x:Name="VerticalOrientationPipsPagerButtonWidthTextBlock" AutomationProperties.Name="VerticalOrientationPipsPagerButtonWidthTextBlock" Text="0" Margin="10,0,0,0"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="Vertical Orientation PipsPager ButtonHeight:"/>
+                    <TextBlock x:Name="VerticalOrientationPipsPagerButtonHeightTextBlock" AutomationProperties.Name="VerticalOrientationPipsPagerButtonHeightTextBlock" Text="0" Margin="10,0,0,0"/>
+                </StackPanel>
+            </StackPanel>
+            <Button x:Name="GetPipsPagersButtonSizesButton"
+                    AutomationProperties.Name="GetPipsPagersButtonSizesButton"
+                    Content="Get Sizes"
+                    Click="OnGetPipsPagerButtonSizesClicked"
+                    Height="50"
+                    Width="150"
+                    HorizontalAlignment="Left"
+                    Margin="0,20,0,0"/>
+        </StackPanel> 
+        
+        <muxc:PipsPager x:Name="TestPipsPagerVerticalOrientation"
+                            AutomationProperties.Name="TestPipsPagerVerticalOrientation"
+                            Orientation="Vertical"
+                            HorizontalAlignment="Left"
+                            Margin="0,0,100,0"
+                            Grid.Row="1"/>
+        
         <Button x:Name="GoToExamplesPageButton"
                 Content="Open PipsPager Examples"
                 Grid.Row="1" Grid.Column="1"
-                Margin="0, 150, 0, 0"
+                Margin="0, 200, 0, 0"
                 Click="GoToExamplesPage"/>
     </Grid>
 </local:TestPage>
diff --git a/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs b/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
index fb07278ecc..b334f19d03 100755
--- a/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
+++ b/dev/PipsPager/TestUI/PipsPagerPage.xaml.cs
@@ -20,6 +20,7 @@ public sealed partial class PipsPagerPage : TestPage
         Button previousPageButton;
         Button nextPageButton;
         ItemsRepeater repeater;
+        ItemsRepeater verticalOrientationPipsPagerRepeater;
 
         public List<string> Pictures = new List<string>()
         {
@@ -38,13 +39,16 @@ public PipsPagerPage()
             this.InitializeComponent();
             this.Loaded += OnLoad;
         }
-
+        
         private void OnLoad(object sender, RoutedEventArgs args)
         {
             var rootPanel = VisualTreeHelper.GetChild(TestPipsPager, 0);
             previousPageButton = VisualTreeHelper.GetChild(rootPanel, 0) as Button;
             nextPageButton = VisualTreeHelper.GetChild(rootPanel, 2) as Button;
             repeater = rootPanel.FindVisualChildByType<ItemsRepeater>();
+            var rootPanelVerticalPipsPager = VisualTreeHelper.GetChild(TestPipsPagerVerticalOrientation, 0);
+            verticalOrientationPipsPagerRepeater = rootPanelVerticalPipsPager.FindVisualChildByType<ItemsRepeater>();
+
 
             PreviousPageButtonVisibilityComboBox.SelectionChanged += OnPreviousPageButtonVisibilityChanged;
             NextPageButtonVisibilityComboBox.SelectionChanged += OnNextPageButtonVisibilityChanged;
@@ -72,6 +76,21 @@ private void OnLoad(object sender, RoutedEventArgs args)
             CurrentOrientationTextBlock.Text = GetCurrentOrientation();
         }
 
+        private void OnGetPipsPagerButtonSizesClicked(object sender, RoutedEventArgs args)
+        {
+            //Button horizontalOrientationButton;
+            if (repeater.TryGetElement(0) as FrameworkElement is var horizontalOrientationPip && horizontalOrientationPip != null)
+            {
+                HorizontalOrientationPipsPagerButtonWidthTextBlock.Text = $"{ horizontalOrientationPip.ActualWidth}";
+                HorizontalOrientationPipsPagerButtonHeightTextBlock.Text = $"{horizontalOrientationPip.ActualHeight}";
+            }
+            if (verticalOrientationPipsPagerRepeater.TryGetElement(1) as FrameworkElement is var verticalOrientationPip && verticalOrientationPip != null)
+            {
+                VerticalOrientationPipsPagerButtonWidthTextBlock.Text = $"{verticalOrientationPip.ActualWidth}";
+                VerticalOrientationPipsPagerButtonHeightTextBlock.Text = $"{verticalOrientationPip.ActualHeight}";
+            }
+        }
+
         private void OnRepeaterGotFocus(object sender, RoutedEventArgs e)
         {
             FocusedPageIndexTextBlock.Text = $"Current focused page index: {repeater.GetElementIndex((UIElement)e.OriginalSource).ToString()}";