diff --git a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml
index 15071a58..ee4f79d1 100644
--- a/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml
+++ b/Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml
@@ -116,6 +116,104 @@
       <!--   <Space>: Reflection Space-->
       <!--   <Height>: Reflection Height-->
     </Text3>
+    <ButtonPlayerChooseScrollUp>
+      <!--<Skin>: Texture name-->
+      <Skin>ScrollUp</Skin>
+      <!--<SkinSelected>: Texture name for selected button-->
+      <SkinSelected>ScrollUp</SkinSelected>
+      <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
+      <X>609</X>
+      <Y>90</Y>
+      <Z>-0,01</Z>
+      <W>28</W>
+      <H>15</H>
+      <!--<Color>: Button color from ColorScheme (high priority)-->
+      <!--or <R>, <G>, <B>, <A> (lower priority)-->
+      <Color>ButtonColor</Color>
+      <!--<SColor>: Selected button color from ColorScheme (high priority)-->
+      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+      <SColor>ButtonSColor</SColor>
+      <Text>
+        <!--<X>, <Y>: Text position-->
+        <X>75</X>
+        <Y>10</Y>
+        <!--<H>: Text height-->
+        <H>32</H>
+        <!--<MaxW>: Maximum text width (if exists)-->
+        <MaxW>142</MaxW>
+        <!--<Color>: Text color from ColorScheme (high priority)-->
+        <!--or <R>, <G>, <B>, <A> (lower priority)-->
+        <Color>ButtonTextColor</Color>
+        <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
+        <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+        <SColor>ButtonTextSColor</SColor>
+        <!--<Align>: Text align horizontal: Left, Center, Right-->
+        <Align>Center</Align>
+        <!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
+        <HAlign>Center</HAlign>
+        <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
+        <Style>Bold</Style>
+        <!--<Font>: Text font name-->
+        <Font>Outline</Font>
+        <!--<Text>: Nothing or translation tag-->
+        <Text />
+      </Text>
+      <!--<Reflection> If exists:-->
+      <!--   <Space>: Reflection Space-->
+      <!--   <Height>: Reflection Height-->
+      <!--<SReflection> If exists:-->
+      <!--   <Space>: Reflection Space of selected button-->
+      <!--   <Height>: Reflection Height of selected button-->
+    </ButtonPlayerChooseScrollUp>
+	<ButtonPlayerChooseScrollDown>
+      <!--<Skin>: Texture name-->
+      <Skin>ScrollDown</Skin>
+      <!--<SkinSelected>: Texture name for selected button-->
+      <SkinSelected>ScrollDown</SkinSelected>
+      <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
+      <X>609</X>
+      <Y>345</Y>
+      <Z>-0,01</Z>
+      <W>28</W>
+      <H>15</H>
+      <!--<Color>: Button color from ColorScheme (high priority)-->
+      <!--or <R>, <G>, <B>, <A> (lower priority)-->
+      <Color>ButtonColor</Color>
+      <!--<SColor>: Selected button color from ColorScheme (high priority)-->
+      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+      <SColor>ButtonSColor</SColor>
+      <Text>
+        <!--<X>, <Y>: Text position-->
+        <X>75</X>
+        <Y>10</Y>
+        <!--<H>: Text height-->
+        <H>32</H>
+        <!--<MaxW>: Maximum text width (if exists)-->
+        <MaxW>142</MaxW>
+        <!--<Color>: Text color from ColorScheme (high priority)-->
+        <!--or <R>, <G>, <B>, <A> (lower priority)-->
+        <Color>ButtonTextColor</Color>
+        <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
+        <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+        <SColor>ButtonTextSColor</SColor>
+        <!--<Align>: Text align horizontal: Left, Center, Right-->
+        <Align>Center</Align>
+        <!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
+        <HAlign>Center</HAlign>
+        <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
+        <Style>Bold</Style>
+        <!--<Font>: Text font name-->
+        <Font>Outline</Font>
+        <!--<Text>: Nothing or translation tag-->
+        <Text />
+      </Text>
+      <!--<Reflection> If exists:-->
+      <!--   <Space>: Reflection Space-->
+      <!--   <Height>: Reflection Height-->
+      <!--<SReflection> If exists:-->
+      <!--   <Space>: Reflection Space of selected button-->
+      <!--   <Height>: Reflection Height of selected button-->
+    </ButtonPlayerChooseScrollDown>    
 	<ButtonNext>
       <!--<Skin>: Texture name-->
       <Skin>Button</Skin>
diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
index 14285d11..c850b723 100644
--- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
+++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
@@ -277,10 +277,10 @@ namespace Vocaluxe.PartyModes
                 if (Buttons[htButtons(ButtonNext)].Selected)
                     Next();
 
-                if (Buttons[htButtons(ButtonPlayerChooseScrollUp)].Selected))
+                if (Buttons[htButtons(ButtonPlayerChooseScrollUp)].Selected)
                     Scroll(-1);
 
-                if (Buttons[htButtons(ButtonPlayerChooseScrollDown)].Selected))
+                if (Buttons[htButtons(ButtonPlayerChooseScrollDown)].Selected)
                     Scroll(1);
             }
 
@@ -339,7 +339,7 @@ namespace Vocaluxe.PartyModes
                 PlayerChooseButtonsOffset += Offset;
                 UpdateButtonPlayerChoose();
             }
-            else if (PlayerChooseButtonsVisibleProfiles.Count > PlayerChooseButtons.Count + (PlayerChooseButtonsOffset + Offset) * PlayerChooseButtonsNumH) 
+            else if (PlayerChooseButtonsVisibleProfiles.Count < PlayerChooseButtons.Count + (PlayerChooseButtonsOffset + Offset) * PlayerChooseButtonsNumH) 
             {
                 PlayerChooseButtonsOffset += Offset;
                 UpdateButtonPlayerChoose();
@@ -409,6 +409,8 @@ namespace Vocaluxe.PartyModes
             {
                 UpdateButtonPlayerChoose(PlayerChooseButtonsOffset);
             }
+            Buttons[htButtons(ButtonPlayerChooseScrollUp)].Enabled = PlayerChooseButtonsOffset > 0;
+            Buttons[htButtons(ButtonPlayerChooseScrollDown)].Enabled = PlayerChooseButtonsVisibleProfiles.Count > PlayerChooseButtons.Count + PlayerChooseButtonsOffset * PlayerChooseButtonsNumH;
         }
 
         private void UpdateButtonPlayerChoose(int Offset)