diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@ -263,7 +263,8 @@
     widgets/KoDualColorButton.cpp
     widgets/KoStrokeConfigWidget.cpp
     widgets/KoFillConfigWidget.cpp
-    
+    widgets/KisLayerStyleAngleSelector.cpp
+
     KisPaletteEditor.cpp
     dialogs/KisDlgPaletteEditor.cpp
 
@@ -528,6 +529,7 @@
     layerstyles/WdgStroke.ui
     layerstyles/wdgstylesselector.ui
     layerstyles/wdgTexture.ui
+    layerstyles/wdgKisLayerStyleAngleSelector.ui
 
     wdgsplash.ui
     input/wintab/kis_screen_size_choice_dialog.ui
diff --git a/libs/ui/dialogs/kis_dlg_layer_style.h b/libs/ui/dialogs/kis_dlg_layer_style.h
--- a/libs/ui/dialogs/kis_dlg_layer_style.h
+++ b/libs/ui/dialogs/kis_dlg_layer_style.h
@@ -70,12 +70,6 @@
     void setBevelAndEmboss(const psd_layer_effects_bevel_emboss *bevelAndEmboss);
     void fetchBevelAndEmboss(psd_layer_effects_bevel_emboss *bevelAndEmboss) const;
 
-private Q_SLOTS:
-    void slotDialAngleChanged(int value);
-    void slotIntAngleChanged(int value);
-
-    void slotGlobalLightToggled();
-
 Q_SIGNALS:
     void configChanged();
     void globalAngleChanged(int value);
@@ -127,12 +121,6 @@
     void setShadow(const psd_layer_effects_shadow_common *shadow);
     void fetchShadow(psd_layer_effects_shadow_common *shadow) const;
 
-private Q_SLOTS:
-    void slotDialAngleChanged(int value);
-    void slotIntAngleChanged(int value);
-
-    void slotGlobalLightToggled();
-
 Q_SIGNALS:
     void configChanged();
     void globalAngleChanged(int value);
@@ -149,10 +137,6 @@
     void setGradientOverlay(const psd_layer_effects_gradient_overlay *gradient);
     void fetchGradientOverlay(psd_layer_effects_gradient_overlay *gradient) const;
 
-private Q_SLOTS:
-    void slotDialAngleChanged(int value);
-    void slotIntAngleChanged(int value);
-
 Q_SIGNALS:
     void configChanged();
 
@@ -204,10 +188,6 @@
     void setSatin(const psd_layer_effects_satin *satin);
     void fetchSatin(psd_layer_effects_satin *satin) const;
 
-private Q_SLOTS:
-    void slotDialAngleChanged(int value);
-    void slotIntAngleChanged(int value);
-
 Q_SIGNALS:
     void configChanged();
 
@@ -222,10 +202,6 @@
     void setStroke(const psd_layer_effects_stroke *stroke);
     void fetchStroke(psd_layer_effects_stroke *stroke) const;
 
-private Q_SLOTS:
-    void slotDialAngleChanged(int value);
-    void slotIntAngleChanged(int value);
-
 Q_SIGNALS:
     void configChanged();
 
diff --git a/libs/ui/dialogs/kis_dlg_layer_style.cpp b/libs/ui/dialogs/kis_dlg_layer_style.cpp
--- a/libs/ui/dialogs/kis_dlg_layer_style.cpp
+++ b/libs/ui/dialogs/kis_dlg_layer_style.cpp
@@ -29,7 +29,6 @@
 #include <QUuid>
 #include <QInputDialog>
 
-
 #include <KoColorPopupButton.h>
 #include <KoColorSpaceRegistry.h>
 #include <KoResourceServerProvider.h>
@@ -48,7 +47,6 @@
 #include <KoFileDialog.h>
 
 
-
 KoAbstractGradient* fetchGradientLazy(KoAbstractGradient *gradient,
                                       KisCanvasResourceProvider *resourceProvider)
 {
@@ -616,13 +614,10 @@
     ui.intOpacity2->setRange(0, 100);
     ui.intOpacity2->setSuffix(i18n(" %"));
 
-    connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int)));
-    connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int)));
-    connect(ui.chkUseGlobalLight, SIGNAL(toggled(bool)), SLOT(slotGlobalLightToggled()));
+    ui.angleSelector->enableGlobalLight(true);
+    connect(ui.angleSelector, SIGNAL(globalAngleChanged(int)), SIGNAL(globalAngleChanged(int)));
+    connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
 
