diff --git a/platypush/backend/http/templates/css-common.html b/platypush/backend/http/templates/css-common.html
new file mode 100644
index 000000000..cd8827220
--- /dev/null
+++ b/platypush/backend/http/templates/css-common.html
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/platypush/backend/http/templates/dashboard.html b/platypush/backend/http/templates/dashboard.html
index 0bb43bc39..605935469 100644
--- a/platypush/backend/http/templates/dashboard.html
+++ b/platypush/backend/http/templates/dashboard.html
@@ -3,20 +3,11 @@
Platypush Dashboard
-
-
-
-
+ {% include 'css-common.html' %}
-
-
-
-
-
-
-
+ {% include 'js-common.html' %}
diff --git a/platypush/backend/http/templates/index.html b/platypush/backend/http/templates/index.html
index a0e7d317e..d7a7fce51 100644
--- a/platypush/backend/http/templates/index.html
+++ b/platypush/backend/http/templates/index.html
@@ -4,10 +4,7 @@
-
-
-
+ {% include 'css-common.html' %}
- {% if utils.isfile(static_folder, 'js', 'lib', 'vue.js') %}
-
- {% else %}
-
- {% endif %}
-
-
-
-
-
-
+ {% include 'js-common.html' %}
{% for style in styles.values() %}
diff --git a/platypush/backend/http/templates/js-common.html b/platypush/backend/http/templates/js-common.html
new file mode 100644
index 000000000..1182782f9
--- /dev/null
+++ b/platypush/backend/http/templates/js-common.html
@@ -0,0 +1,11 @@
+{% if utils.isfile(static_folder, 'js', 'lib', 'vue.js') %}
+
+{% else %}
+
+{% endif %}
+
+
+
+
+
+
diff --git a/platypush/backend/http/templates/login.html b/platypush/backend/http/templates/login.html
index 173a5b8cf..42e177a98 100644
--- a/platypush/backend/http/templates/login.html
+++ b/platypush/backend/http/templates/login.html
@@ -2,9 +2,7 @@
Platypush login page
-
-
-
+ {% include 'css-common.html' %}
diff --git a/platypush/backend/http/templates/register.html b/platypush/backend/http/templates/register.html
index 48dd4a5b3..45f025beb 100644
--- a/platypush/backend/http/templates/register.html
+++ b/platypush/backend/http/templates/register.html
@@ -2,9 +2,7 @@
Platypush registration page
-
-
-
+ {% include 'css-common.html' %}
diff --git a/platypush/backend/http/templates/settings/index.html b/platypush/backend/http/templates/settings/index.html
index 486748f05..2f022f178 100644
--- a/platypush/backend/http/templates/settings/index.html
+++ b/platypush/backend/http/templates/settings/index.html
@@ -4,9 +4,7 @@
-
-
-
+ {% include 'css-common.html' %}
-
-
-
-
-
-
+ {% include 'js-common.html' %}
{% include 'elements.html' %}