diff --git a/plugins/generators/pattern/kis_wdg_pattern.cpp b/plugins/generators/pattern/kis_wdg_pattern.cpp
index 88b5e3ea9e..a6893f3d19 100644
--- a/plugins/generators/pattern/kis_wdg_pattern.cpp
+++ b/plugins/generators/pattern/kis_wdg_pattern.cpp
@@ -1,162 +1,163 @@
 /*
  * This file is part of Krita
  *
  * Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "kis_wdg_pattern.h"
 
 #include <QLayout>
 #include <QLabel>
 #include <QSlider>
 
 #include <KoColor.h>
 #include <resources/KoPattern.h>
 #include <KisGlobalResourcesInterface.h>
 #include <kis_generator_registry.h>
 
 #include <filter/kis_filter_configuration.h>
 #include <kis_pattern_chooser.h>
 #include "ui_wdgpatternoptions.h"
 
 KisWdgPattern::KisWdgPattern(QWidget* parent)
         : KisConfigWidget(parent)
 {
     m_widget = new Ui_WdgPatternOptions();
     m_widget->setupUi(this);
     m_widget->lblPattern->setVisible(false);
-    m_widget->lblColor->setVisible(false);
-    m_widget->bnColor->setVisible(false);
 
     m_widget->sldShearX->setSuffix(i18n(" px"));
     m_widget->sldShearY->setSuffix(i18n(" px"));
     m_widget->sldShearX->setRange(-5.0, 5.0, 2);
     m_widget->sldShearY->setRange(-5.0, 5.0, 2);
     m_widget->sldShearX->setSingleStep(0.01);
     m_widget->sldShearY->setSingleStep(0.01);
     m_widget->sldShearX->setValue(0.0);
     m_widget->sldShearY->setValue(0.0);
 
 
     m_widget->spbOffsetX->setSuffix(i18n(" px"));
     m_widget->spbOffsetY->setSuffix(i18n(" px"));
     m_widget->spbOffsetX->setRange(-10000, 10000);
     m_widget->spbOffsetY->setRange(-10000, 10000);
 
     m_widget->sldRotationX->setSuffix(QChar(Qt::Key_degree));
     m_widget->sldRotationY->setSuffix(QChar(Qt::Key_degree));
     m_widget->sldRotationZ->setSuffix(QChar(Qt::Key_degree));
     m_widget->sldRotationX->setRange(0.0, 360.0, 2);
     m_widget->sldRotationY->setRange(0.0, 360.0, 2);
     m_widget->sldRotationZ->setRange(0.0, 360.0, 2);
     m_widget->sldRotationX->setValue(0.0);
     m_widget->sldRotationY->setValue(0.0);
     m_widget->sldRotationZ->setValue(0.0);
     m_widget->sldRotationX->setSingleStep(1.0);
     m_widget->sldRotationY->setSingleStep(1.0);
     m_widget->sldRotationZ->setSingleStep(1.0);
+
+    m_widget->gb3dRotation->setVisible(false);
+
     connect(m_widget->patternChooser, SIGNAL(resourceSelected(KoResourceSP)), this, SIGNAL(sigConfigurationUpdated()));
 
     connect(m_widget->sldShearX, SIGNAL(valueChanged(double)), this, SIGNAL(sigConfigurationUpdated()));
     connect(m_widget->sldShearY, SIGNAL(valueChanged(double)), this, SIGNAL(sigConfigurationUpdated()));
 
     connect(m_widget->spbOffsetX, SIGNAL(valueChanged(int)), this, SIGNAL(sigConfigurationUpdated()));
     connect(m_widget->spbOffsetY, SIGNAL(valueChanged(int)), this, SIGNAL(sigConfigurationUpdated()));
 
     connect(m_widget->spbScaleWidth, SIGNAL(valueChanged(double)), this, SLOT(slotWidthChanged(double)));
     connect(m_widget->spbScaleHeight, SIGNAL(valueChanged(double)), this, SLOT(slotHeightChanged(double)));
 
     connect(m_widget->sldRotationX, SIGNAL(valueChanged(double)), this, SIGNAL(sigConfigurationUpdated()));
     connect(m_widget->sldRotationY, SIGNAL(valueChanged(double)), this, SIGNAL(sigConfigurationUpdated()));
     connect(m_widget->sldRotationZ, SIGNAL(valueChanged(double)), this, SIGNAL(sigConfigurationUpdated()));
 }
 
 KisWdgPattern::~KisWdgPattern()
 {
     delete m_widget;
 }
 
 
 void KisWdgPattern::setConfiguration(const KisPropertiesConfigurationSP config)
 {
     auto source = KisGlobalResourcesInterface::instance()->source<KoPattern>(ResourceType::Patterns);
     KoPatternSP pattern = source.resourceForName(config->getString("pattern", "Grid01.pat"));
     widget()->patternChooser->setCurrentPattern(pattern ? pattern : source.fallbackResource());
     m_widget->spbOffsetX->setValue(config->getInt("transform_offset_x", 0));
     m_widget->spbOffsetY->setValue(config->getInt("transform_offset_y", 0));
 
     m_widget->spbScaleWidth->setValue(config->getInt("transform_scale_x", 1.0)*100);
     m_widget->spbScaleHeight->setValue(config->getInt("transform_scale_y", 1.0)*100);
     m_widget->btnLockAspectRatio->setKeepAspectRatio(config->getBool("transform_keep_scale_aspect", true));
 
     m_widget->sldShearX->setValue(config->getDouble("transform_shear_x", 0.0));
     m_widget->sldShearY->setValue(config->getDouble("transform_shear_y", 0.0));
 
     widget()->sldRotationX->setValue(config->getDouble("transform_rotation_x", 0.0));
     widget()->sldRotationY->setValue(config->getDouble("transform_rotation_y", 0.0));
     widget()->sldRotationZ->setValue(config->getDouble("transform_rotation_z", 0.0));
 }
 
 KisPropertiesConfigurationSP KisWdgPattern::configuration() const
 {
     KisGeneratorSP generator = KisGeneratorRegistry::instance()->get("pattern");
     KisFilterConfigurationSP config = generator->factoryConfiguration(KisGlobalResourcesInterface::instance());
 
     QVariant v;
     if (widget()->patternChooser->currentResource()) {
         v.setValue(widget()->patternChooser->currentResource()->name());
         config->setProperty("pattern", v);
     }
 
     config->setProperty("transform_offset_x", m_widget->spbOffsetX->value());
     config->setProperty("transform_offset_y", m_widget->spbOffsetY->value());
 
     config->setProperty("transform_scale_x", m_widget->spbScaleWidth->value()/100);
     config->setProperty("transform_scale_y", m_widget->spbScaleHeight->value()/100);
 
     config->setProperty("transform_keep_scale_aspect", m_widget->btnLockAspectRatio->keepAspectRatio());
 
     config->setProperty("transform_shear_x", widget()->sldShearX->value());
     config->setProperty("transform_shear_y", widget()->sldShearY->value());
 
     config->setProperty("transform_rotation_x", widget()->sldRotationX->value());
     config->setProperty("transform_rotation_y", widget()->sldRotationY->value());
     config->setProperty("transform_rotation_z", widget()->sldRotationZ->value());
 
     return config;
 }
 
 void KisWdgPattern::slotWidthChanged(double w)
 {
     if (m_widget->btnLockAspectRatio->keepAspectRatio()) {
         m_widget->spbScaleHeight->blockSignals(true);
         m_widget->spbScaleHeight->setValue(w);
         m_widget->spbScaleHeight->blockSignals(false);
     }
     emit sigConfigurationUpdated();
 }
 
 void KisWdgPattern::slotHeightChanged(double h)
 {
     if (m_widget->btnLockAspectRatio->keepAspectRatio()) {
         m_widget->spbScaleWidth->blockSignals(true);
         m_widget->spbScaleWidth->setValue(h);
         m_widget->spbScaleWidth->blockSignals(false);
     }
     emit sigConfigurationUpdated();
 }
 
diff --git a/plugins/generators/pattern/wdgpatternoptions.ui b/plugins/generators/pattern/wdgpatternoptions.ui
index b847dee948..5e35c950dc 100644
--- a/plugins/generators/pattern/wdgpatternoptions.ui
+++ b/plugins/generators/pattern/wdgpatternoptions.ui
@@ -1,304 +1,283 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgPatternOptions</class>
  <widget class="QWidget" name="WdgPatternOptions">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>484</width>
     <height>477</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tabPatterns">
       <attribute name="title">
        <string>Pattern</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout">
        <item row="0" column="0">
         <widget class="QLabel" name="lblPattern">
          <property name="text">
           <string>&amp;Pattern:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
          <property name="buddy">
           <cstring>patternChooser</cstring>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="KisPatternChooser" name="patternChooser" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="lblColor">
-         <property name="text">
-          <string>&amp;Color:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-         <property name="buddy">
-          <cstring>bnColor</cstring>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="KisColorButton" name="bnColor"/>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabTransform">
       <attribute name="title">
        <string>Transform</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="4" column="0" colspan="2">
-        <widget class="QGroupBox" name="groupBox_5">
+        <widget class="QGroupBox" name="gb3dRotation">
          <property name="title">
           <string>3d Rotation:</string>
          </property>
          <layout class="QFormLayout" name="formLayout_3">
           <item row="0" column="0">
            <widget class="QLabel" name="label_5">
             <property name="text">
              <string>X-Rotation:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_6">
             <property name="text">
              <string>Y-Rotation:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="KisDoubleSliderSpinBox" name="sldRotationX" native="true">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="KisDoubleSliderSpinBox" name="sldRotationY" native="true">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="1" column="0">
-        <widget class="QGroupBox" name="groupBox_2">
+        <widget class="QGroupBox" name="gbScale">
          <property name="title">
           <string>Scale:</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
              <string>Width:</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="KisDoubleParseSpinBox" name="spbScaleWidth">
             <property name="suffix">
              <string>%</string>
             </property>
             <property name="decimals">
              <number>1</number>
             </property>
             <property name="maximum">
              <double>500.000000000000000</double>
             </property>
             <property name="value">
              <double>100.000000000000000</double>
             </property>
            </widget>
           </item>
           <item row="0" column="2" rowspan="2">
            <widget class="KoAspectButton" name="btnLockAspectRatio" native="true"/>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_2">
             <property name="text">
              <string>Height:</string>
             </property>
             <property name="alignment">
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="KisDoubleParseSpinBox" name="spbScaleHeight">
             <property name="suffix">
              <string>%</string>
             </property>
             <property name="decimals">
              <number>1</number>
             </property>
             <property name="maximum">
              <double>500.000000000000000</double>
             </property>
             <property name="value">
              <double>100.000000000000000</double>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="1" column="1">
-        <widget class="QGroupBox" name="groupBox_3">
+        <widget class="QGroupBox" name="gbOffset">
          <property name="title">
           <string>Offset:</string>
          </property>
          <layout class="QFormLayout" name="formLayout_2">
           <item row="0" column="0">
            <widget class="QLabel" name="label_3">
             <property name="text">
              <string>X:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_4">
             <property name="text">
              <string>Y:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="KisIntParseSpinBox" name="spbOffsetX"/>
           </item>
           <item row="1" column="1">
            <widget class="KisIntParseSpinBox" name="spbOffsetY"/>
           </item>
          </layout>
         </widget>
        </item>
        <item row="2" column="0" colspan="2">
-        <widget class="QGroupBox" name="groupBox_4">
+        <widget class="QGroupBox" name="gbShear">
          <property name="title">
           <string>Shear:</string>
          </property>
          <layout class="QFormLayout" name="formLayout_4">
           <item row="0" column="0">
            <widget class="QLabel" name="label_7">
             <property name="text">
              <string>X:</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_8">
             <property name="text">
              <string>Y:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="KisDoubleSliderSpinBox" name="sldShearX" native="true">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
            </widget>
           </item>
           <item row="1" column="1">
            <widget class="KisDoubleSliderSpinBox" name="sldShearY" native="true">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
        <item row="0" column="0" colspan="2">
-        <widget class="QGroupBox" name="groupBox">
+        <widget class="QGroupBox" name="gbRotation">
          <property name="title">
           <string>Rotation:</string>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
            <widget class="KisDoubleSliderSpinBox" name="sldRotationZ" native="true"/>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KisColorButton</class>
-   <extends>QPushButton</extends>
-   <header>kis_color_button.h</header>
-  </customwidget>
   <customwidget>
    <class>KisPatternChooser</class>
    <extends>QWidget</extends>
    <header location="global">kis_pattern_chooser.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KoAspectButton</class>
    <extends>QWidget</extends>
    <header>KoAspectButton.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisDoubleParseSpinBox</class>
    <extends>QDoubleSpinBox</extends>
    <header>kis_double_parse_spin_box.h</header>
   </customwidget>
   <customwidget>
    <class>KisDoubleSliderSpinBox</class>
    <extends>QWidget</extends>
    <header>kis_slider_spin_box.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
    <header>kis_int_parse_spin_box.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>