diff --git a/css/80_app.css b/css/80_app.css
index ae5043852..c16a99c53 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -81,6 +81,13 @@ h2 {
     font-weight: bold;
     margin-bottom: 20px;
 }
+.header h2,
+.modal-section h2 {
+    font-size: 20px;
+    line-height: 1.25;
+    font-weight: bold;
+    margin-bottom: 10px;
+}
 
 h3:last-child,
 h2:last-child,
diff --git a/modules/ui/commit.js b/modules/ui/commit.js
index 14a672cf4..b9c6d732f 100644
--- a/modules/ui/commit.js
+++ b/modules/ui/commit.js
@@ -220,7 +220,7 @@ export function uiCommit(context) {
 
         headerTitle
             .append('div')
-            .append('h3')
+            .append('h2')
             .html(t.html('commit.title'));
 
         headerTitle
diff --git a/modules/ui/conflicts.js b/modules/ui/conflicts.js
index 48895284d..11aa8c77f 100644
--- a/modules/ui/conflicts.js
+++ b/modules/ui/conflicts.js
@@ -65,7 +65,7 @@ export function uiConflicts(context) {
             .call(svgIcon('#iD-icon-close'));
 
         headerEnter
-            .append('h3')
+            .append('h2')
             .html(t.html('save.conflict.header'));
 
         var bodyEnter = selection.selectAll('.body')
diff --git a/modules/ui/data_editor.js b/modules/ui/data_editor.js
index 6049788d2..4060e2dbf 100644
--- a/modules/ui/data_editor.js
+++ b/modules/ui/data_editor.js
@@ -33,7 +33,7 @@ export function uiDataEditor(context) {
             .call(svgIcon('#iD-icon-close'));
 
         headerEnter
-            .append('h3')
+            .append('h2')
             .html(t.html('map_data.title'));
 
 
diff --git a/modules/ui/disclosure.js b/modules/ui/disclosure.js
index ce9dd3bb7..474155a3b 100644
--- a/modules/ui/disclosure.js
+++ b/modules/ui/disclosure.js
@@ -30,6 +30,7 @@ export function uiDisclosure(context, key, expandedDefault) {
 
         // enter
         var hideToggleEnter = hideToggle.enter()
+            .append('h3')
             .append('a')
             .attr('role', 'button')
             .attr('href', '#')
diff --git a/modules/ui/entity_editor.js b/modules/ui/entity_editor.js
index dcab31072..4b40df625 100644
--- a/modules/ui/entity_editor.js
+++ b/modules/ui/entity_editor.js
@@ -58,13 +58,13 @@ export function uiEntityEditor(context) {
             .call(svgIcon(_modified ? '#iD-icon-apply' : '#iD-icon-close'));
 
         headerEnter
-            .append('h3');
+            .append('h2');
 
         // Update
         header = header
             .merge(headerEnter);
 
-        header.selectAll('h3')
+        header.selectAll('h2')
             .html(_entityIDs.length === 1 ? t.html('inspector.edit') : t.html('inspector.edit_features'));
 
         header.selectAll('.preset-reset')
diff --git a/modules/ui/feature_list.js b/modules/ui/feature_list.js
index f0ccc7d18..aa06a36b7 100644
--- a/modules/ui/feature_list.js
+++ b/modules/ui/feature_list.js
@@ -33,7 +33,7 @@ export function uiFeatureList(context) {
             .attr('class', 'header fillL');
 
         header
-            .append('h3')
+            .append('h2')
             .html(t.html('inspector.feature_list'));
 
         var searchWrap = selection
diff --git a/modules/ui/improveOSM_editor.js b/modules/ui/improveOSM_editor.js
index b61a05610..5a028ca11 100644
--- a/modules/ui/improveOSM_editor.js
+++ b/modules/ui/improveOSM_editor.js
@@ -36,7 +36,7 @@ export function uiImproveOsmEditor(context) {
         .call(svgIcon('#iD-icon-close'));
 
     headerEnter
-      .append('h3')
+      .append('h2')
         .html(t.html('QA.improveOSM.title'));
 
     let body = selection.selectAll('.body')
diff --git a/modules/ui/keepRight_editor.js b/modules/ui/keepRight_editor.js
index b5ef0d3df..70e715969 100644
--- a/modules/ui/keepRight_editor.js
+++ b/modules/ui/keepRight_editor.js
@@ -35,7 +35,7 @@ export function uiKeepRightEditor(context) {
         .call(svgIcon('#iD-icon-close'));
 
     headerEnter
-      .append('h3')
+      .append('h2')
         .html(t.html('QA.keepRight.title'));
 
 
diff --git a/modules/ui/note_editor.js b/modules/ui/note_editor.js
index 86124873d..2c6669352 100644
--- a/modules/ui/note_editor.js
+++ b/modules/ui/note_editor.js
@@ -53,7 +53,7 @@ export function uiNoteEditor(context) {
             .call(svgIcon('#iD-icon-close'));
 
         headerEnter
-            .append('h3')
+            .append('h2')
             .html(t.html('note.title'));
 
 
diff --git a/modules/ui/osmose_editor.js b/modules/ui/osmose_editor.js
index 6e63af635..fc5766aaf 100644
--- a/modules/ui/osmose_editor.js
+++ b/modules/ui/osmose_editor.js
@@ -35,7 +35,7 @@ export function uiOsmoseEditor(context) {
         .call(svgIcon('#iD-icon-close'));
 
     headerEnter
-      .append('h3')
+      .append('h2')
         .html(t.html('QA.osmose.title'));
 
     let body = selection.selectAll('.body')
diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index 4e8714210..74703ce6f 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -34,7 +34,7 @@ export function uiPresetList(context) {
             .attr('class', 'header fillL');
 
         var message = messagewrap
-            .append('h3')
+            .append('h2')
             .html(t.html('inspector.choose'));
 
         var direction = (localizer.textDirection() === 'rtl') ? 'backward' : 'forward';
diff --git a/modules/ui/shortcuts.js b/modules/ui/shortcuts.js
index df50176f5..9a1da42d6 100644
--- a/modules/ui/shortcuts.js
+++ b/modules/ui/shortcuts.js
@@ -26,7 +26,7 @@ export function uiShortcuts(context) {
         content
             .append('div')
             .attr('class', 'modal-section')
-            .append('h3')
+            .append('h2')
             .html(t.html('shortcuts.title'));
 
         fileFetcher.get('shortcuts')
diff --git a/modules/ui/success.js b/modules/ui/success.js
index ae8b3c9be..6a692bb20 100644
--- a/modules/ui/success.js
+++ b/modules/ui/success.js
@@ -81,7 +81,7 @@ export function uiSuccess(context) {
       .attr('class', 'header fillL');
 
     header
-      .append('h3')
+      .append('h2')
       .html(t.html('success.just_edited'));
 
     header