diff --git a/CampusAppWP8/IconCreator/IconCreator.pyproj b/CampusAppWP8/IconCreator/IconCreator.pyproj
index 5e357181..c25a7b01 100644
--- a/CampusAppWP8/IconCreator/IconCreator.pyproj
+++ b/CampusAppWP8/IconCreator/IconCreator.pyproj
@@ -29,7 +29,18 @@
     <Folder Include="dstImages\" />
     <Folder Include="dstImages\wp8\" />
     <Folder Include="dstImages\wp8\159x159\" />
-    <Folder Include="dstImages\wp8\159x159\functions\" />
+    <Folder Include="dstImages\wp8\159x159\DarkTheme\" />
+    <Folder Include="dstImages\wp8\159x159\DarkTheme\functions\" />
+    <Folder Include="dstImages\wp8\159x159\DarkTheme\emotions\" />
+    <Folder Include="dstImages\wp8\159x159\DarkTheme\listicons\" />
+    <Folder Include="dstImages\wp8\159x159\DarkTheme\others" />
+    <Folder Include="dstImages\wp8\159x159\DarkTheme\optionbuttons\" />
+    <Folder Include="dstImages\wp8\159x159\LightTheme\" />
+    <Folder Include="dstImages\wp8\159x159\LightTheme\functions\" />
+    <Folder Include="dstImages\wp8\159x159\LightTheme\emotions\" />
+    <Folder Include="dstImages\wp8\159x159\LightTheme\listicons\" />
+    <Folder Include="dstImages\wp8\159x159\LightTheme\others" />
+    <Folder Include="dstImages\wp8\159x159\LightTheme\optionbuttons\" />
     <Folder Include="scripts\" />
     <Folder Include="srcImages\" />
     <Folder Include="srcImages\emotions\" />
@@ -39,7 +50,98 @@
     <Folder Include="srcImages\others\" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="test.svg" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\emotions\attention.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\emotions\happy.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\emotions\question.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\emotions\sad.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\add.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\btu_account.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\call.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\campusplan.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\delete.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\down.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\edit.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\hausaufgaben.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\info.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\infopoint.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\lehrstuehle.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\links.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\mail.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\notenspiegel.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\openinghours.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\personen.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\reload.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\save.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\search.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\stundenplan.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\stundenplan_add.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\survey.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\termine.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\termine_add.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\up.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\vereine.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\functions\vorlesungsverzeichnis.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\listicons\exams.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\listicons\info.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\listicons\lab.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\listicons\lecture.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\listicons\practise.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\listicons\seminar.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\optionbuttons\add.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\optionbuttons\add_contact.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\optionbuttons\add_small.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\optionbuttons\delete.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\optionbuttons\edit.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\optionbuttons\prefs.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\optionbuttons\save.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\optionbuttons\search.png" />
