diff --git a/browser/base/content/aboutFrameCrashed.html b/browser/base/content/aboutFrameCrashed.html
index fdf653429481..532854f714db 100644
--- a/browser/base/content/aboutFrameCrashed.html
+++ b/browser/base/content/aboutFrameCrashed.html
@@ -5,18 +5,28 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
diff --git a/browser/components/messagepreview/messagepreview.html b/browser/components/messagepreview/messagepreview.html
index bbb08293bba3..57169d3403d7 100644
--- a/browser/components/messagepreview/messagepreview.html
+++ b/browser/components/messagepreview/messagepreview.html
@@ -11,14 +11,17 @@
+ />
about:messagepreview
-
-
+ />
+
+
diff --git a/browser/components/migration/content/aboutWelcomeBack.xhtml b/browser/components/migration/content/aboutWelcomeBack.xhtml
index 17acd60c99ce..0777cc56e968 100644
--- a/browser/components/migration/content/aboutWelcomeBack.xhtml
+++ b/browser/components/migration/content/aboutWelcomeBack.xhtml
@@ -4,73 +4,123 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
-
- %htmlDTD;
-]>
+
+%htmlDTD; ]>
-
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
+
-
-
-
+
+
+
-
+
-
+
-
-
+
diff --git a/browser/components/migration/content/migration-dialog-window.html b/browser/components/migration/content/migration-dialog-window.html
index e72254c08708..79f31c4606db 100644
--- a/browser/components/migration/content/migration-dialog-window.html
+++ b/browser/components/migration/content/migration-dialog-window.html
@@ -1,22 +1,34 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
diff --git a/browser/components/newtab/aboutwelcome/content/aboutwelcome.html b/browser/components/newtab/aboutwelcome/content/aboutwelcome.html
index f89ed370d4ae..a14b56305739 100644
--- a/browser/components/newtab/aboutwelcome/content/aboutwelcome.html
+++ b/browser/components/newtab/aboutwelcome/content/aboutwelcome.html
@@ -2,32 +2,48 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
-
+
diff --git a/browser/components/newtab/prerendered/activity-stream-debug.html b/browser/components/newtab/prerendered/activity-stream-debug.html
index f98d22ca5bad..b580d4543de6 100644
--- a/browser/components/newtab/prerendered/activity-stream-debug.html
+++ b/browser/components/newtab/prerendered/activity-stream-debug.html
@@ -2,19 +2,32 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
-
-
-
+
+
+
-
+
-
-
+
+
diff --git a/browser/components/newtab/prerendered/activity-stream-noscripts.html b/browser/components/newtab/prerendered/activity-stream-noscripts.html
index ace1fc33cc1e..572edbfa4549 100644
--- a/browser/components/newtab/prerendered/activity-stream-noscripts.html
+++ b/browser/components/newtab/prerendered/activity-stream-noscripts.html
@@ -2,19 +2,32 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
-
-
-
+
+
+
-
+
-
-
+
+
diff --git a/browser/components/newtab/prerendered/activity-stream.html b/browser/components/newtab/prerendered/activity-stream.html
index e7360662c822..74e336a315cf 100644
--- a/browser/components/newtab/prerendered/activity-stream.html
+++ b/browser/components/newtab/prerendered/activity-stream.html
@@ -2,19 +2,32 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
+
-
-
-
+
+
+
-
+
-
-
+
+
diff --git a/browser/components/places/metadataViewer/interactionsViewer.html b/browser/components/places/metadataViewer/interactionsViewer.html
index fecb970c63b1..ae3d166f0ea2 100644
--- a/browser/components/places/metadataViewer/interactionsViewer.html
+++ b/browser/components/places/metadataViewer/interactionsViewer.html
@@ -8,14 +8,28 @@
Interactions Debug Viewer
-
-
-
+
+
+