diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm
index 939b6d97927..8a1c0fc81e3 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/accessmain.htm
@@ -8,7 +8,7 @@
   <meta name="keyword" content="shortcut keys, accelerator keys, hot keys, hotkeys">
   <meta name="keyword" content="accessibility, disability, special needs">
   <meta name="keyword" content="accessible, disabilities, special need">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta charset="utf-8">
   <title>Accessibility Features for Eclipse</title>
   <script src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/colordialog.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/colordialog.htm
index c5b2b68b379..02660eb48b5 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/colordialog.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/colordialog.htm
@@ -8,6 +8,10 @@
   <title>Color Dialog Mappings Table</title>
   <style>
       .alnright { text-align: right; }
+	  table, th, td {
+		border: 1px solid;
+		border-collapse: collapse;
+	  }
   </style>
 </head>
 <body>
@@ -15,7 +19,7 @@ <h1>Windows Color Dialog Reference</h1>
   <p>Below are the tables that show the colors of the fonts in the matrix of the Windows color dialog and the color
   settings that each of these correspond to.</p>
   <h2>Windows Color Dialog Color Matrix</h2>
-  <table border="1" style="text-align: center;">
+  <table style="text-align: center;">
     <col>
     <col span="2">
     <col span="5">
@@ -177,30 +181,29 @@ <h2>Windows Color Dialog Color Matrix</h2>
     </tr>
   </table>
   <h2>Settings for Default Colors in the Windows Color Dialog</h2>
-  <table border="1">
-    <col>
+  <table>
     <col span="2">
     <col span="5">
     <tr>
-      <td width="95">
+      <td style="width:20%">
           <strong>Color</strong>
       </td>
-      <td width="22">
+      <td style="width:10%">
           <strong>Hue</strong>
       </td>
-      <td width="58">
+      <td style="width:10%">
           <strong>Saturation</strong>
       </td>
-      <td width="63">
+      <td style="width:10%">
           <strong>Lumination</strong>
       </td>
-      <td width="21">
+      <td style="width:10%">
           <strong>Red</strong>
       </td>
-      <td width="37">
+      <td style="width:10%">
           <strong>Green</strong>
       </td>
-      <td width="26">
+      <td style="width:10%">
           <strong>Blue</strong>
       </td>
     </tr>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/fontsandcolors.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/fontsandcolors.htm
index 37133eb401f..88ac59185d4 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/fontsandcolors.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/fontsandcolors.htm
@@ -4,7 +4,7 @@
   <meta name="copyright" content=
   "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
   <link rel="STYLESHEET" href="../../book.css" type="text/css">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta charset="utf-8">
   <title>Fonts and Colors in Eclipse</title>
   <script src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm
index bf0fe5fef11..57af32bd626 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm
@@ -4,7 +4,7 @@
   <meta name="copyright" content=
   "Copyright (c) IBM Corporation and others 2000, 2019. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
   <link rel="STYLESHEET" href="../../book.css" type="text/css">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta charset="utf-8">
   <title>Keys</title>
   <script src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/navigation.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/navigation.htm
index d2805c634c5..801af1e2589 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/navigation.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/navigation.htm
@@ -4,7 +4,7 @@
   <meta name="copyright" content=
   "Copyright (c) IBM Corporation and others 2000, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
   <link rel="STYLESHEET" href="../../book.css" type="text/css">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta charset="utf-8">
   <title>Navigating the User Interface Using the Keyboard</title>
 </head>
 <body>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/text_editor.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/text_editor.htm
index fcd42da6287..cf8948ff75d 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/text_editor.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/accessibility/text_editor.htm
@@ -4,7 +4,7 @@
   <meta name="copyright" content=
   "Copyright (c) IBM Corporation and others 2009, 2013. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." />
   <link rel="STYLESHEET" href="../../book.css" type="text/css" />
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta charset="utf-8">
   <title>Accessibility Features in Textual Editors</title>
   <script src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/concepts-exttools.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/concepts-exttools.htm
