diff --git a/assets/css/src/newsletter_editor/components/blockTools.styl b/assets/css/src/newsletter_editor/components/blockTools.styl
index c4974a8eda..ea5ed75345 100644
--- a/assets/css/src/newsletter_editor/components/blockTools.styl
+++ b/assets/css/src/newsletter_editor/components/blockTools.styl
@@ -46,6 +46,7 @@ $master-column-tool-width = 24px
       opacity: 0
       overflow: hidden
       display: block
+      margin: 0
 
     .mailpoet_delete_block_activated
       width: auto
@@ -125,7 +126,6 @@ $master-column-tool-width = 24px
   border-radius(3px)
   background-color: $warning-background-color
   padding: 3px 5px
-  line-height: 1.2em
 
   .mailpoet_delete_block_activate
     overflow: hidden
diff --git a/assets/css/src/newsletter_editor/components/forms.styl b/assets/css/src/newsletter_editor/components/forms.styl
index a8f1152464..93600a29eb 100644
--- a/assets/css/src/newsletter_editor/components/forms.styl
+++ b/assets/css/src/newsletter_editor/components/forms.styl
@@ -4,7 +4,6 @@
 
 .mailpoet_form_field_title
   clear: both
-  font-size: 1.1em
   margin-bottom: 5px
 
 .mailpoet_form_field_title_small
diff --git a/assets/css/src/newsletter_editor/components/sidebar.styl b/assets/css/src/newsletter_editor/components/sidebar.styl
index 2c84630986..6ec39797e9 100644
--- a/assets/css/src/newsletter_editor/components/sidebar.styl
+++ b/assets/css/src/newsletter_editor/components/sidebar.styl
@@ -17,6 +17,7 @@ $widget-icon-width = 30px
   border-left: $content-border-color
   border-bottom: $content-border-color
   color: $sidebar-text-color
+  font-size: $sidebar-text-size
 
   .mailpoet_sidebar_region
     margin-bottom: 0
diff --git a/assets/css/src/newsletter_editor/components/sidepanel.styl b/assets/css/src/newsletter_editor/components/sidepanel.styl
index 375c05ae27..eb0b157e32 100644
--- a/assets/css/src/newsletter_editor/components/sidepanel.styl
+++ b/assets/css/src/newsletter_editor/components/sidepanel.styl
@@ -3,6 +3,7 @@ $sidepanel-active-heading-color = $primary-active-color
 /* Sidepanel */
 .mailpoet_editor_settings
   color: $sidebar-text-color
+  font-size: $sidebar-text-size
 
   p
     font-size: 1em
@@ -18,7 +19,6 @@ $sidepanel-active-heading-color = $primary-active-color
 
 .mailpoet_sidepanel_field_title
   clear: both
-  font-size: 1.1em
   margin-bottom: 5px
 
 .mailpoet_sidepanel_field_title_small
diff --git a/assets/css/src/newsletter_editor/variables.styl b/assets/css/src/newsletter_editor/variables.styl
index 7ff7624b67..d74b24c590 100644
--- a/assets/css/src/newsletter_editor/variables.styl
+++ b/assets/css/src/newsletter_editor/variables.styl
@@ -26,3 +26,4 @@ $error-text-color = #d54e21
 $newsletter-width = 660px
 
 $text-line-height = 1.6em
+$sidebar-text-size = 13px
diff --git a/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php b/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php
index 7318af83ba..ff3801fcc8 100644
--- a/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php
+++ b/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php
@@ -88,7 +88,7 @@ class FranksRoastHouseTemplate {
                   ),
                   array(
                     "type" => "text",
-                    "text" => __("<p>Hi there&nbsp;[user:firstname | default:coffee drinker]</p>\n<p></p>\n<p>Sit back&nbsp;and enjoy your favorite roast as you read this week's newsletter.&nbsp;</p>")
+                    "text" => __("<p>Hi there&nbsp;[subscriber:firstname | default:coffee drinker]</p>\n<p></p>\n<p>Sit back&nbsp;and enjoy your favorite roast as you read this week's newsletter.&nbsp;</p>")
                   ),
                   array(
                     "type" => "image",
diff --git a/lib/Router/Newsletters.php b/lib/Router/Newsletters.php
index 63bcda8f94..7d5635bd0d 100644
--- a/lib/Router/Newsletters.php
+++ b/lib/Router/Newsletters.php
@@ -185,8 +185,14 @@ class Newsletters {
     $data_for_shortcodes =
       array_merge(array($newsletter['subject']), $rendered_newsletter);
     $body = implode($divider, $data_for_shortcodes);
+
+    $wp_user = wp_get_current_user();
+    $subscriber = Subscriber::findOne($wp_user->data->user_email);
+    $subscriber = ($subscriber) ? $subscriber->asArray() : false;
+
     $shortcodes = new \MailPoet\Newsletter\Shortcodes\Shortcodes(
-      $newsletter
+      $newsletter,
+      $subscriber
     );
     list($newsletter['subject'],
       $newsletter['body']['html'],
diff --git a/views/newsletter/templates/components/heading.hbs b/views/newsletter/templates/components/heading.hbs
index a1eaf668b5..9d958f1e5c 100644
--- a/views/newsletter/templates/components/heading.hbs
+++ b/views/newsletter/templates/components/heading.hbs
@@ -10,6 +10,6 @@
   <input type="text"
     class="mailpoet_input mailpoet_input_preheader"
     value="{{ model.preheader }}"
-    placeholder="<%= __('Write your preheader here...') %>"
+    placeholder="<%= __('Write your preheader here for Outlook users...') %>"
   />
 </div>