-    connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
-    connect(ui.intAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
-    connect(ui.chkUseGlobalLight, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
     connect(ui.intAltitude, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
     connect(ui.cmbContour, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
     connect(ui.chkAntiAliased, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
@@ -664,9 +659,9 @@
     ui.intSize->setValue(bevelAndEmboss->size());
     ui.intSoften->setValue(bevelAndEmboss->soften());
 
-    ui.dialAngle->setValue(bevelAndEmboss->angle());
-    ui.intAngle->setValue(bevelAndEmboss->angle());
-    ui.chkUseGlobalLight->setChecked(bevelAndEmboss->useGlobalLight());
+    ui.angleSelector->setValue(bevelAndEmboss->angle());
+    ui.angleSelector->setUseGlobalLight(bevelAndEmboss->useGlobalLight());
+
     ui.intAltitude->setValue(bevelAndEmboss->altitude());
     // FIXME: curve editing
     // ui.cmbContour;
@@ -702,8 +697,8 @@
     bevelAndEmboss->setSize(ui.intSize->value());
     bevelAndEmboss->setSoften(ui.intSoften->value());
 
-    bevelAndEmboss->setAngle(ui.dialAngle->value());
-    bevelAndEmboss->setUseGlobalLight(ui.chkUseGlobalLight->isChecked());
+    bevelAndEmboss->setAngle(ui.angleSelector->value());
+    bevelAndEmboss->setUseGlobalLight(ui.angleSelector->useGlobalLight());
     bevelAndEmboss->setAltitude(ui.intAltitude->value());
     bevelAndEmboss->setGlossAntiAliased(ui.chkAntiAliased->isChecked());
     bevelAndEmboss->setHighlightBlendMode(ui.cmbHighlightMode->selectedCompositeOp().id());
@@ -724,32 +719,6 @@
     bevelAndEmboss->setTextureAlignWithLayer(m_texture->ui.chkLinkWithLayer->isChecked());
 }
 
-void BevelAndEmboss::slotDialAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.intAngle);
-    ui.intAngle->setValue(value);
-
-    if (ui.chkUseGlobalLight->isChecked()) {
-        emit globalAngleChanged(value);
-    }
-}
-
-void BevelAndEmboss::slotIntAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.dialAngle);
-    ui.dialAngle->setValue(value);
-
-    if (ui.chkUseGlobalLight->isChecked()) {
-        emit globalAngleChanged(value);
-    }
-}
-
-void BevelAndEmboss::slotGlobalLightToggled()
-{
-    if (ui.chkUseGlobalLight->isChecked()) {
-        emit globalAngleChanged(ui.intAngle->value());
-    }
-}
 
 /********************************************************************/
 /***** Texture          *********************************************/
@@ -849,19 +818,15 @@
     ui.intNoise->setRange(0, 100);
     ui.intNoise->setSuffix(i18n(" %"));
 
-    connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int)));
-    connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int)));
-    connect(ui.chkUseGlobalLight, SIGNAL(toggled(bool)), SLOT(slotGlobalLightToggled()));
+    ui.angleSelector->enableGlobalLight(true);
+    connect(ui.angleSelector, SIGNAL(globalAngleChanged(int)), SIGNAL(globalAngleChanged(int)));
+    connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
 
     // connect everything to configChanged() signal
     connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
     connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
     connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
 
-    connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
-    connect(ui.intAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
-    connect(ui.chkUseGlobalLight, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
-
     connect(ui.intDistance, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
     connect(ui.intSpread, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
     connect(ui.intSize, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
@@ -879,44 +844,16 @@
     }
 }
 
-void DropShadow::slotDialAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.intAngle);
-    ui.intAngle->setValue(value);
-
-    if (ui.chkUseGlobalLight->isChecked()) {
-        emit globalAngleChanged(value);
-    }
-}
-
-void DropShadow::slotIntAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.dialAngle);
-    ui.dialAngle->setValue(value);
-
-    if (ui.chkUseGlobalLight->isChecked()) {
-        emit globalAngleChanged(value);
-    }
-}
-
-void DropShadow::slotGlobalLightToggled()
-{
-    if (ui.chkUseGlobalLight->isChecked()) {
-        emit globalAngleChanged(ui.intAngle->value());
-    }
-}
-
 void DropShadow::setShadow(const psd_layer_effects_shadow_common *shadow)
 {
     ui.cmbCompositeOp->selectCompositeOp(KoID(shadow->blendMode()));
     ui.intOpacity->setValue(shadow->opacity());
     KoColor color(KoColorSpaceRegistry::instance()->rgb8());
     color.fromQColor(shadow->color());
     ui.bnColor->setColor(color);
 
-    ui.dialAngle->setValue(shadow->angle());
-    ui.intAngle->setValue(shadow->angle());
-    ui.chkUseGlobalLight->setChecked(shadow->useGlobalLight());
+    ui.angleSelector->setValue(shadow->angle());
+    ui.angleSelector->setUseGlobalLight(shadow->useGlobalLight());
 
     ui.intDistance->setValue(shadow->distance());
     ui.intSpread->setValue(shadow->spread());
@@ -942,8 +879,8 @@
     shadow->setOpacity(ui.intOpacity->value());
     shadow->setColor(ui.bnColor->color().toQColor());
 
-    shadow->setAngle(ui.dialAngle->value());
-    shadow->setUseGlobalLight(ui.chkUseGlobalLight->isChecked());
+    shadow->setAngle(ui.angleSelector->value());
+    shadow->setUseGlobalLight(ui.angleSelector->useGlobalLight());
 
     shadow->setDistance(ui.intDistance->value());
     shadow->setSpread(ui.intSpread->value());
@@ -1015,17 +952,14 @@
     ui.intScale->setRange(0, 100);
     ui.intScale->setSuffix(i18n(" %"));
 
-    connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int)));
-    connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int)));
+    connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
 
     connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
     connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
     connect(ui.cmbGradient, SIGNAL(gradientChanged(KoAbstractGradient*)), SIGNAL(configChanged()));
     connect(ui.chkReverse, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
     connect(ui.cmbStyle, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
     connect(ui.chkAlignWithLayer, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
-    connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
-    connect(ui.intAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
     connect(ui.intScale, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
 }
 
@@ -1044,8 +978,7 @@
     ui.chkReverse->setChecked(config->reverse());
     ui.cmbStyle->setCurrentIndex((int)config->style());
     ui.chkAlignWithLayer->setCheckable(config->alignWithLayer());
-    ui.dialAngle->setValue(config->angle());
-    ui.intAngle->setValue(config->angle());
+    ui.angleSelector->setValue(config->angle());
     ui.intScale->setValue(config->scale());
 }
 
@@ -1057,21 +990,10 @@
     config->setReverse(ui.chkReverse->isChecked());
     config->setStyle((psd_gradient_style)ui.cmbStyle->currentIndex());
     config->setAlignWithLayer(ui.chkAlignWithLayer->isChecked());
-    config->setAngle(ui.dialAngle->value());
+    config->setAngle(ui.angleSelector->value());
     config->setScale(ui.intScale->value());
 }
 
-void GradientOverlay::slotDialAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.intAngle);
-    ui.intAngle->setValue(value);
-}
-
-void GradientOverlay::slotIntAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.dialAngle);
-    ui.dialAngle->setValue(value);
-}
 
 /********************************************************************/
 /***** Innner Glow      *********************************************/
