diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index bc61ce9a91..f0a1ad36cd 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -1137,6 +1137,7 @@ def build_forms(srcdir, info=None):
             dat = dat.replace('import images_rc', '')
             dat = dat.replace('from library import', 'from calibre.gui2.library import')
             dat = dat.replace('from widgets import', 'from calibre.gui2.widgets import')
+            dat = dat.replace('from widgets2 import', 'from calibre.gui2.widgets2 import')
             dat = dat.replace('from convert.xpath_wizard import',
                 'from calibre.gui2.convert.xpath_wizard import')
             dat = re.sub(r'^ {4}def _translate\(context, text, disambig\):\s+return.*$', '    pass', dat,
diff --git a/src/calibre/gui2/dialogs/template_dialog.py b/src/calibre/gui2/dialogs/template_dialog.py
index ab185d8a6a..dfd51cb5d9 100644
--- a/src/calibre/gui2/dialogs/template_dialog.py
+++ b/src/calibre/gui2/dialogs/template_dialog.py
@@ -229,9 +229,6 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
             for n1, k1 in cols:
                 self.colored_field.addItem(n1, k1)
             self.colored_field.setCurrentIndex(self.colored_field.findData(color_field))
-            colors = QColor.colorNames()
-            colors.sort()
-            self.color_name.addItems(colors)
         elif self.iconing:
             self.icon_layout.setVisible(True)
             for n1, k1 in cols:
@@ -362,7 +359,7 @@ class TemplateDialog(QDialog, Ui_TemplateDialog):
     def color_to_clipboard(self):
         app = QApplication.instance()
         c = app.clipboard()
-        c.setText(unicode(self.color_name.currentText()))
+        c.setText(unicode(self.color_name.color))
 
     def icon_to_clipboard(self):
         app = QApplication.instance()
diff --git a/src/calibre/gui2/dialogs/template_dialog.ui b/src/calibre/gui2/dialogs/template_dialog.ui
index 11dafa4627..897e4e1686 100644
--- a/src/calibre/gui2/dialogs/template_dialog.ui
+++ b/src/calibre/gui2/dialogs/template_dialog.ui
@@ -48,7 +48,7 @@
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QComboBox" name="color_name">
+       <widget class="ColorButton" name="color_name">
        </widget>
       </item>
       <item row="1" column="2">
@@ -246,6 +246,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ColorButton</class>
+   <extends>QPushButton</extends>
+   <header>widgets2.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>