diff --git a/src/gui/effects/qgspainteffectwidget.cpp b/src/gui/effects/qgspainteffectwidget.cpp
index 74039f9267e..633d9885741 100644
--- a/src/gui/effects/qgspainteffectwidget.cpp
+++ b/src/gui/effects/qgspainteffectwidget.cpp
@@ -235,6 +235,7 @@ QgsShadowEffectWidget::QgsShadowEffectWidget( QWidget *parent )
   mShadowColorBtn->setAllowOpacity( false );
   mShadowColorBtn->setColorDialogTitle( tr( "Select shadow color" ) );
   mShadowColorBtn->setContext( QStringLiteral( "symbology" ) );
+  mShadowOffsetAngleSpnBx->setClearValue( 0 );
 
   mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits
                                << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
diff --git a/src/gui/symbology-ng/qgs25drendererwidget.cpp b/src/gui/symbology-ng/qgs25drendererwidget.cpp
index e2aa859db42..1bd2754577e 100644
--- a/src/gui/symbology-ng/qgs25drendererwidget.cpp
+++ b/src/gui/symbology-ng/qgs25drendererwidget.cpp
@@ -40,6 +40,7 @@ Qgs25DRendererWidget::Qgs25DRendererWidget( QgsVectorLayer *layer, QgsStyle *sty
   setupUi( this );
   this->layout()->setContentsMargins( 0, 0, 0, 0 );
 
+  mAngleWidget->setClearValue( 0 );
   mWallColorButton->setColorDialogTitle( tr( "Select wall color" ) );
   mWallColorButton->setAllowOpacity( true );
   mWallColorButton->setContext( QStringLiteral( "symbology" ) );
diff --git a/src/ui/effects/widget_shadoweffect.ui b/src/ui/effects/widget_shadoweffect.ui
index 158fbbec699..1e45cf77b05 100644
--- a/src/ui/effects/widget_shadoweffect.ui
+++ b/src/ui/effects/widget_shadoweffect.ui
@@ -174,14 +174,17 @@
           </item>
           <item>
            <widget class="QgsSpinBox" name="mShadowOffsetAngleSpnBx">
+            <property name="wrapping">
+             <bool>true</bool>
+            </property>
             <property name="suffix">
              <string>˚</string>
             </property>
             <property name="minimum">
-             <number>-180</number>
+             <number>-360</number>
             </property>
             <property name="maximum">
-             <number>180</number>
+             <number>360</number>
             </property>
             <property name="showClearButton" stdset="0">
              <bool>false</bool>
@@ -249,11 +252,6 @@
    <extends>QComboBox</extends>
    <header>qgsblendmodecombobox.h</header>
   </customwidget>
-  <customwidget>
-   <class>QgsEffectDrawModeComboBox</class>
-   <extends>QComboBox</extends>
-   <header>qgseffectdrawmodecombobox.h</header>
-  </customwidget>
   <customwidget>
    <class>QgsUnitSelectionWidget</class>
    <extends>QWidget</extends>
@@ -266,6 +264,11 @@
    <header>qgsopacitywidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsEffectDrawModeComboBox</class>
+   <extends>QComboBox</extends>
+   <header>qgseffectdrawmodecombobox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>mShadowOffsetAngleDial</tabstop>
diff --git a/src/ui/qgstextformatwidgetbase.ui b/src/ui/qgstextformatwidgetbase.ui
index e469af35d9f..0b2abe2013e 100755
--- a/src/ui/qgstextformatwidgetbase.ui
+++ b/src/ui/qgstextformatwidgetbase.ui
@@ -6572,7 +6572,6 @@ font-style: italic;</string>
   <tabstop>mPointOffsetUnitWidget</tabstop>
   <tabstop>mPointOffsetUnitsDDBtn</tabstop>
   <tabstop>mPointAngleSpinBox</tabstop>
-  <tabstop>mPointAngleDDBtn</tabstop>
   <tabstop>mRepeatDistanceSpinBox</tabstop>
   <tabstop>mRepeatDistanceDDBtn</tabstop>
   <tabstop>mRepeatDistanceUnitWidget</tabstop>
diff --git a/src/ui/raster/qgshillshaderendererwidget.ui b/src/ui/raster/qgshillshaderendererwidget.ui
index 8d03236f423..38b57ba37c8 100644
--- a/src/ui/raster/qgshillshaderendererwidget.ui
+++ b/src/ui/raster/qgshillshaderendererwidget.ui
@@ -58,6 +58,9 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="suffix">
+        <string>˚</string>
+       </property>
       </widget>
      </item>
     </layout>
@@ -65,14 +68,14 @@
    <item row="1" column="0" colspan="2">
     <widget class="QLabel" name="label_2">
      <property name="text">
-      <string>Altitude (degrees)</string>
+      <string>Altitude</string>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Azimuth (degrees)</string>
+      <string>Azimuth</string>
      </property>
     </widget>
    </item>
@@ -91,6 +94,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="suffix">
+      <string>˚</string>
+     </property>
      <property name="singleStep">
       <double>5.000000000000000</double>
      </property>
diff --git a/src/ui/symbollayer/qgs25drendererwidgetbase.ui b/src/ui/symbollayer/qgs25drendererwidgetbase.ui
index 98cfc40d7d9..d4ac57f857a 100644
--- a/src/ui/symbollayer/qgs25drendererwidgetbase.ui
+++ b/src/ui/symbollayer/qgs25drendererwidgetbase.ui
@@ -115,10 +115,16 @@
     <widget class="QgsFieldExpressionWidget" name="mHeightWidget" native="true"/>
    </item>
    <item row="1" column="1">
-    <widget class="QSpinBox" name="mAngleWidget">
+    <widget class="QgsSpinBox" name="mAngleWidget">
+     <property name="wrapping">
+      <bool>true</bool>
+     </property>
      <property name="suffix">
       <string>°</string>
      </property>
+     <property name="minimum">
+      <number>-360</number>
+     </property>
      <property name="maximum">
       <number>359</number>
      </property>
@@ -137,18 +143,23 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>QgsFieldExpressionWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">qgsfieldexpressionwidget.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QgsColorButton</class>
    <extends>QToolButton</extends>
    <header>qgscolorbutton.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header>qgsspinbox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsFieldExpressionWidget</class>
+   <extends>QWidget</extends>
+   <header>qgsfieldexpressionwidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
index 7e62ead7e35..4b26fe21628 100644
--- a/tests/src/core/testqgsdiagram.cpp
+++ b/tests/src/core/testqgsdiagram.cpp
@@ -153,7 +153,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 5, 5 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsLinearlyInterpolatedDiagramRenderer *dr = new QgsLinearlyInterpolatedDiagramRenderer();
       dr->setLowerValue( 0.0 );
@@ -190,7 +190,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 5, 5 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsLinearlyInterpolatedDiagramRenderer *dr = new QgsLinearlyInterpolatedDiagramRenderer();
       dr->setLowerValue( 0.0 );
@@ -232,7 +232,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 15, 15 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
       dr->setDiagram( new QgsPieDiagram() );
@@ -269,7 +269,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 15, 15 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
       dr->setDiagram( new QgsPieDiagram() );
@@ -306,7 +306,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 15, 15 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
       dr->setDiagram( new QgsPieDiagram() );
@@ -318,7 +318,7 @@ class TestQgsDiagram : public QObject
       dls.setShowAllDiagrams( true );
 
       //setup data defined start angle
-      dls.dataDefinedProperties().setProperty( QgsDiagramLayerSettings::StartAngle, QgsProperty::fromExpression( "\"Importance\"/20.0 * 360.0", true ) );
+      dls.dataDefinedProperties().setProperty( QgsDiagramLayerSettings::StartAngle, QgsProperty::fromExpression( "360.0-\"Importance\"/20.0 * 360.0", true ) );
 
       mPointsLayer->setDiagramLayerSettings( dls );
 
@@ -342,7 +342,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 15, 15 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
       dr->setDiagram( new QgsPieDiagram() );
@@ -378,7 +378,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 15, 15 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
       dr->setDiagram( new QgsPieDiagram() );
@@ -414,7 +414,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 50, 50 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
       dr->setDiagram( new QgsPieDiagram() );
@@ -448,7 +448,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 50, 50 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
       dr->setDiagram( new QgsPieDiagram() );
@@ -484,7 +484,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 50, 50 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
       dr->setDiagram( new QgsPieDiagram() );
@@ -525,7 +525,7 @@ class TestQgsDiagram : public QObject
       ds.scaleByArea = true;
       ds.sizeType = QgsUnitTypes::RenderMillimeters;
       ds.size = QSizeF( 15, 15 );
-      ds.rotationOffset = 270;
+      ds.rotationOffset = 0;
 
       QgsSingleCategoryDiagramRenderer *dr = new QgsSingleCategoryDiagramRenderer();
       dr->setDiagram( new QgsTextDiagram() );