diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
index 75655e8e2fc..6bd9897de1b 100644
--- a/server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
+++ b/server/zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
@@ -277,13 +277,15 @@
         <h:form id="apiKeyForm">
           <p class="txt--meta">
             <h:outputText value="#{msgs['jsf.dashboard.settings.apiKeyNeeded.message']}"/>
-            <a href="http://zanata.org/help/cli/cli-configuration/"
+            <a href="http://zanata.readthedocs.io/en/release/client/configuration/"
+              target="_blank"
               title="#{msgs['jsf.dashboard.settings.clientConfigHelp.message']}">
-              <i class="i i--help"></i>
+              <i class="i i--question"/>
             </a> and Maven plugin
-            <a href="http://zanata.org/help/maven-plugin/maven-plugin-install/"
+            <a href="http://zanata.readthedocs.io/en/release/client/"
+              target="_blank"
               title="#{msgs['jsf.dashboard.settings.mavenClientConfigHelp.message']}">
-              <i class="i i--help"></i>
+              <i class="i i--question"/>
             </a>.
           </p>
           <div class="form__item">
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
index 50eac089a22..567f2f3ca67 100644
--- a/server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
+++ b/server/zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
@@ -79,7 +79,7 @@
           <span class="txt--meta">#{languageAction.examplePluralForms}</span>
           <a href="http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html?id=l10n/pluralforms"
             title="#{msgs['jsf.language.plurals.help']}" target="_blank">
-            <i class="i i--help"></i>
+            <i class="i i--question"/>
           </a>
           <zanata:decorate id="pluralForms" componentId="pluralFormsField">
             <h:inputText id="pluralForms" placeholder="#{languageAction.pluralsPlaceholder}"
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
index 7ed01d335d9..d302a43464e 100644
--- a/server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
+++ b/server/zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
@@ -91,9 +91,9 @@
     class="heading--secondary l--push-all-0">#{msgs['jsf.ProjectType']}</h3>
 
   <p>#{msgs['jsf.ProjectType.title']} <a
-    href="http://zanata.org/help/projects/create-project/" target="_blank"
+    href="http://zanata.readthedocs.io/en/release/user-guide/projects/create-project/" target="_blank"
     title="#{msgs['jsf.project.projectType.Description']}">
-    <i class="i i--help"></i>
+    <i class="i i--question"/>
   </a>
   </p>
 
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
index e8ac471f00f..2054050aac8 100644
--- a/server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
+++ b/server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-translation.xhtml
@@ -77,10 +77,10 @@
   <h3 class="heading--secondary">#{msgs['jsf.CopyTrans']}</h3>
 
   <p>#{msgs['jsf.Copytrans.message']}
-    <a href="http://zanata.org/help/reuse/copytrans-explained/"
+    <a href="http://zanata.readthedocs.io/en/release/user-guide/translation-reuse/copy-trans/"
         target="_blank"
         title="#{msgs['jsf.project.CopyTransOpts.tooltip']}">
-      <i class="i i--help"></i>
+      <i class="i i--question"/>
     </a>
   </p>
 
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-webhook.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-webhook.xhtml
index f3c3e2213f7..66f4a71adfa 100644
--- a/server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-webhook.xhtml
+++ b/server/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-webhook.xhtml
@@ -73,8 +73,9 @@
     #{msgs['jsf.project.WebHooks']}
     <span class="txt--meta">
       <a href="http://docs.zanata.org/en/release/user-guide/projects/project-settings/#webhooks"
+        target="_blank"
         title="#{msgs['jsf.project.Webhooks.help.message']}">
-        <i class="i i--help"></i>
+        <i class="i i--question"/>
       </a>
     </span>
   </h2>
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
index f2a75d52d31..28fa760b87c 100644
--- a/server/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
+++ b/server/zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
@@ -91,9 +91,9 @@
         class="heading--secondary l--push-all-0">#{msgs['jsf.projectType']}</h3>
 
       <p>#{msgs['jsf.ProjectType.title']} <a target="_blank"
-        href="http://zanata.org/help/projects/create-version/"
+        href="http://zanata.readthedocs.io/en/release/user-guide/versions/create-version/"
         title="#{msgs['jsf.iteration.projectType.Description']}">
-        <i class="i i--help"></i>
+        <i class="i i--question"/>
       </a>
       </p>
 
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
index 6db79dfd826..2ccd6eb384b 100644
--- a/server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
+++ b/server/zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
@@ -259,10 +259,10 @@
             value="requireTranslationReview"/>
 
           <p class="txt--meta">#{msgs['jsf.iteration.requireReview.message']}
-            <a href="http://zanata.org/help/review/review-activating/"
+            <a href="http://zanata.readthedocs.io/en/release/user-guide/review/review-enable/"
               target="_blank"
-              title="#{msgs['jsf.iteration.requireReview.help']}"><i
-              class="i i--help"></i>
+              title="#{msgs['jsf.iteration.requireReview.help']}">
+              <i class="i i--question"/>
             </a>
           </p>
         </div>
diff --git a/server/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml b/server/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
index 027eafcce4a..0a3b0a53044 100644
--- a/server/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
+++ b/server/zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
@@ -149,7 +149,7 @@ site: http://www.fsf.org.
                   value="#{msgs['jsf.upload.ClientUploadInstructions']}"
                   escape="false">
                   <f:param
-                    value="&lt;a href=&quot;http://zanata.org/help/cli/cli-push/&quot;>"/>
+                    value="&lt;a href=&quot;http://zanata.readthedocs.io/en/release/client/commands/push/&quot;>"/>
                   <f:param value="&lt;/a>"/>
                 </h:outputFormat>
               </p>
@@ -190,7 +190,7 @@ site: http://www.fsf.org.
                 <a target="_blank"
                    href="http://docs.zanata.org/en/release/user-guide/documents/raw-documents/#supported-formats"
                    title="#{msgs['jsf.iteration.AcceptedFileFormats.tooltip']}">
-                  <i class="i i--help"></i>
+                  <i class="i i--question"/>
                 </a>
                 <h:outputFormat
                   value="#{msgs['jsf.upload.AcceptedFileTypes']}">
@@ -230,10 +230,10 @@ site: http://www.fsf.org.
                 </button>
                   <span id="#{cc.clientId}-fileupload-file-params"
                     class="is-hidden">
-                    <a
+                    <a target="_blank"
                       href="http://docs.zanata.org/en/release/user-guide/documents/custom-document-param/"
-                      title="#{msgs['jsf.upload.FileParametersHelp']}"><i
-                      class="i i--help"></i></a>
+                      title="#{msgs['jsf.upload.FileParametersHelp']}">
+                      <i class="i i--question"/></a>
                     <textarea name="fileparams" id="fileparams"
                       class="l--push-bottom-0"
                       style="background-image: none; background-position: 0% 0%; background-repeat: repeat repeat;"></textarea>