diff --git a/assets/css/src/newsletter_editor/common.styl b/assets/css/src/newsletter_editor/common.styl
index 67400cc860..63089d5314 100644
--- a/assets/css/src/newsletter_editor/common.styl
+++ b/assets/css/src/newsletter_editor/common.styl
@@ -179,6 +179,9 @@ select.mailpoet_font-size
   width: 100%
   box-sizing: border-box
 
+.tooltip-help-designer-subject-line div, .tooltip-help-designer-preheader div
+  z-index: 100001
+
 .tooltip-help-send-preview
   position: absolute
   right: 15px
@@ -187,6 +190,7 @@ select.mailpoet_font-size
   color: #656565
   text-transform: none
   margin-left: 5px
+  font-weight: normal
 
 .tooltip-help-designer-styles
   position: absolute
@@ -194,6 +198,8 @@ select.mailpoet_font-size
 
 .tooltip-help-designer-full-width .dashicons
   line-height 34px
+.tooltip-help-designer-full-width span
+  line-height 1.4em
 
 .mailpoet_button_primary
   border-color: $button-primary-border-color
diff --git a/assets/css/src/settings.styl b/assets/css/src/settings.styl
index dc795fc268..0f6325e7ae 100644
--- a/assets/css/src/settings.styl
+++ b/assets/css/src/settings.styl
@@ -55,7 +55,7 @@
         visibility hidden
 
   .tooltip.dashicons.dashicons-editor-help
-    font-size: 30px
+    line-height: 1.4
 
   ul.sending-method-benefits
     list-style-type: none
diff --git a/assets/js/src/help-tooltip.js b/assets/js/src/help-tooltip.js
index cf7505b825..e36029ad3e 100644
--- a/assets/js/src/help-tooltip.js
+++ b/assets/js/src/help-tooltip.js
@@ -8,7 +8,8 @@ define('helpTooltip', ['mailpoet', 'react', 'react-dom', 'help-tooltip.jsx'],
         ReactDOM.render(React.createElement(
           TooltipComponent, {
             tooltip: opts.tooltip,
-            tooltipId: opts.tooltipId
+            tooltipId: opts.tooltipId,
+            place: opts.place
           }
         ), domContainerNode);
       }
diff --git a/assets/js/src/help-tooltip.jsx b/assets/js/src/help-tooltip.jsx
index d7d97d653b..0084418460 100644
--- a/assets/js/src/help-tooltip.jsx
+++ b/assets/js/src/help-tooltip.jsx
@@ -11,14 +11,22 @@ function Tooltip(props) {
   }
 
   if(typeof props.tooltip === "string") {
-    tooltip = ReactHtmlParser(props.tooltip);
+    tooltip = (<span
+      style={{
+        pointerEvents: "all",
+        maxWidth: "400",
+        display: "inline-block",
+      }}
+    >
+      {ReactHtmlParser(props.tooltip)}
+    </span>);
   }
 
   return (
-    <span>
+    <span className={props.className}>
       <span
         style={{
-          cursor: "help",
+          cursor: "pointer",
         }}
         className="tooltip dashicons dashicons-editor-help"
         data-event="click"
@@ -31,6 +39,7 @@ function Tooltip(props) {
           multiline={true}
           id={tooltipId}
           efect="solid"
+          place={props.place}
         >
           {tooltip}
         </ReactTooltip>
@@ -41,10 +50,14 @@ function Tooltip(props) {
 Tooltip.propTypes = {
   tooltipId: React.PropTypes.string,
   tooltip: React.PropTypes.node.isRequired,
+  place: React.PropTypes.string,
+  className: React.PropTypes.string,
 };
 
 Tooltip.defaultProps = {
   tooltipId: undefined,
+  place: undefined,
+  className: undefined,
 };
 
 module.exports = Tooltip;
diff --git a/assets/js/src/newsletter_editor/components/heading.js b/assets/js/src/newsletter_editor/components/heading.js
index 9f3dcc2892..080f75c809 100644
--- a/assets/js/src/newsletter_editor/components/heading.js
+++ b/assets/js/src/newsletter_editor/components/heading.js
@@ -32,7 +32,8 @@ define([
     App._appView.showChildView('headingRegion', new Module.HeadingView({ model: App.getNewsletter() }));
     MailPoet.helpTooltip.show(document.getElementById('tooltip-designer-subject-line'), {
       tooltipId: 'tooltip-designer-subject-line-ti',
-      tooltip: MailPoet.I18n.t('helpTooltipDesignerSubjectLine')
+      tooltip: MailPoet.I18n.t('helpTooltipDesignerSubjectLine'),
+      place: "right"
     });
     MailPoet.helpTooltip.show(document.getElementById('tooltip-designer-preheader'), {
       tooltipId: 'tooltip-designer-preheader-ti',
diff --git a/assets/js/src/newsletters/templates.jsx b/assets/js/src/newsletters/templates.jsx
index 39fd9ea6c0..20b86acc0c 100644
--- a/assets/js/src/newsletters/templates.jsx
+++ b/assets/js/src/newsletters/templates.jsx
@@ -68,12 +68,13 @@ define(
       render: function () {
         return (
           <div>
-            <h2>{MailPoet.I18n.t('importTemplateTitle')}</h2>
+            <h2>{MailPoet.I18n.t('importTemplateTitle')} <HelpTooltip
+              tooltip={MailPoet.I18n.t('helpTooltipTemplateUpload')}
+              place="right"
+              className="tooltip-help-import-template"
+            /></h2>
             <form onSubmit={this.handleSubmit}>
               <input type="file" placeholder={MailPoet.I18n.t('selectJsonFileToUpload')} ref="templateFile" />
-              <HelpTooltip
-                tooltip={MailPoet.I18n.t('helpTooltipTemplateUpload')}
-              />
               <p className="submit">
                 <input
                   className="button button-primary"
diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html
index 00a997d2e7..36f54f4bfb 100644
--- a/views/newsletter/editor.html
+++ b/views/newsletter/editor.html
@@ -236,12 +236,12 @@
     <div id="mailpoet_editor_main_wrapper">
       <div id="mailpoet_editor_styles">
       </div>
-      <div id="mailpoet_editor_sidebar"></div>
       <div id="mailpoet_editor_content_container">
         <div class="mailpoet_newsletter_wrapper">
           <div id="mailpoet_editor_content"></div>
         </div>
       </div>
+      <div id="mailpoet_editor_sidebar"></div>
       <div class="clear"></div>
     </div>
     <div id="mailpoet_editor_bottom">
@@ -323,7 +323,7 @@
 <% block translations %>
   <% set helpTooltipSendPreview = __("Didn't receive the test email? Read our [link]quick guide[/link] to sending issues. <br><br>A MailPoet logo will appear in the footer of all emails sent with the free version of MailPoet. <br><br>Links in footer don't work in email previews!")
   |replaceLinkTags('http://beta.docs.mailpoet.com/article/146-my-newsletters-are-not-being-received', {'target' : '_blank'})
-  |escape('js') %>'
+  |escape('js') %>
   <%= localize({
     'failedToFetchAvailablePosts': __('Failed to fetch available posts'),
     'failedToFetchRenderedPosts': __('Failed to fetch rendered posts'),