+    <Content Include="dstImages\wp8\159x159\DarkTheme\others\beach_chair.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\emotions\attention.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\emotions\happy.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\emotions\question.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\emotions\sad.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\add.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\btu_account.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\call.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\campusplan.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\delete.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\down.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\edit.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\hausaufgaben.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\info.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\infopoint.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\lehrstuehle.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\links.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\mail.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\notenspiegel.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\openinghours.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\personen.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\reload.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\save.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\search.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\stundenplan.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\stundenplan_add.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\survey.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\termine.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\termine_add.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\up.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\vereine.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\functions\vorlesungsverzeichnis.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\listicons\exams.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\listicons\info.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\listicons\lab.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\listicons\lecture.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\listicons\practise.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\listicons\seminar.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\optionbuttons\add.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\optionbuttons\add_contact.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\optionbuttons\add_small.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\optionbuttons\delete.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\optionbuttons\edit.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\optionbuttons\prefs.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\optionbuttons\save.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\optionbuttons\search.png" />
+    <Content Include="dstImages\wp8\159x159\LightTheme\others\beach_chair.png" />
     <Content Include="srcImages\emotions\attention.svg" />
     <Content Include="srcImages\emotions\happy.svg" />
     <Content Include="srcImages\emotions\question.svg" />
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/attention.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/attention.png
new file mode 100644
index 00000000..8a744ee0
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/attention.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/happy.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/happy.png
new file mode 100644
index 00000000..1a434f91
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/happy.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/question.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/question.png
new file mode 100644
index 00000000..ebd3d365
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/question.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/sad.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/sad.png
new file mode 100644
index 00000000..8ac05aac
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/emotions/sad.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/exams.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/exams.png
new file mode 100644
index 00000000..6ada1ad4
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/exams.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/info.png
new file mode 100644
index 00000000..c132ee8b
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/info.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lab.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lab.png
new file mode 100644
index 00000000..22f3387f
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lab.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lecture.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lecture.png
new file mode 100644
index 00000000..254afb5a
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/lecture.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/practise.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/practise.png
new file mode 100644
index 00000000..565b8dcf
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/practise.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/seminar.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/seminar.png
new file mode 100644
index 00000000..e0b38745
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/listicons/seminar.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add.png
new file mode 100644
index 00000000..cbe25009
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_contact.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_contact.png
new file mode 100644
index 00000000..0348b4c1
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_contact.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_small.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_small.png
new file mode 100644
index 00000000..2799c6dc
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/add_small.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/delete.png
new file mode 100644
index 00000000..7cd2c9fb
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/delete.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/edit.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/edit.png
new file mode 100644
index 00000000..9a6d716d
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/edit.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/prefs.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/prefs.png
new file mode 100644
index 00000000..c5238476
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/prefs.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/save.png
new file mode 100644
index 00000000..fc1b446b
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/save.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/search.png
new file mode 100644
index 00000000..189d1de2
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/optionbuttons/search.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair.png
new file mode 100644
index 00000000..8e121f16
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention.png
new file mode 100644
index 00000000..22a84d8e
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy.png
new file mode 100644
index 00000000..f280445a
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question.png
new file mode 100644
index 00000000..d1933b4c
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad.png
new file mode 100644
index 00000000..963e8856
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams.png
new file mode 100644
index 00000000..cc4f541d
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info.png
new file mode 100644
index 00000000..eb67e90f
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab.png
new file mode 100644
index 00000000..39943f90
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture.png
new file mode 100644
index 00000000..1a6b2a66
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise.png
new file mode 100644
index 00000000..e9e54821
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar.png
new file mode 100644
index 00000000..8981575b
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add.png
new file mode 100644
index 00000000..f1d27556
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact.png
new file mode 100644
index 00000000..70e67924
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small.png
new file mode 100644
index 00000000..b9f27629
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete.png
new file mode 100644
index 00000000..786581b0
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit.png
new file mode 100644
index 00000000..dca05652
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs.png
new file mode 100644
index 00000000..f3585b0f
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save.png
new file mode 100644
index 00000000..9e1d4189
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search.png
new file mode 100644
index 00000000..10b07a49
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search.png differ
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair.png
new file mode 100644
index 00000000..1c42b652
Binary files /dev/null and b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair.png differ
diff --git a/CampusAppWP8/IconCreator/scripts/IconCreator.py b/CampusAppWP8/IconCreator/scripts/IconCreator.py
index 55c887ed..474cdffa 100644
--- a/CampusAppWP8/IconCreator/scripts/IconCreator.py
+++ b/CampusAppWP8/IconCreator/scripts/IconCreator.py
@@ -10,11 +10,32 @@ def convertSVGToPNG(src, dst, dstWidth, dstHeight, srcWidth, srcHeight, style,la
 
     for layer in root.findall('./{http://www.w3.org/2000/svg}g'):
         name = layer.get('{http://www.inkscape.org/namespaces/inkscape}label')
-        if name != layerID :
-            root.remove(layer)
-        else :
+        if name in layerID :
             for path in layer.findall('./{http://www.w3.org/2000/svg}path'):
-                path.set("style",style)
+                path.set("style",style)         
+        else :
+            root.remove(layer)
+
+    img =  cairo.ImageSurface(cairo.FORMAT_ARGB32,  dstWidth, dstHeight)
+    ctx = cairo.Context(img)
+
+    width_ratio = float(dstWidth) / float(srcWidth)
+    height_ratio = float(dstHeight) / float(srcHeight)
+    ctx.scale(width_ratio, height_ratio)
+
+    handler= rsvg.Handle(None,str(ET.tostring(root, encoding='utf8', method='xml')))
+    handler.render_cairo(ctx)
+
+    img.write_to_png(dst)
+
+def convertSVGToPNG2(src, dst, dstWidth, dstHeight, srcWidth, srcHeight, style,layerID):   
+    ET.register_namespace("","http://www.w3.org/2000/svg")
+
+    tree = ET.parse(src)
+    root = tree.getroot()
+
+    for path in root.findall('./{http://www.w3.org/2000/svg}path'):
+        path.set("style",style)         
 
     img =  cairo.ImageSurface(cairo.FORMAT_ARGB32,  dstWidth, dstHeight)
     ctx = cairo.Context(img)
diff --git a/CampusAppWP8/IconCreator/scripts/IconCreator.pyc b/CampusAppWP8/IconCreator/scripts/IconCreator.pyc
index 4889a6ff..4517557c 100644
Binary files a/CampusAppWP8/IconCreator/scripts/IconCreator.pyc and b/CampusAppWP8/IconCreator/scripts/IconCreator.pyc differ
diff --git a/CampusAppWP8/IconCreator/scripts/createspng.py b/CampusAppWP8/IconCreator/scripts/createspng.py
index b54d1c07..756f8668 100644
--- a/CampusAppWP8/IconCreator/scripts/createspng.py
+++ b/CampusAppWP8/IconCreator/scripts/createspng.py
@@ -1,9 +1,44 @@
 import IconCreator
 import os
+
 os.chdir("srcImages/functions")
 for files in os.listdir("."):
     if files.endswith(".svg"):
         fileName, fileExtension = os.path.splitext(files)
         IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/functions/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
         IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/functions/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
+os.chdir("../../")
+
+os.chdir("srcImages/emotions")
+for files in os.listdir("."):
+    if files.endswith(".svg"):
+        fileName, fileExtension = os.path.splitext(files)
+        IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/emotions/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Emotion Speechbubble")
+        IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/emotions/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Emotion Speechbubble")
+os.chdir("../../")
+
+os.chdir("srcImages/listicons")
+for files in os.listdir("."):
+    if files.endswith(".svg"):
+        fileName, fileExtension = os.path.splitext(files)
+        IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/listicons/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
+        IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/listicons/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
+os.chdir("../../")
+
+os.chdir("srcImages/optionbuttons")
+for files in os.listdir("."):
+    if files.endswith(".svg"):
+        fileName, fileExtension = os.path.splitext(files)
+        IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/optionbuttons/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
+        IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/optionbuttons/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
+os.chdir("../../")
+
+os.chdir("srcImages/others")
+for files in os.listdir("."):
+    if files.endswith(".svg"):
+        fileName, fileExtension = os.path.splitext(files)
+        IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/others/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
+        IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/others/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
+os.chdir("../../")
+