diff --git a/CHANGELOG b/CHANGELOG
index 122e67431..569d60710 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+mkdocs-material-2.8.0 (2018-06-xx)
+
+  * Added Slovak translations
+  * Fixed #790: Prefixed internal identifiers with "__" to avoid name clashes
+
 mkdocs-material-2.7.3 (2018-04-26)
 
   * Added Finnish translations
diff --git a/material/assets/fonts/material-icons.css b/material/assets/fonts/material-icons.css
new file mode 100644
index 000000000..5cc133d2c
--- /dev/null
+++ b/material/assets/fonts/material-icons.css
@@ -0,0 +1,24 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, SOFTWARE
+ * DISTRIBUTED UNDER THE LICENSE IS DISTRIBUTED ON AN "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SEE THE LICENSE FOR THE SPECIFIC LANGUAGE GOVERNING PERMISSIONS AND
+ * LIMITATIONS UNDER THE LICENSE.
+ */
+
+@font-face {
+  font-family: "Material Icons";
+  font-style: normal;
+  font-weight: 400;
+  src: local("Material Icons"),
+       local("MaterialIcons-Regular"),
+       url("material-icons/MaterialIcons-Regular.woff2") format("woff2"),
+       url("material-icons/MaterialIcons-Regular.woff")  format("woff"),
+       url("material-icons/MaterialIcons-Regular.ttf")   format("truetype");
+}
diff --git a/material/assets/fonts/material-icons/MaterialIcons-Regular.ttf b/material/assets/fonts/material-icons/MaterialIcons-Regular.ttf
new file mode 100644
index 000000000..7015564ad
Binary files /dev/null and b/material/assets/fonts/material-icons/MaterialIcons-Regular.ttf differ
diff --git a/material/assets/fonts/material-icons/MaterialIcons-Regular.woff b/material/assets/fonts/material-icons/MaterialIcons-Regular.woff
new file mode 100644
index 000000000..b648a3eea
Binary files /dev/null and b/material/assets/fonts/material-icons/MaterialIcons-Regular.woff differ
diff --git a/material/assets/fonts/material-icons/MaterialIcons-Regular.woff2 b/material/assets/fonts/material-icons/MaterialIcons-Regular.woff2
new file mode 100644
index 000000000..9fa211252
Binary files /dev/null and b/material/assets/fonts/material-icons/MaterialIcons-Regular.woff2 differ
diff --git a/material/assets/javascripts/application.6cb86621.js b/material/assets/javascripts/application.4cb7db92.js
similarity index 100%
rename from material/assets/javascripts/application.6cb86621.js
rename to material/assets/javascripts/application.4cb7db92.js
diff --git a/material/base.html b/material/base.html
index 80183a493..5f229105f 100644
--- a/material/base.html
+++ b/material/base.html
@@ -170,7 +170,7 @@
       {% endblock %}
     </div>
     {% block scripts %}
-      <script src="{{ base_url }}/assets/javascripts/application.6cb86621.js"></script>
+      <script src="{{ base_url }}/assets/javascripts/application.4cb7db92.js"></script>
       {% if lang.t("search.language") != "en" %}
         {% set languages = lang.t("search.language").split(",") %}
         {% if languages | length and languages[0] != "" %}
diff --git a/src/assets/fonts/material-icons.css b/src/assets/fonts/material-icons.css
new file mode 100644
index 000000000..5cc133d2c
--- /dev/null
+++ b/src/assets/fonts/material-icons.css
@@ -0,0 +1,24 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, SOFTWARE
+ * DISTRIBUTED UNDER THE LICENSE IS DISTRIBUTED ON AN "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+ * SEE THE LICENSE FOR THE SPECIFIC LANGUAGE GOVERNING PERMISSIONS AND
+ * LIMITATIONS UNDER THE LICENSE.
+ */
+
+@font-face {
+  font-family: "Material Icons";
+  font-style: normal;
+  font-weight: 400;
+  src: local("Material Icons"),
+       local("MaterialIcons-Regular"),
+       url("material-icons/MaterialIcons-Regular.woff2") format("woff2"),
+       url("material-icons/MaterialIcons-Regular.woff")  format("woff"),
+       url("material-icons/MaterialIcons-Regular.ttf")   format("truetype");
+}
diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf b/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf
new file mode 100644
index 000000000..7015564ad
Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf differ
diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.woff b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff
new file mode 100644
index 000000000..b648a3eea
Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff differ
diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2
new file mode 100644
index 000000000..9fa211252
Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 differ