diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/campus_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/campus_159_dark.png
index e019ac39..08bd5f68 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/campus_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/campus_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/campus_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/campus_159_light.png
index cae8735c..e7fa38b8 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/campus_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/campus_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/departments_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/departments_159_dark.png
index 2aeac69f..917436d2 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/departments_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/departments_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/departments_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/departments_159_light.png
index 381e22bc..61c8ad78 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/departments_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/departments_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/homework_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/homework_159_dark.png
index d118e23d..313bb5da 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/homework_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/homework_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/homework_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/homework_159_light.png
index 5ecf6523..708f6cba 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/homework_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/homework_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/lectures_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/lectures_159_dark.png
index 05a56ba2..8a68bdb3 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/lectures_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/lectures_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/lectures_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/lectures_159_light.png
index 20763277..997dc2e1 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/lectures_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/lectures_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/link_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/link_159_dark.png
index 0491962d..cbb96cc9 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/link_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/link_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/link_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/link_159_light.png
index da0bca39..c61292b9 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/link_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/link_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/mensa_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/mensa_159_dark.png
index f1df7318..3a6abae2 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/mensa_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/mensa_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/mensa_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/mensa_159_light.png
index ceefcd59..e1f15575 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/mensa_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/mensa_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/news_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/news_159_dark.png
index 42a50354..1d68bde3 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/news_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/news_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/news_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/news_159_light.png
index 2a7c0fa8..ea0f843a 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/news_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/news_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/openhours_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/openhours_159_dark.png
index 68e82d0d..09933ea1 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/openhours_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/openhours_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/openhours_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/openhours_159_light.png
index 8bc66811..caddfb56 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/openhours_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/openhours_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/schedule_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/schedule_159_dark.png
index 266cd74b..17fa2a85 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/schedule_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/schedule_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/schedule_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/schedule_159_light.png
index 9807c694..090331f5 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/schedule_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/schedule_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/search_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/search_159_dark.png
new file mode 100644
index 00000000..3b859d6d
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/icons/search_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/search_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/search_159_light.png
new file mode 100644
index 00000000..2b8797ca
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/icons/search_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/student_council_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/student_council_159_dark.png
index c168e650..26ab3658 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/student_council_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/student_council_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/student_council_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/student_council_159_light.png
index 7c0cfb2d..47ed68d2 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/student_council_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/student_council_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/webmail_159_dark.png b/CampusAppWP8/CampusAppWP8/Assets/icons/webmail_159_dark.png
index 295a60ee..77f3af27 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/webmail_159_dark.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/webmail_159_dark.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/icons/webmail_159_light.png b/CampusAppWP8/CampusAppWP8/Assets/icons/webmail_159_light.png
index 0f27f6fc..e7404836 100644
Binary files a/CampusAppWP8/CampusAppWP8/Assets/icons/webmail_159_light.png and b/CampusAppWP8/CampusAppWP8/Assets/icons/webmail_159_light.png differ
diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 8a52dd95..36657110 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -111,6 +111,7 @@
+
CampusMapPage.xaml
@@ -270,6 +271,8 @@
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs b/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs
new file mode 100644
index 00000000..7ea84ed4
--- /dev/null
+++ b/CampusAppWP8/CampusAppWP8/Model/Utility/URLParamModel.cs
@@ -0,0 +1,96 @@
+//-----------------------------------------------------------------------
+//
+// Company copyright tag.
+//
+// stubbfel
+// 17.06.2013
+//----------------------------------------------------------------------
+namespace CampusAppWP8.Model.Utility
+{
+ ///
+ /// This class is a Model for the URLParameter like GET-Parameter
+ ///
+ public class URLParamModel
+ {
+ #region Members
+
+ ///
+ /// Variable of the key
+ ///
+ private readonly string key;
+
+ #endregion
+
+ #region Constructor
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// the key for the parameter
+ public URLParamModel(string key)
+ {
+ this.key = key;
+ }
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// the key for the parameter>
+ /// value of the parameter
+ public URLParamModel(string key, string value)
+ {
+ this.key = key;
+ this.Value = value;
+ }
+ #endregion
+ #region Proberty
+
+ ///
+ /// Gets or sets the value of the Parameter
+ ///
+ public string Value { get; set; }
+
+ ///
+ /// Gets the key of the parameter
+ ///
+ public string Key
+ {
+ get
+ {
+ return this.key;
+ }
+ }
+ #endregion
+
+ #region Methods
+
+ ///
+ /// Method check if the parameter is valid
+ ///
+ /// true if is it valid, otherwise false
+ public virtual bool IsParamValid()
+ {
+ if (this.key == null || string.Empty.Equals(this.key) || string.Empty.Equals(this.Value))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ ///
+ /// Method return a formatted string like Key=Value
+ ///
+ /// return formatted string
+ public override string ToString()
+ {
+ if (!this.IsParamValid())
+ {
+ return string.Empty;
+ }
+
+ return "&" + this.key + "=" + this.Value;
+ }
+ #endregion
+ }
+}