diff --git a/src/calibre/gui2/dialogs/template_line_editor.py b/src/calibre/gui2/dialogs/template_line_editor.py
index 95727e442b..26f4dd0753 100644
--- a/src/calibre/gui2/dialogs/template_line_editor.py
+++ b/src/calibre/gui2/dialogs/template_line_editor.py
@@ -63,6 +63,7 @@ class TagWizard(QDialog):
         self.tags = tags
         l = QGridLayout()
         self.setLayout(l)
+        l.setColumnStretch(0, 1)
         l.addWidget(QLabel(_('Tag Value')), 0, 0, 1, 1)
         l.addWidget(QLabel(_('Color')), 0, 1, 1, 1)
         self.tagboxes = []
diff --git a/src/calibre/gui2/preferences/look_feel.py b/src/calibre/gui2/preferences/look_feel.py
index 483934825d..49bfb1df1a 100644
--- a/src/calibre/gui2/preferences/look_feel.py
+++ b/src/calibre/gui2/preferences/look_feel.py
@@ -167,8 +167,8 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
                   '<a href="http://calibre-ebook.com/user_manual/template_lang.html">'
                   'tutorial</a> on using templates.') +
                  '</p><p>' +
-                _('If you want to color a field based on tags, then right-click '
-                  'in an empty  template line and choose tags wizard. '
+                _('If you want to color a field based on tags, then click the '
+                  'button next to an empty line to open the tags wizard. '
                   'It will build a template for you. You can later edit that '
                   'template with the same wizard. If you edit it by hand, the '
                   'wizard might not work or might restore old values.') +
diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index a67a3585cb..fe6134f235 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -442,6 +442,9 @@ then the tags will be displayed each on their own line.</string>
           <iconset resource="../../../../resources/images.qrc">
            <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
          </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
         </widget>
        </item>
        <item row="3" column="0">
@@ -456,6 +459,9 @@ then the tags will be displayed each on their own line.</string>
           <iconset resource="../../../../resources/images.qrc">
            <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
          </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
         </widget>
        </item>
        <item row="4" column="0">
@@ -470,6 +476,9 @@ then the tags will be displayed each on their own line.</string>
           <iconset resource="../../../../resources/images.qrc">
            <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
          </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
         </widget>
        </item>
        <item row="5" column="0">
@@ -484,6 +493,9 @@ then the tags will be displayed each on their own line.</string>
           <iconset resource="../../../../resources/images.qrc">
            <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
          </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
         </widget>
        </item>
        <item row="6" column="0">
@@ -498,6 +510,9 @@ then the tags will be displayed each on their own line.</string>
           <iconset resource="../../../../resources/images.qrc">
            <normaloff>:/images/wizard.png</normaloff>:/images/wizard.png</iconset>
          </property>
+         <property name="toolTip">
+          <string>Open the tags wizard.</string>
+         </property>
         </widget>
        </item>
        <item row="20" column="0">