@@ -1264,15 +1186,11 @@
     ui.intSize->setRange(0, 250);
     ui.intSize->setSuffix(i18n(" px"));
 
-    connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int)));
-    connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int)));
-
     connect(ui.cmbCompositeOp, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
     connect(ui.bnColor, SIGNAL(changed(KoColor)), SIGNAL(configChanged()));
     connect(ui.intOpacity, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
 
-    connect(ui.dialAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
-    connect(ui.intAngle, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
+    connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
     connect(ui.intDistance, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
     connect(ui.intSize, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
 
@@ -1282,28 +1200,15 @@
 
 }
 
-void Satin::slotDialAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.intAngle);
-    ui.intAngle->setValue(value);
-}
-
-void Satin::slotIntAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.dialAngle);
-    ui.dialAngle->setValue(value);
-}
-
 void Satin::setSatin(const psd_layer_effects_satin *satin)
 {
     ui.cmbCompositeOp->selectCompositeOp(KoID(satin->blendMode()));
     KoColor color(KoColorSpaceRegistry::instance()->rgb8());
     color.fromQColor(satin->color());
     ui.bnColor->setColor(color);
     ui.intOpacity->setValue(satin->opacity());
 
-    ui.dialAngle->setValue(satin->angle());
-    ui.intAngle->setValue(satin->angle());
+    ui.angleSelector->setValue(satin->angle());
 
     ui.intDistance->setValue(satin->distance());
     ui.intSize->setValue(satin->size());
@@ -1322,7 +1227,7 @@
     satin->setOpacity(ui.intOpacity->value());
     satin->setColor(ui.bnColor->color().toQColor());
 
-    satin->setAngle(ui.dialAngle->value());
+    satin->setAngle(ui.angleSelector->value());
 
     satin->setDistance(ui.intDistance->value());
     satin->setSize(ui.intSize->value());
@@ -1370,31 +1275,18 @@
     connect(ui.chkReverse, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
     connect(ui.cmbStyle, SIGNAL(currentIndexChanged(int)), SIGNAL(configChanged()));
     connect(ui.chkAlignWithLayer, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
-    connect(ui.dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int)));
-    connect(ui.intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int)));
     connect(ui.intScale, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
 
+    connect(ui.angleSelector, SIGNAL(configChanged()), SIGNAL(configChanged()));
+
     connect(ui.patternChooser, SIGNAL(resourceSelected(KoResource*)), SIGNAL(configChanged()));
     connect(ui.chkLinkWithLayer, SIGNAL(toggled(bool)), SIGNAL(configChanged()));
     connect(ui.intScale_2, SIGNAL(valueChanged(int)), SIGNAL(configChanged()));
 
     // cold initialization
     ui.fillStack->setCurrentIndex(ui.cmbFillType->currentIndex());
 }
 
