diff --git a/icons.yml b/icons.yml
index e76ae0bf..49d3ce4c 100644
--- a/icons.yml
+++ b/icons.yml
@@ -6,3 +6,4 @@ icons:
   - navigation/close
   - navigation/menu
   - navigation/more_vert
+  - navigation/expand_more
diff --git a/icons/core_icons.qrc b/icons/core_icons.qrc
index 25aaa6f9..cc21a48f 100644
--- a/icons/core_icons.qrc
+++ b/icons/core_icons.qrc
@@ -3,11 +3,13 @@
 
 <qresource prefix="/icons/navigation">
 	<file alias="arrow_back.svg">navigation_arrow_back.svg</file>
+        <file alias="arrow_drop_down.svg">navigation_arrow_drop_down.svg</file>
 	<file alias="chevron_left.svg">navigation_chevron_left.svg</file>
 	<file alias="chevron_right.svg">navigation_chevron_right.svg</file>
 	<file alias="close.svg">navigation_close.svg</file>
 	<file alias="menu.svg">navigation_menu.svg</file>
 	<file alias="more_vert.svg">navigation_more_vert.svg</file>
+        <file alias="expand_more.svg">navigation_expand_more.svg</file>
 </qresource>
 
-</RCC>
\ No newline at end of file
+</RCC>
diff --git a/icons/navigation_arrow_drop_down.svg b/icons/navigation_arrow_drop_down.svg
new file mode 100644
index 00000000..16f54224
--- /dev/null
+++ b/icons/navigation_arrow_drop_down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M14 20l10 10 10-10z"/></svg>
\ No newline at end of file
diff --git a/icons/navigation_expand_more.svg b/icons/navigation_expand_more.svg
new file mode 100644
index 00000000..64e0965b
--- /dev/null
+++ b/icons/navigation_expand_more.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M33.17 17.17L24 26.34l-9.17-9.17L12 20l12 12 12-12z"/></svg>
\ No newline at end of file
diff --git a/src/listitems/Subheader.qml b/src/listitems/Subheader.qml
index 5e692a00..9af5cab6 100644
--- a/src/listitems/Subheader.qml
+++ b/src/listitems/Subheader.qml
@@ -40,9 +40,7 @@ View {
     Label {
         id: label
 
-        font.pixelSize: 14 * Units.dp
-        font.family: "Roboto"
-        font.weight: Font.DemiBold
+        style: "subheading"
 
         anchors {
             verticalCenter: parent.verticalCenter
diff --git a/src/popups/Dialog.qml b/src/popups/Dialog.qml
index dfc2cc57..3dddd94a 100644
--- a/src/popups/Dialog.qml
+++ b/src/popups/Dialog.qml
@@ -68,6 +68,8 @@ PopupBase {
 
     default property alias dialogContent: column.data
 
+    property bool closeOnAccepted: true
+
     signal accepted()
     signal rejected()
 
@@ -312,7 +314,7 @@ PopupBase {
                     }
 
                     onClicked: {
-                        close()
+                        if(closeOnAccepted) close()
                         accepted();
                     }
                 }
diff --git a/src/popups/MenuField.qml b/src/popups/MenuField.qml
index f396ed18..33d423ed 100644
--- a/src/popups/MenuField.qml
+++ b/src/popups/MenuField.qml
@@ -64,9 +64,11 @@ Item {
     Ink {
         anchors.fill: parent
         onClicked: {
-            listView.positionViewAtIndex(listView.currentIndex, ListView.Center)
-            var offset = listView.currentItem.itemLabel.mapToItem(menu, 0, 0)
-            menu.open(label, 0, -offset.y)
+            if(listView.currentIndex !== -1) {
+                listView.positionViewAtIndex(listView.currentIndex, ListView.Center)
+                var offset = listView.currentItem.itemLabel.mapToItem(menu, 0, 0)
+            }
+            menu.open(label, 0, listView.currentIndex !== -1 ? -offset.y : 0)
         }
     }