diff --git a/Novetus/NovetusLauncher/Resources/BuildSolo2.png b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/BuildSolo2.png
similarity index 100%
rename from Novetus/NovetusLauncher/Resources/BuildSolo2.png
rename to Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/BuildSolo2.png
diff --git a/Novetus/NovetusLauncher/Resources/JoinServer.png b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/JoinServer.png
similarity index 100%
rename from Novetus/NovetusLauncher/Resources/JoinServer.png
rename to Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/JoinServer.png
diff --git a/Novetus/NovetusLauncher/Resources/PlaySolo.png b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/PlaySolo.png
similarity index 100%
rename from Novetus/NovetusLauncher/Resources/PlaySolo.png
rename to Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/PlaySolo.png
diff --git a/Novetus/NovetusLauncher/Resources/StartServer.png b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/StartServer.png
similarity index 100%
rename from Novetus/NovetusLauncher/Resources/StartServer.png
rename to Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/Graphics/StartServer.png
diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
index ae11926..09a8cbc 100644
--- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
+++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml
@@ -76,12 +76,12 @@
 
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#FFF7DF80" />
+                                <Setter Property="Background" Value="#FFEEEEEE" />
                                 <Setter Property="Foreground" Value="Black" />
                             </Trigger>
 
                             <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="#FF93770C" />
+                                <Setter Property="Background" Value="#FF575757" />
                                 <Setter Property="Foreground" Value="Black" />
                             </Trigger>
                         </ControlTemplate.Triggers>
@@ -156,6 +156,138 @@
             </Setter>
         </Style>
 
+        <Style x:Key="JoinButton" TargetType="{x:Type Button}">
+            <Setter Property="Background" Value="Black" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="SnapsToDevicePixels" Value="True" />
+
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <StackPanel>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent" Cursor="Hand" >
+                                <Image HorizontalAlignment="Center" Source="Graphics/JoinServer.png"/>
+                            </StackPanel>
+                        </StackPanel>
+
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="Black" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="Black" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="HostButton" TargetType="{x:Type Button}">
+            <Setter Property="Background" Value="Black" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="SnapsToDevicePixels" Value="True" />
+
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <StackPanel>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent" Cursor="Hand" >
+                                <Image HorizontalAlignment="Center" Source="Graphics/StartServer.png"/>
+                            </StackPanel>
+                        </StackPanel>
+
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="Black" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="Black" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="SoloButton" TargetType="{x:Type Button}">
+            <Setter Property="Background" Value="Black" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="SnapsToDevicePixels" Value="True" />
+
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <StackPanel>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent" Cursor="Hand" >
+                                <Image HorizontalAlignment="Center" Source="Graphics/PlaySolo.png"/>
+                            </StackPanel>
+                        </StackPanel>
+
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="Black" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="Black" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="StudioButton" TargetType="{x:Type Button}">
+            <Setter Property="Background" Value="Black" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="FontSize" Value="18" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="SnapsToDevicePixels" Value="True" />
+
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <StackPanel>
+                            <StackPanel HorizontalAlignment="Stretch" Background="Transparent" Cursor="Hand" >
+                                <Image HorizontalAlignment="Center" Source="Graphics/BuildSolo2.png"/>
+                            </StackPanel>
+                        </StackPanel>
+
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="Black" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="Black" />
+                                <Setter Property="Foreground" Value="Black" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
         <Style TargetType="{x:Type TextBox}">
             <Setter Property="FontSize" Value="12" />
             <Setter Property="FontFamily" Value="Helvetica" />
@@ -214,7 +346,7 @@
                 <Label x:Name="ipAddressLabel" Content="Server IP Address:" HorizontalAlignment="Left" Margin="29,165,0,0" VerticalAlignment="Top" FontSize="12" Height="29" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Grid.ColumnSpan="2"/>
                 <TextBox x:Name="joinPortBox" HorizontalAlignment="Left" Height="20" Margin="26,221,0,0" TextWrapping="Wrap" Text="53640" VerticalAlignment="Top" Width="120" Grid.ColumnSpan="2"/>
                 <Label x:Name="joinPortLabel" Content="Server Port" HorizontalAlignment="Left" Margin="44,199,0,0" VerticalAlignment="Top" FontSize="12" Height="27" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="86" Grid.ColumnSpan="2"/>
-                <Button x:Name="joinButton" Style="{DynamicResource ImportantButton}" Content="Join Server with IP" HorizontalAlignment="Left" Margin="230,205,0,0" VerticalAlignment="Top" Width="186" Height="49" Grid.Column="1"/>
+                <Button x:Name="joinButton" Style="{DynamicResource JoinButton}" Content="Join Server with IP" HorizontalAlignment="Left" Margin="240,212,0,0" VerticalAlignment="Top" Width="122" Height="42" Grid.Column="1"/>
                 <Button x:Name="serverBrowserButton" Style="{DynamicResource ImportantButtonSmall}" Content="Browse Servers" HorizontalAlignment="Left" Margin="421,205,0,0" VerticalAlignment="Top" Width="153" Height="22" Grid.Column="1"/>
                 <Rectangle x:Name="hostServerGroupBox" Fill="#FFDEDCDC" HorizontalAlignment="Left" Height="245" Margin="72,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1"/>
                 <Rectangle x:Name="hostServerLabelBox" Fill="#FFAAA8A8" HorizontalAlignment="Left" Height="30" Margin="72,10,0,0" Stroke="Black" VerticalAlignment="Top" Width="153" Grid.Column="1"/>
diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
index 58c1bad..210a7ff 100644
--- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj
+++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
@@ -347,6 +347,10 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="NovetusIcon.ico" />
+    <Resource Include="Forms\LauncherForm\Stylish\Graphics\BuildSolo2.png" />
+    <Resource Include="Forms\LauncherForm\Stylish\Graphics\JoinServer.png" />
+    <Resource Include="Forms\LauncherForm\Stylish\Graphics\PlaySolo.png" />
+    <Resource Include="Forms\LauncherForm\Stylish\Graphics\StartServer.png" />
     <None Include="Resources\search.png" />
     <None Include="Resources\NOVETUS_small.png" />
     <None Include="Resources\N.png" />