index 4a4d4c3aee4..bc1a600d69a 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/concepts-exttools.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/concepts-exttools.htm
@@ -6,6 +6,12 @@
   <meta charset="utf-8"/>
   <title>External Tools</title>
   <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <style>
+	table, th, td {
+		border: 1px solid;
+		border-collapse: collapse;
+	}
+  </style>
 </head>
 <body>
   <h1>External Tools</h1>
@@ -17,13 +23,14 @@ <h1>External Tools</h1>
   specified order every time a project is built.</p>
   <p>The following variables are available when you configure an external tool. These variables are automatically
   expanded each time the external tool is run.</p>
-  <table border="1" width="80%" cellpadding="5" cellspacing="0" summary="Variables available to external tools">
+  <table style="width:80%">
+	<caption>Variables available to external tools</caption>
     <thead>
       <tr>
-        <th width="25%" colspan="1" rowspan="1">
+        <th style="width:25%">
           <p>Variable Name</p>
         </th>
-        <th colspan="1" rowspan="1">
+        <th>
           <p>Description</p>
         </th>
       </tr>
@@ -118,13 +125,14 @@ <h1>External Tools</h1>
   the workspace directory, the second project, <code>MyProject2</code>, is located outside the workspace directory at
   <code>c:\projects\MyProject2</code>. Lets look at how the variable examples below will be expanded when an external
   tool is run, if the resource <code>/MyProject2/MyFolder/MyFile.txt</code> is selected.</p>
-  <table border="1" width="50%" cellpadding="5" cellspacing="0" summary="Variables available to external tools">
+  <table>
+	<caption>Variables available to external tools</caption>
     <thead>
       <tr>
-        <th width="25%" colspan="1" rowspan="1">
+        <th style="width:25%">
           <p>Variable Example</p>
         </th>
-        <th colspan="1" rowspan="1">
+        <th>
           <p>Expanded Results</p>
         </th>
       </tr>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/cprbview.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/cprbview.htm
index 9095f08f84c..90cafdc572c 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/cprbview.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/cprbview.htm
@@ -3,7 +3,7 @@
 <head>
   <meta name="copyright" content=
   "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta charset="utf-8">
   <link rel="STYLESHEET" href="../book.css" type="text/css">
   <title>Problems View</title>
   <script src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/ctskview.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/ctskview.htm
index 0372df29e1d..fadd2479d01 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/ctskview.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/ctskview.htm
@@ -3,7 +3,7 @@
 <head>
   <meta name="copyright" content=
   "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta charset="utf-8">
   <link rel="STYLESHEET" href="../book.css" type="text/css">
   <title>Tasks View</title>
   <script src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/help_view.htm b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/help_view.htm
index 48c0025c97c..7298acb11d0 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/help_view.htm
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/concepts/help_view.htm
@@ -5,6 +5,12 @@
   "Copyright (c) IBM Corporation and others 2000, 2011. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
   <meta charset="utf-8"/>
   <link rel="STYLESHEET" href="../book.css" type="text/css">
+  <style>
+	table, th, td {
+		border: 1px solid;
+		border-collapse: collapse;
+	}
+  </style>
   <script src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
   <title>Help View</title>
 </head>
@@ -56,7 +62,7 @@ <h2>Toolbar</h2>
   </dl>
   <h2>Icons</h2>
   <p>The following icons can appear in the various pages of the Help view.</p>
-  <table border="1" cellspacing="0">
+  <table>
     <thead>
       <tr>
         <th rowspan="1" colspan="1">
@@ -69,54 +75,48 @@ <h2>Icons</h2>
     </thead>
     <tbody>
       <tr>
-        <td rowspan="1" colspan="1" valign="top" align="left"><img src="../images/toc_closed.svg" alt=
-        "Open project icon" border="0"></td>
-        <td rowspan="1" colspan="1" valign="top" align="left">Book (closed)</td>
+        <td><img src="../images/toc_closed.svg" alt="Open project icon"></td>
+        <td>Book (closed)</td>
       </tr>
       <tr>