-void Stroke::slotDialAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.intAngle);
-    ui.intAngle->setValue(value);
-}
-
-void Stroke::slotIntAngleChanged(int value)
-{
-    KisSignalsBlocker b(ui.dialAngle);
-    ui.dialAngle->setValue(value);
-}
-
-
 void Stroke::setStroke(const psd_layer_effects_stroke *stroke)
 {
 
@@ -1418,8 +1310,7 @@
     ui.chkReverse->setChecked(stroke->antiAliased());
     ui.cmbStyle->setCurrentIndex((int)stroke->style());
     ui.chkAlignWithLayer->setCheckable(stroke->alignWithLayer());
-    ui.dialAngle->setValue(stroke->angle());
-    ui.intAngle->setValue(stroke->angle());
+    ui.angleSelector->setValue(stroke->angle());
     ui.intScale->setValue(stroke->scale());
 
     ui.patternChooser->setCurrentPattern(stroke->pattern());
@@ -1443,7 +1334,7 @@
     stroke->setReverse(ui.chkReverse->isChecked());
     stroke->setStyle((psd_gradient_style)ui.cmbStyle->currentIndex());
     stroke->setAlignWithLayer(ui.chkAlignWithLayer->isChecked());
-    stroke->setAngle(ui.dialAngle->value());
+    stroke->setAngle(ui.angleSelector->value());
     stroke->setScale(ui.intScale->value());
 
     stroke->setPattern(static_cast<KoPattern*>(ui.patternChooser->currentResource()));
diff --git a/libs/ui/layerstyles/WdgGradientOverlay.ui b/libs/ui/layerstyles/WdgGradientOverlay.ui
--- a/libs/ui/layerstyles/WdgGradientOverlay.ui
+++ b/libs/ui/layerstyles/WdgGradientOverlay.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>411</width>
-    <height>294</height>
+    <width>473</width>
+    <height>358</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -171,41 +171,11 @@
             <string>&amp;Angle:</string>
            </property>
            <property name="buddy">
-            <cstring>dialAngle</cstring>
+            <cstring>angleSelector</cstring>
            </property>
           </widget>
          </item>
-         <item row="4" column="1">
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
-           <item>
-            <widget class="QDial" name="dialAngle">
-             <property name="toolTip">
-              <string>Set the angle of the light source</string>
-             </property>
-             <property name="minimum">
-              <number>-179</number>
-             </property>
-             <property name="maximum">
-              <number>180</number>
-             </property>
-             <property name="wrapping">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="KisIntParseSpinBox" name="intAngle">
-             <property name="minimum">
-              <number>-179</number>
-             </property>
-             <property name="maximum">
-              <number>180</number>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="5" column="0">
+         <item row="6" column="0">
           <widget class="QLabel" name="label_8">
            <property name="text">
             <string>S&amp;cale:</string>
@@ -215,7 +185,7 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="1">
+         <item row="6" column="1">
           <widget class="KisSliderSpinBox" name="intScale" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -228,6 +198,33 @@
            </property>
           </widget>
          </item>
+         <item row="4" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="KisLayerStyleAngleSelector" name="angleSelector" native="true">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
         </layout>
         <zorder>label_6</zorder>
         <zorder>intScale</zorder>
@@ -259,11 +256,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KisIntParseSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>kis_int_parse_spin_box.h</header>
-  </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
@@ -275,6 +267,12 @@
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
+  <customwidget>
+   <class>KisLayerStyleAngleSelector</class>
+   <extends>QWidget</extends>
+   <header>KisLayerStyleAngleSelector.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>KisCmbGradient</class>
    <extends>QToolButton</extends>
diff --git a/libs/ui/layerstyles/WdgSatin.ui b/libs/ui/layerstyles/WdgSatin.ui
--- a/libs/ui/layerstyles/WdgSatin.ui
+++ b/libs/ui/layerstyles/WdgSatin.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>345</height>
+    <height>429</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -89,49 +89,16 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
-          <layout class="QHBoxLayout" name="horizontalLayout_2"/>
-         </item>
-         <item row="3" column="0">
+         <item row="2" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
             <string>An&amp;gle:</string>
            </property>
            <property name="buddy">
-            <cstring>dialAngle</cstring>
+            <cstring>angleSelector</cstring>
            </property>
           </widget>
          </item>
-         <item row="3" column="1">
-          <layout class="QHBoxLayout" name="horizontalLayout_3">
-           <item>
-            <widget class="QDial" name="dialAngle">
-             <property name="toolTip">
-              <string>Set the angle of the light source</string>
-             </property>
-             <property name="minimum">
-              <number>-179</number>
-             </property>
-             <property name="maximum">
-              <number>180</number>
-             </property>
-             <property name="wrapping">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="KisIntParseSpinBox" name="intAngle">
-             <property name="minimum">
-              <number>-179</number>
-             </property>
-             <property name="maximum">
-              <number>180</number>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
          <item row="4" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
@@ -199,6 +166,33 @@
            </property>
           </widget>
          </item>
+         <item row="2" column="1">
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <widget class="KisLayerStyleAngleSelector" name="angleSelector" native="true">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
         </layout>
         <zorder>cmbContour</zorder>
         <zorder>chkAntiAliased</zorder>
@@ -214,21 +208,8 @@
         <zorder>chkInvert</zorder>
        </widget>
       </item>
-      <item row="2" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item row="1" column="0">
-       <spacer name="verticalSpacer_2">
+       <spacer name="verticalSpacer">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
         </property>
@@ -251,11 +232,6 @@
    <extends>QPushButton</extends>
    <header>kis_color_button.h</header>
   </customwidget>
-  <customwidget>
-   <class>KisIntParseSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>kis_int_parse_spin_box.h</header>
-  </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
@@ -267,6 +243,12 @@
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
+  <customwidget>
+   <class>KisLayerStyleAngleSelector</class>
+   <extends>QWidget</extends>
+   <header>KisLayerStyleAngleSelector.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>KisCmbContour</class>
    <extends>QWidget</extends>
diff --git a/libs/ui/layerstyles/WdgStroke.ui b/libs/ui/layerstyles/WdgStroke.ui
--- a/libs/ui/layerstyles/WdgStroke.ui
+++ b/libs/ui/layerstyles/WdgStroke.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>406</width>
-    <height>642</height>
+    <width>457</width>
+    <height>781</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -149,7 +149,7 @@
          <item>
           <widget class="QStackedWidget" name="fillStack">
            <property name="currentIndex">
-            <number>0</number>
+            <number>1</number>
            </property>
            <widget class="QWidget" name="page_3">
             <layout class="QFormLayout" name="formLayout_2">
@@ -264,41 +264,11 @@
                 <string>&amp;Angle:</string>
                </property>
                <property name="buddy">
-                <cstring>dialAngle</cstring>
+                <cstring>angleSelector</cstring>
                </property>
               </widget>
              </item>
-             <item row="2" column="1">
-              <layout class="QHBoxLayout" name="horizontalLayout_2">
-               <item>
-                <widget class="QDial" name="dialAngle">
-                 <property name="toolTip">
-                  <string>Set the angle of the light source</string>
-                 </property>
-                 <property name="minimum">
-                  <number>-179</number>
-                 </property>
-                 <property name="maximum">
-                  <number>180</number>
-                 </property>
-                 <property name="wrapping">
-                  <bool>true</bool>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="KisIntParseSpinBox" name="intAngle">
-                 <property name="minimum">
-                  <number>-179</number>
-                 </property>
-                 <property name="maximum">
-                  <number>180</number>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item row="3" column="0">
+             <item row="4" column="0">
               <widget class="QLabel" name="label_8">
                <property name="text">
                 <string>S&amp;cale:</string>
@@ -308,7 +278,7 @@
                </property>
               </widget>
              </item>
-             <item row="3" column="1">
+             <item row="4" column="1">
               <widget class="KisSliderSpinBox" name="intScale" native="true">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -321,6 +291,33 @@
                </property>
               </widget>
              </item>
+             <item row="2" column="1">
+              <layout class="QHBoxLayout" name="horizontalLayout">
+               <item>
+                <widget class="KisLayerStyleAngleSelector" name="angleSelector" native="true">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
             </layout>
            </widget>
            <widget class="QWidget" name="page_2">
@@ -399,19 +396,27 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KisColorButton</class>
    <extends>QPushButton</extends>
    <header>kis_color_button.h</header>
   </customwidget>
-  <customwidget>
-   <class>KisIntParseSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>kis_int_parse_spin_box.h</header>
-  </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
@@ -423,6 +428,12 @@
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
+  <customwidget>
+   <class>KisLayerStyleAngleSelector</class>
+   <extends>QWidget</extends>
+   <header>KisLayerStyleAngleSelector.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>KisCmbGradient</class>
    <extends>QToolButton</extends>
diff --git a/libs/ui/layerstyles/wdgBevelAndEmboss.ui b/libs/ui/layerstyles/wdgBevelAndEmboss.ui
--- a/libs/ui/layerstyles/wdgBevelAndEmboss.ui
+++ b/libs/ui/layerstyles/wdgBevelAndEmboss.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>399</width>
-    <height>541</height>
+    <width>453</width>
+    <height>669</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -128,6 +128,9 @@
            <property name="text">
             <string comment="@label:listbox Bevel direction">Direction:</string>
            </property>
+           <property name="buddy">
+            <cstring>cmbDirection</cstring>
+           </property>
           </widget>
          </item>
          <item row="3" column="1">
@@ -198,78 +201,44 @@
         <property name="title">
          <string>Shading</string>
         </property>
-        <layout class="QGridLayout" name="gridLayout_3">
-         <item row="0" column="0" colspan="3">
-          <layout class="QGridLayout" name="gridLayout">
-           <item row="0" column="0">
-            <widget class="QLabel" name="label_7">
-             <property name="text">
-              <string>&amp;Angle:</string>
-             </property>
-             <property name="buddy">
-              <cstring>dialAngle</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1" rowspan="2">
-            <widget class="QDial" name="dialAngle">
-             <property name="toolTip">
-              <string>Set the angle of the light source</string>
-             </property>
-             <property name="minimum">
-              <number>-179</number>
-             </property>
-             <property name="maximum">
-              <number>180</number>
-             </property>
-             <property name="wrapping">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="2">
-            <widget class="KisIntParseSpinBox" name="intAngle">
-             <property name="minimum">
-              <number>-179</number>
-             </property>
-             <property name="maximum">
-              <number>180</number>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>18</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-           <item row="1" column="2">
-            <widget class="QCheckBox" name="chkUseGlobalLight">
-             <property name="text">
-              <string>Use &amp;Global Light</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
+        <layout class="QFormLayout" name="formLayout_2">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_7">
+           <property name="text">
+            <string>&amp;Angle:</string>
+           </property>
+           <property name="buddy">
+            <cstring>angleSelector</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="KisLayerStyleAngleSelector" name="angleSelector" native="true"/>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_8">
+           <property name="text">
+            <string>A&amp;ltitude:</string>
+           </property>
+           <property name="buddy">
+            <cstring>intAltitude</cstring>
+           </property>
+          </widget>
          </item>
-         <item row="1" column="2">
+         <item row="1" column="1">
           <widget class="KisIntParseSpinBox" name="intAltitude">
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
            <property name="minimum">
             <number>-179</number>
            </property>
            <property name="maximum">
             <number>180</number>
            </property>
           </widget>
          </item>
-         <item row="2" column="1">
+         <item row="2" column="0">
           <widget class="QLabel" name="label_9">
            <property name="text">
             <string>&amp;Gloss Contour:</string>
@@ -279,7 +248,7 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="2">
+         <item row="2" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <item>
             <widget class="QComboBox" name="cmbContour"/>
@@ -293,7 +262,7 @@
            </item>
           </layout>
          </item>
-         <item row="3" column="0" colspan="2">
+         <item row="3" column="0">
           <widget class="QLabel" name="label_10">
            <property name="text">
             <string>H&amp;ighlight Mode:</string>
@@ -303,7 +272,7 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="2">
+         <item row="3" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
             <widget class="KisCompositeOpComboBox" name="cmbHighlightMode">
@@ -321,20 +290,17 @@
            </item>
           </layout>
          </item>
-         <item row="4" column="0" colspan="2">
+         <item row="4" column="0">
           <widget class="QLabel" name="label_14">
            <property name="text">
             <string>&amp;Opacity:</string>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
            <property name="buddy">
             <cstring>intOpacity</cstring>
            </property>
           </widget>
          </item>
-         <item row="4" column="2">
+         <item row="4" column="1">
           <widget class="KisSliderSpinBox" name="intOpacity" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
@@ -356,7 +322,17 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="2">
+         <item row="5" column="0">
+          <widget class="QLabel" name="label_11">
+           <property name="text">
+            <string>Sh&amp;adow Mode:</string>
+           </property>
+           <property name="buddy">
+            <cstring>cmbShadowMode</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="1">
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <item>
             <widget class="KisCompositeOpComboBox" name="cmbShadowMode">
@@ -374,20 +350,17 @@
            </item>
           </layout>
          </item>
-         <item row="6" column="0" colspan="2">
+         <item row="6" column="0">
           <widget class="QLabel" name="label_15">
            <property name="text">
             <string>&amp;Opacity:</string>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
            <property name="buddy">
             <cstring>intOpacity2</cstring>
            </property>
           </widget>
          </item>
-         <item row="6" column="2">
+         <item row="6" column="1">
           <widget class="KisSliderSpinBox" name="intOpacity2" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
@@ -409,29 +382,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0" colspan="2">
-          <widget class="QLabel" name="label_8">
-           <property name="text">
-            <string>Altitude:</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-           <property name="buddy">
-            <cstring>dialAngle</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="0" colspan="2">
-          <widget class="QLabel" name="label_11">
-           <property name="text">
-            <string>Sh&amp;adow Mode:</string>
-           </property>
-           <property name="buddy">
-            <cstring>cmbShadowMode</cstring>
-           </property>
-          </widget>
-         </item>
         </layout>
        </widget>
       </item>
@@ -454,16 +404,16 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>KisColorButton</class>
-   <extends>QPushButton</extends>
-   <header>kis_color_button.h</header>
-  </customwidget>
   <customwidget>
    <class>KisIntParseSpinBox</class>
    <extends>QSpinBox</extends>
    <header>kis_int_parse_spin_box.h</header>
   </customwidget>
+  <customwidget>
+   <class>KisColorButton</class>
+   <extends>QPushButton</extends>
+   <header>kis_color_button.h</header>
+  </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
@@ -475,6 +425,12 @@
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
+  <customwidget>
+   <class>KisLayerStyleAngleSelector</class>
+   <extends>QWidget</extends>
+   <header>KisLayerStyleAngleSelector.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/libs/ui/layerstyles/wdgKisLayerStyleAngleSelector.ui b/libs/ui/layerstyles/wdgKisLayerStyleAngleSelector.ui
new file mode 100644
--- /dev/null
+++ b/libs/ui/layerstyles/wdgKisLayerStyleAngleSelector.ui
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WdgKisLayerStyleAngleSelector</class>
+ <widget class="QWidget" name="WdgKisLayerStyleAngleSelector">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>273</width>
+    <height>76</height>
+   </rect>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QDial" name="dialAngle">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="toolTip">
+      <string>Set the angle of the light source</string>
+     </property>
+     <property name="minimum">
+      <number>0</number>
+     </property>
+     <property name="maximum">
+      <number>360</number>
+     </property>
+     <property name="value">
+      <number>0</number>
+     </property>
+     <property name="invertedAppearance">
+      <bool>true</bool>
+     </property>
+     <property name="wrapping">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="KisIntParseSpinBox" name="intAngle">
+       <property name="wrapping">
+        <bool>true</bool>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="suffix">
+        <string>˚</string>
+       </property>
+       <property name="minimum">
+        <number>-179</number>
+       </property>
+       <property name="maximum">
+        <number>180</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="chkUseGlobalLight">
+       <property name="text">
+        <string>Use global light</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KisIntParseSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>kis_int_parse_spin_box.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/libs/ui/layerstyles/wdgdropshadow.ui b/libs/ui/layerstyles/wdgdropshadow.ui
--- a/libs/ui/layerstyles/wdgdropshadow.ui
+++ b/libs/ui/layerstyles/wdgdropshadow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>435</width>
-    <height>390</height>
+    <width>491</width>
+    <height>495</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -17,6 +17,19 @@
       <string>Drop Shadow</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <item row="3" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
       <item row="2" column="0">
        <widget class="QCheckBox" name="chkLayerKnocksOutDropShadow">
         <property name="toolTip">
@@ -96,16 +109,6 @@
          <string>Structure</string>
         </property>
         <layout class="QGridLayout" name="gridLayout_3">
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_13">
-           <property name="text">
-            <string>&amp;Blend Mode:</string>
-           </property>
-           <property name="buddy">
-            <cstring>cmbCompositeOp</cstring>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="1">
           <widget class="KisCompositeOpComboBox" name="cmbCompositeOp">
            <property name="sizePolicy">
@@ -119,19 +122,19 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="2">
-          <widget class="KisColorButton" name="bnColor"/>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_14">
-           <property name="text">
-            <string>Opaci&amp;ty:</string>
-           </property>
-           <property name="buddy">
-            <cstring>intOpacity</cstring>
+         <item row="4" column="1" colspan="2">
+          <widget class="KisSliderSpinBox" name="intDistance" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
            </property>
           </widget>
          </item>
+         <item row="0" column="2">
+          <widget class="KisColorButton" name="bnColor"/>
+         </item>
          <item row="1" column="1" colspan="2">
           <widget class="KisSliderSpinBox" name="intOpacity" native="true">
            <property name="sizePolicy">
@@ -154,57 +157,7 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="label">
-           <property name="text">
-            <string>An&amp;gle:</string>
-           </property>
-           <property name="buddy">
-            <cstring>dialAngle</cstring>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1" colspan="2">
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <item>
-            <widget class="QDial" name="dialAngle">
-             <property name="toolTip">
-              <string>Set the angle of the light source</string>
-             </property>
-             <property name="minimum">
-              <number>-179</number>
-             </property>
-             <property name="maximum">
-              <number>180</number>
-             </property>
-             <property name="wrapping">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="KisIntParseSpinBox" name="intAngle">
-             <property name="minimum">
-              <number>-179</number>
-             </property>
-             <property name="maximum">
-              <number>180</number>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QCheckBox" name="chkUseGlobalLight">
-             <property name="toolTip">
-              <string>Use current setting for global light source</string>
-             </property>
-             <property name="text">
-              <string>Use &amp;Global light</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="3" column="0">
+         <item row="4" column="0">
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>&amp;Distance:</string>
@@ -214,17 +167,37 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="1" colspan="2">
-          <widget class="KisSliderSpinBox" name="intDistance" native="true">
+         <item row="6" column="1" colspan="2">
+          <widget class="KisSliderSpinBox" name="intSize" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_14">
+           <property name="text">
+            <string>Opaci&amp;ty:</string>
+           </property>
+           <property name="buddy">
+            <cstring>intOpacity</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>An&amp;gle:</string>
+           </property>
+           <property name="buddy">
+            <cstring>angleSelector</cstring>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
           <widget class="QLabel" name="lblSpread">
            <property name="text">
             <string>Sp&amp;read:</string>
@@ -234,7 +207,7 @@
            </property>
           </widget>
          </item>
-         <item row="4" column="1" colspan="2">
+         <item row="5" column="1" colspan="2">
           <widget class="KisSliderSpinBox" name="intSpread" native="true">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -244,7 +217,7 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="0">
+         <item row="6" column="0">
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>S&amp;ize:</string>
@@ -254,32 +227,22 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="1" colspan="2">
-          <widget class="KisSliderSpinBox" name="intSize" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_13">
+           <property name="text">
+            <string>&amp;Blend Mode:</string>
+           </property>
+           <property name="buddy">
+            <cstring>cmbCompositeOp</cstring>
            </property>
           </widget>
          </item>
+         <item row="3" column="1" colspan="2">
+          <widget class="KisLayerStyleAngleSelector" name="angleSelector" native="true"/>
+         </item>
         </layout>
        </widget>
       </item>
-      <item row="3" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
@@ -291,11 +254,6 @@
    <extends>QPushButton</extends>
    <header>kis_color_button.h</header>
   </customwidget>
-  <customwidget>
-   <class>KisIntParseSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>kis_int_parse_spin_box.h</header>
-  </customwidget>
   <customwidget>
    <class>KisSliderSpinBox</class>
    <extends>QWidget</extends>
@@ -307,6 +265,12 @@
    <extends>QComboBox</extends>
    <header location="global">kis_cmb_composite.h</header>
   </customwidget>
+  <customwidget>
+   <class>KisLayerStyleAngleSelector</class>
+   <extends>QWidget</extends>
+   <header>KisLayerStyleAngleSelector.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>KisCmbContour</class>
    <extends>QWidget</extends>
diff --git a/libs/ui/widgets/KisLayerStyleAngleSelector.h b/libs/ui/widgets/KisLayerStyleAngleSelector.h
new file mode 100644
--- /dev/null
+++ b/libs/ui/widgets/KisLayerStyleAngleSelector.h
@@ -0,0 +1,68 @@
+/*
+ *  Copyright (c) 2018 Anna Medonosova <anna.medonosova@gmail.com>
+ *
+ *  This library is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; version 2.1 of the License.
+ *
+ *  This library 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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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.
+ */
+
+#ifndef KISLAYERSTYLEANGLESELECTOR_H
+#define KISLAYERSTYLEANGLESELECTOR_H
+
+#include <QObject>
+#include <QWidget>
+#include <QDial>
+
+#include <ui_wdgKisLayerStyleAngleSelector.h>
+
+class KisLayerStyleAngleSelector : public QWidget
+{
+    Q_OBJECT
+
+public:
+    KisLayerStyleAngleSelector(QWidget* parent);
+
+    int value();
+    void setValue(int value);
+
+    void enableGlobalLight(bool enable);
+
+    bool useGlobalLight();
+    void setUseGlobalLight(bool state);
+
+Q_SIGNALS:
+    void valueChanged(int);
+    void configChanged();
+    void globalAngleChanged(int);
+
+private Q_SLOTS:
+    void slotDialAngleChanged(int value);
+    void slotIntAngleChanged(int value);
+    void slotGlobalLightToggled();
+
+private:
+    void emitChangeSignals();
+
+    Ui_WdgKisLayerStyleAngleSelector* ui;
+
+    // BUG: 372169
+    // Adobe's dial widget differs from QDial by 90 degrees,
+    // therefore we need to apply this magic constant
+    // to this widget's QDial for consistency between
+    // the settings dialogs and on-canvas effects.
+    // Wrapping is handled by QDial itself.
+    const static int m_dialValueShift = 90;
+
+    bool m_enableGlobalLight;
+};
+
+#endif // KISLAYERSTYLEANGLESELECTOR_H
diff --git a/libs/ui/widgets/KisLayerStyleAngleSelector.cpp b/libs/ui/widgets/KisLayerStyleAngleSelector.cpp
new file mode 100644
--- /dev/null
+++ b/libs/ui/widgets/KisLayerStyleAngleSelector.cpp
@@ -0,0 +1,117 @@
+/*
+ *  Copyright (c) 2018 Anna Medonosova <anna.medonosova@gmail.com>
+ *
+ *  This library is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; version 2.1 of the License.
+ *
+ *  This library 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 Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser 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 "KisLayerStyleAngleSelector.h"
+
+#include <QWidget>
+#include <QDial>
+
+#include <kis_signals_blocker.h>
+
+KisLayerStyleAngleSelector::KisLayerStyleAngleSelector(QWidget *parent)
+    : QWidget(parent)
+    , m_enableGlobalLight(false)
+{
+    ui = new Ui_WdgKisLayerStyleAngleSelector();
+    ui->setupUi(this);
+
+    ui->chkUseGlobalLight->hide();
+
+    connect(ui->dialAngle, SIGNAL(valueChanged(int)), SLOT(slotDialAngleChanged(int)));
+    connect(ui->intAngle, SIGNAL(valueChanged(int)), SLOT(slotIntAngleChanged(int)));
+}
+
+int KisLayerStyleAngleSelector::value()
+{
+    return ui->intAngle->value();
+}
+
+void KisLayerStyleAngleSelector::setValue(int value)
+{
+    KisSignalsBlocker intB(ui->intAngle);
+    KisSignalsBlocker dialB(ui->dialAngle);
+
+    ui->intAngle->setValue(value);
+    ui->dialAngle->setValue(value + m_dialValueShift);
+}
+
+void KisLayerStyleAngleSelector::enableGlobalLight(bool enable)
+{
+    m_enableGlobalLight = enable;
+
+    if (enable) {
+        ui->chkUseGlobalLight->show();
+        connect(ui->chkUseGlobalLight, SIGNAL(toggled(bool)), SLOT(slotGlobalLightToggled()));
+    } else {
+        ui->chkUseGlobalLight->hide();
+        disconnect(ui->chkUseGlobalLight, SIGNAL(toggled(bool)), this, SLOT(slotGlobalLightToggled()));
+    }
+}
+
+bool KisLayerStyleAngleSelector::useGlobalLight()
+{
+    return m_enableGlobalLight && ui->chkUseGlobalLight->isChecked();
+}
+
+void KisLayerStyleAngleSelector::setUseGlobalLight(bool state)
+{
+    ui->chkUseGlobalLight->setChecked(state);
+}
+
+void KisLayerStyleAngleSelector::slotDialAngleChanged(int value)
+{
+    KisSignalsBlocker b(ui->intAngle);
+
+    int normalizedValue = 0;
+    if (value >= 270 && value <= 360) {
+        // Due to the mismatch between the domain of the dial (0°,360°)
+        // and the spinbox (-179°,180°), the shift in the third quadrant
+        // of the dial is different
+        normalizedValue = value - 360 - m_dialValueShift;
+    } else {
+        normalizedValue = value - m_dialValueShift;
+    }
+
+    ui->intAngle->setValue(normalizedValue);
+    emit valueChanged(normalizedValue);
+    emitChangeSignals();
+}
+
+void KisLayerStyleAngleSelector::slotIntAngleChanged(int value)
+{
+    KisSignalsBlocker b(ui->dialAngle);
+
+    int angleDialValue = value + m_dialValueShift;
+    ui->dialAngle->setValue(angleDialValue);
+
+    emit valueChanged(value);
+    emitChangeSignals();
+}
+
+void KisLayerStyleAngleSelector::slotGlobalLightToggled()
+{
+    emitChangeSignals();
+}
+
+void KisLayerStyleAngleSelector::emitChangeSignals()
+{
+    if (useGlobalLight()) {
+        emit globalAngleChanged(value());
+    }
+
+    emit configChanged();
+}