diff --git a/examples/applets/bugreport/contents/ui/main.qml b/examples/applets/bugreport/contents/ui/main.qml
index 5acc61ce2..a6fc69c4b 100644
--- a/examples/applets/bugreport/contents/ui/main.qml
+++ b/examples/applets/bugreport/contents/ui/main.qml
@@ -48,7 +48,8 @@ Item {
             margins: units.largeSpacing
         }
 
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
+            level: 1
             text: i18n("Reporting Bugs")
         }
         PlasmaExtras.Heading {
diff --git a/examples/applets/testcomponents/contents/ui/DialogContent.qml b/examples/applets/testcomponents/contents/ui/DialogContent.qml
index 03f20d832..3c7ec9b62 100644
--- a/examples/applets/testcomponents/contents/ui/DialogContent.qml
+++ b/examples/applets/testcomponents/contents/ui/DialogContent.qml
@@ -40,8 +40,9 @@ Item {
     Column {
         anchors.fill: parent
         spacing: 12
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
             id: tx
+            level: 1
             text: "Test Dialog"
         }
         PlasmaComponents.TextArea {
diff --git a/examples/applets/testcomponents/contents/ui/DialogsPage.qml b/examples/applets/testcomponents/contents/ui/DialogsPage.qml
index afb214da3..af0a59540 100644
--- a/examples/applets/testcomponents/contents/ui/DialogsPage.qml
+++ b/examples/applets/testcomponents/contents/ui/DialogsPage.qml
@@ -35,8 +35,9 @@ PlasmaComponents.Page {
     Column {
         spacing: _s/2
         anchors.fill: parent
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
             width: parent.width
+            level: 1
             text: "Dialogs"
         }
         Row {
diff --git a/examples/applets/testcomponents/contents/ui/DragPage.qml b/examples/applets/testcomponents/contents/ui/DragPage.qml
index 1d878667d..74f61775f 100644
--- a/examples/applets/testcomponents/contents/ui/DragPage.qml
+++ b/examples/applets/testcomponents/contents/ui/DragPage.qml
@@ -39,11 +39,11 @@ PlasmaComponents.Page {
         margins: _s
     }
 
-    PlasmaExtras.Title {
+    PlasmaExtras.Heading {
         id: dlabel
 
         anchors { left: parent.left; right: parent.right; top: parent.top; }
-
+        level: 1
         text: "Drag & Drop"
     }
 
diff --git a/examples/applets/testcomponents/contents/ui/IconsPage.qml b/examples/applets/testcomponents/contents/ui/IconsPage.qml
index 55b6aa2a9..a572ee8e8 100644
--- a/examples/applets/testcomponents/contents/ui/IconsPage.qml
+++ b/examples/applets/testcomponents/contents/ui/IconsPage.qml
@@ -35,9 +35,10 @@ PlasmaComponents.Page {
         anchors.fill: parent
         spacing: _s
 
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
             width: parent.width
             elide: Text.ElideRight
+            level: 1
             text: "Icons"
         }
         PlasmaComponents.Label {
diff --git a/examples/applets/testcomponents/contents/ui/MousePage.qml b/examples/applets/testcomponents/contents/ui/MousePage.qml
index 097f4339f..bb5828c82 100644
--- a/examples/applets/testcomponents/contents/ui/MousePage.qml
+++ b/examples/applets/testcomponents/contents/ui/MousePage.qml
@@ -31,8 +31,9 @@ PlasmaComponents.Page {
         fill: parent
         margins: _s
     }
-    PlasmaExtras.Title {
+    PlasmaExtras.Heading {
         id: mellabel
+        level: 1
         text: "MouseEventListener"
         anchors { left: parent.left; right: parent.right; top: parent.top }
     }
diff --git a/examples/applets/testcomponents/contents/ui/ThemePage.qml b/examples/applets/testcomponents/contents/ui/ThemePage.qml
index 91511ff81..b120b7d64 100644
--- a/examples/applets/testcomponents/contents/ui/ThemePage.qml
+++ b/examples/applets/testcomponents/contents/ui/ThemePage.qml
@@ -41,9 +41,10 @@ PlasmaComponents.Page {
         //anchors.fill: parent
         //spacing: _s / 4
 
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
             width: parent.width
             elide: Text.ElideRight
+            level: 1
             text: "Theme"
         }
 
diff --git a/examples/applets/testtheme/contents/ui/FontTest.qml b/examples/applets/testtheme/contents/ui/FontTest.qml
index a7428f8f0..161e7de72 100644
--- a/examples/applets/testtheme/contents/ui/FontTest.qml
+++ b/examples/applets/testtheme/contents/ui/FontTest.qml
@@ -115,7 +115,7 @@ Column {
             }
         }
 
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
 
             font.weight: lightCheck.checked ? Font.Light : Font.Normal
             font.family: fontCheck.text
diff --git a/examples/applets/testtheme/contents/ui/ScalePage.qml b/examples/applets/testtheme/contents/ui/ScalePage.qml
index 0408308f8..60d4300c9 100644
--- a/examples/applets/testtheme/contents/ui/ScalePage.qml
+++ b/examples/applets/testtheme/contents/ui/ScalePage.qml
@@ -43,9 +43,10 @@ Item {
             right: parent.right
         }
 
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
             width: parent.width
             elide: Text.ElideRight
+            level: 1
             text: "Scaling Test"
             font.pointSize: cheatLabel.font.pointSize * 2
         }
diff --git a/examples/applets/testtheme/contents/ui/UnitsPage.qml b/examples/applets/testtheme/contents/ui/UnitsPage.qml
index 66dc2730e..24cef311f 100644
--- a/examples/applets/testtheme/contents/ui/UnitsPage.qml
+++ b/examples/applets/testtheme/contents/ui/UnitsPage.qml
@@ -40,9 +40,10 @@ Item {
         //anchors.fill: parent
         //spacing: units.smallSpacing/2
 
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
             width: parent.width
             elide: Text.ElideRight
+            level: 1
             text: "Theme & DPI Test"
         }
 
diff --git a/examples/applets/widgetgallery/contents/ui/Typography.qml b/examples/applets/widgetgallery/contents/ui/Typography.qml
index 1e0e60091..d3aa40600 100644
--- a/examples/applets/widgetgallery/contents/ui/Typography.qml
+++ b/examples/applets/widgetgallery/contents/ui/Typography.qml
@@ -32,7 +32,8 @@ PlasmaComponents.Page {
             iconSource: "go-previous"
             onClicked: pageStack.pop()
         }
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
+            level: 1
             text: "Typography"
         }
     }
@@ -55,7 +56,8 @@ PlasmaComponents.Page {
                 }
                 spacing: 12
 
-                PlasmaExtras.Title {
+                PlasmaExtras.Heading {
+                    level: 1
                     text: "A Title"
                 }
 
diff --git a/examples/developerguide/basic/contents/ui/main.qml b/examples/developerguide/basic/contents/ui/main.qml
index 2ea8d4b70..69c940143 100644
--- a/examples/developerguide/basic/contents/ui/main.qml
+++ b/examples/developerguide/basic/contents/ui/main.qml
@@ -42,7 +42,8 @@ Item {
         spacing: units.gridUnit
 
         // A title on top
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
+            level: 1 // from 1 to 5; level 1 is the size used for titles
             text: i18n("Hello Plasma World!")
         }
 
diff --git a/src/declarativeimports/plasmaextracomponents/qml/Heading.qml b/src/declarativeimports/plasmaextracomponents/qml/Heading.qml
index 3056542c3..72b0ed413 100644
--- a/src/declarativeimports/plasmaextracomponents/qml/Heading.qml
+++ b/src/declarativeimports/plasmaextracomponents/qml/Heading.qml
@@ -33,7 +33,7 @@ import org.kde.plasma.components 2.0
  * import org.kde.plasma.extras 2.0 as PlasmaExtras
  * [...]
  * Column {
- *     PlasmaExtras.Title { text: "Fruit sweetness on the rise" }
+ *     PlasmaExtras.Heading { text: "Fruit sweetness on the rise"; level: 1 }
  *     PlasmaExtras.Heading { text: "Apples in the sunlight"; level: 2 }
  *     PlasmaExtras.Paragraph { text: "Long text about fruit and apples [...]" }
  *   [...]
diff --git a/src/declarativeimports/plasmaextracomponents/qml/Paragraph.qml b/src/declarativeimports/plasmaextracomponents/qml/Paragraph.qml
index 9df48ddfa..21d414997 100644
--- a/src/declarativeimports/plasmaextracomponents/qml/Paragraph.qml
+++ b/src/declarativeimports/plasmaextracomponents/qml/Paragraph.qml
@@ -32,7 +32,7 @@ import org.kde.plasma.components 2.0
  * import org.kde.plasma.extras 2.0 as PlasmaExtras
  * [...]
  * Column {
- *     PlasmaExtras.Title { text: "Fruit sweetness on the rise" }
+ *     PlasmaExtras.Heading { text: "Fruit sweetness on the rise"; level: 1 }
  *     PlasmaExtras.Heading { text: "Apples in the sunlight"; level: 2 }
  *     PlasmaExtras.Paragraph { text: "Long text about fruit and apples [...]" }
  *   [...]
diff --git a/templates/plasma-wallpaper-with-qml-extension/package/contents/ui/main.qml b/templates/plasma-wallpaper-with-qml-extension/package/contents/ui/main.qml
index c5fa98491..b302f43f3 100644
--- a/templates/plasma-wallpaper-with-qml-extension/package/contents/ui/main.qml
+++ b/templates/plasma-wallpaper-with-qml-extension/package/contents/ui/main.qml
@@ -38,8 +38,9 @@ Item {
     ColumnLayout {
         anchors.centerIn: parent
 
-        PlasmaExtras.Title {
+        PlasmaExtras.Heading {
             Layout.alignment: Qt.AlignCenter
+            level: 1
             text: wallpaper.configuration.DisplayText ||
                   i18n("<Please configure a text to display>")
         }
diff --git a/templates/plasma-wallpaper/package/contents/ui/main.qml b/templates/plasma-wallpaper/package/contents/ui/main.qml
index ae12574aa..111da8e7d 100644
--- a/templates/plasma-wallpaper/package/contents/ui/main.qml
+++ b/templates/plasma-wallpaper/package/contents/ui/main.qml
@@ -30,8 +30,9 @@ Item {
         color: Theme.backgroundColor
     }
 
-    PlasmaExtras.Title {
+    PlasmaExtras.Heading {
         anchors.centerIn: parent
+        level: 1
         text: wallpaper.configuration.DisplayText ||
               i18n("<Please configure a text to display>")
     }