diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index fdc628fd..4e29b502 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -291,30 +291,6 @@
     <Content Include="Assets\Icons\LightTheme\student_council_159.png" />
     <Content Include="Assets\Icons\DarkTheme\webmail_159.png" />
     <Content Include="Assets\Icons\LightTheme\webmail_159.png" />
-    <Content Include="Assets\icons\campus_159_dark.png" />
-    <Content Include="Assets\icons\campus_159_light.png" />
-    <Content Include="Assets\icons\departments_159_dark.png" />
-    <Content Include="Assets\icons\departments_159_light.png" />
-    <Content Include="Assets\icons\homework_159_dark.png" />
-    <Content Include="Assets\icons\homework_159_light.png" />
-    <Content Include="Assets\icons\link_159_dark.png" />
-    <Content Include="Assets\icons\link_159_light.png" />
-    <Content Include="Assets\icons\lectures_159_dark.png" />
-    <Content Include="Assets\icons\lectures_159_light.png" />
-    <Content Include="Assets\icons\mensa_159_dark.png" />
-    <Content Include="Assets\icons\mensa_159_light.png" />
-    <Content Include="Assets\icons\news_159_dark.png" />
-    <Content Include="Assets\icons\news_159_light.png" />
-    <Content Include="Assets\icons\openhours_159_dark.png" />
-    <Content Include="Assets\icons\openhours_159_light.png" />
-    <Content Include="Assets\icons\schedule_159_dark.png" />
-    <Content Include="Assets\icons\schedule_159_light.png" />
-    <Content Include="Assets\icons\search_159_dark.png" />
-    <Content Include="Assets\icons\search_159_light.png" />
-    <Content Include="Assets\icons\student_council_159_dark.png" />
-    <Content Include="Assets\icons\student_council_159_light.png" />
-    <Content Include="Assets\icons\webmail_159_dark.png" />
-    <Content Include="Assets\icons\webmail_159_light.png" />
     <Content Include="Assets\testmap.png" />
     <Content Include="Assets\Tiles\FlipCycleTileLarge.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
index 007f88af..2aa7d7f9 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Campusmap/CampusMapPage.xaml
@@ -39,17 +39,12 @@
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
-                <TextBox  Name="XPoint" Grid.Column="0" />
-                <TextBox Name="YPoint" Grid.Column="1" />
+                <TextBox  Name="XPoint" Grid.Column="0" Text="0" />
+                <TextBox Name="YPoint" Grid.Column="1" Text="0"/>
                 <Button Grid.Column="2" Click="Button_Click">
-                    <Image  Source="/Assets/icons/search_159_dark.png" Width="60"/>
+                    <Image Source="{Binding Path=ThemelizedIcon.Search, Source={StaticResource ThemelizedIcons}}" Width="60"/>
                 </Button>
             </Grid>
-            <!--<Controls:Map  Grid.Row="1" ZoomLevel="17" CartographicMode="Hybrid">
-                <Controls:Map.Center>
-                    <Location:GeoCoordinate Altitude="NaN" Course="NaN" HorizontalAccuracy="NaN" Longitude="14.3242" Latitude="51.7662" Speed="NaN" VerticalAccuracy="NaN"/>
-                </Controls:Map.Center>
-            </Controls:Map> -->
             <ScrollViewer Name="MapScroller" Grid.Row="1" HorizontalScrollBarVisibility="Auto" RenderTransformOrigin="0,0">
                 <Canvas  Name="MapCanvas" ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.VerticalScrollBarVisibility="Auto" Height="{Binding ImageHeight}"  Width="{Binding ImageWidth}">
                     <Canvas.Background>
@@ -57,9 +52,6 @@
 
                         </ImageBrush>
                     </Canvas.Background>
-
-
-                    <Image Name="bla" Source="/Assets/icons/search_159_light.png" Width="60" Canvas.Top="976" Canvas.Left="976"/>
                 </Canvas>
             </ScrollViewer>
         </Grid>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
index d42a5df4..f0454ac3 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml
@@ -159,8 +159,7 @@
                 </Border>
                 <Border BorderBrush="{StaticResource PhoneBorderBrush}" BorderThickness="0,2,0,0"  Grid.Row="5">
                     <Button Name="SearchButton" Click="SendRequest">
-                        <Image  Name="SearchButtonImg" Source="/Assets/icons/search_159_light.png" Width="100">
-                        </Image>
+                        <Image  Name="SearchButtonImg" Source="{Binding Path=ThemelizedIcon.Search, Source={StaticResource ThemelizedIcons}}" Width="100" />
                     </Button>
                 </Border>
             </Grid>
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
index 0a689cdc..779ba594 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Lecture/LecturePage.xaml.cs
@@ -50,10 +50,6 @@ namespace CampusAppWP8.Pages.Lecture
             this.InitializeComponent();
             this.LoadPageModel();
             this.SetupListPickers();
-            if ((Visibility)Application.Current.Resources["PhoneDarkThemeVisibility"] == Visibility.Visible)
-            {
-                this.SearchButtonImg.Source = new BitmapImage(new Uri("/Assets/icons/search_159_dark.png", UriKind.Relative));
-            }
         }
 
         #endregion
diff --git a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
index 856d2330..f4b319d3 100644
--- a/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
+++ b/CampusAppWP8/CampusAppWP8/Properties/WMAppManifest.xml
@@ -13,7 +13,7 @@
       <Capability Name="ID_CAP_ISV_CAMERA" />
     </Capabilities>
     <Tasks>
-      <DefaultTask Name="_default" NavigationPage="pages/Campusmap/CampusMapPage.xaml" />
+      <DefaultTask Name="_default" NavigationPage="pages/StartPage.xaml" />
     </Tasks>
     <Tokens>
       <PrimaryToken TokenID="CampusAppWP8Token" TaskName="_default">