-        <td rowspan="1" colspan="1" valign="top" align="left"><img src="../images/toc_open.svg" alt="Folder icon"
-        border="0"></td>
-        <td rowspan="1" colspan="1" valign="top" align="left">Book (open)</td>
+        <td><img src="../images/toc_open.svg" alt="Folder icon"></td>
+        <td>Book (open)</td>
       </tr>
       <tr>
-        <td colspan="1" valign="top" align="left"><img src="../images/toc_topic_obj.svg" alt="File icon" border=
-        "0"></td>
-        <td colspan="1" valign="top" align="left">Topic (container)</td>
+        <td><img src="../images/toc_topic_obj.svg" alt="File icon"></td>
+        <td>Topic (container)</td>
       </tr>
       <tr>
-        <td colspan="1" valign="top" align="left"><img src="../images/topic_small.svg" alt="File icon" border="0"></td>
-        <td colspan="1" valign="top" align="left">Topic</td>
+        <td><img src="../images/topic_small.svg" alt="File icon"></td>
+        <td>Topic</td>
       </tr>
       <tr>
-        <td colspan="1" valign="top" align="left"><img src="../images/slocalhelp_obj.svg" alt="File icon" border=
-        "0"></td>
-        <td colspan="1" valign="top" align="left">Search of local help</td>
+        <td><img src="../images/slocalhelp_obj.svg" alt="File icon"></td>
+        <td>Search of local help</td>
       </tr>
       <tr>
-        <td colspan="1" valign="top" align="left"><img src="../images/help_search.svg" alt="File icon" border="0"></td>
-        <td colspan="1" valign="top" align="left">Search of remote info-center</td>
+        <td><img src="../images/help_search.svg" alt="File icon"></td>
+        <td>Search of remote info-center</td>
       </tr>
       <tr>
-        <td colspan="1" valign="top" align="left"><img src="../images/sweb_obj.svg" alt="File icon" border="0"></td>
-        <td colspan="1" valign="top" align="left">Search of web engine</td>
+        <td><img src="../images/sweb_obj.svg" alt="File icon"></td>
+        <td>Search of web engine</td>
       </tr>
       <tr>
-        <td colspan="1" valign="top" align="left"><img src="../images/highlight.svg" alt="File icon" border="0"></td>
-        <td colspan="1" valign="top" align="left">Highlight search terms</td>
+        <td><img src="../images/highlight.svg" alt="File icon"></td>
+        <td>Highlight search terms</td>
       </tr>
       <tr>
-        <td colspan="1" valign="top" align="left"><img src="../images/openseparate_co.svg" alt="File icon" border=
-        "0"></td>
-        <td colspan="1" valign="top" align="left">Open link in a help window</td>
+        <td><img src="../images/openseparate_co.svg" alt="File icon"></td>
+        <td>Open link in a help window</td>
       </tr>
       <tr>
-        <td colspan="1" valign="top" align="left"><img src="../images/addbkmrk_co.svg" alt="File icon" border="0"></td>
-        <td colspan="1" valign="top" align="left">Bookmark document</td>
+        <td><img src="../images/addbkmrk_co.svg" alt="File icon"></td>
+        <td>Bookmark document</td>
       </tr>
       <tr>
-        <td colspan="1" valign="top" align="left"><img src="../images/bookmark_obj.svg" alt="File icon" border=
-        "0"></td>
-        <td colspan="1" valign="top" align="left">Bookmarked document</td>
+        <td><img src="../images/bookmark_obj.svg" alt="File icon"></td>
+        <td>Bookmarked document</td>
       </tr>
     </tbody>
   </table>

@@ -69,54 +75,48 @@ Icons
	Book (closed)		Book (closed)
	Book (open)		Book (open)
	Topic (container)		Topic (container)
	Topic		Topic
	Search of local help		Search of local help
	Search of remote info-center		Search of remote info-center
	Search of web engine		Search of web engine
	Highlight search terms		Highlight search terms
	Open link in a help window		Open link in a help window
	Bookmark document		Bookmark document
	Bookmarked document		Bookmarked document