diff --git a/ScreenPlay/ScreenPlayAssets.qrc b/ScreenPlay/ScreenPlayAssets.qrc
index e4e807c0..f984b3e1 100644
--- a/ScreenPlay/ScreenPlayAssets.qrc
+++ b/ScreenPlay/ScreenPlayAssets.qrc
@@ -149,5 +149,7 @@
         <file>translations/ScreenPlay_it_IT.qm</file>
         <file>translations/ScreenPlay_it_IT.ts</file>
         <file>assets/icons/icon_sort_button.svg</file>
+        <file>assets/icons/icon_date.svg</file>
+        <file>assets/icons/icon_size.svg</file>
     </qresource>
 </RCC>
diff --git a/ScreenPlay/assets/icons/icon_date.svg b/ScreenPlay/assets/icons/icon_date.svg
new file mode 100644
index 00000000..20c24199
--- /dev/null
+++ b/ScreenPlay/assets/icons/icon_date.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V10h16v11zm0-13H4V5h16v3z"/></svg>
\ No newline at end of file
diff --git a/ScreenPlay/assets/icons/icon_size.svg b/ScreenPlay/assets/icons/icon_size.svg
new file mode 100644
index 00000000..69be2b28
--- /dev/null
+++ b/ScreenPlay/assets/icons/icon_size.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><rect fill="none" height="24" width="24"/><path d="M20,6h-8l-2-2H4C2.9,4,2.01,4.9,2.01,6L2,18c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V8C22,6.9,21.1,6,20,6z M20,18L4,18V6h5.17 l2,2H20V18z M18,12H6v-2h12V12z M14,16H6v-2h8V16z"/></g></svg>
\ No newline at end of file
diff --git a/ScreenPlay/qml/Installed/Navigation.qml b/ScreenPlay/qml/Installed/Navigation.qml
index 48384cf7..b41340e4 100644
--- a/ScreenPlay/qml/Installed/Navigation.qml
+++ b/ScreenPlay/qml/Installed/Navigation.qml
@@ -152,7 +152,8 @@ Item {
             ToolTip.delay: 100
             ToolTip.timeout: 5000
             ToolTip.visible: hovered
-            ToolTip.text: (sortOrder === Qt.AscendingOrder) ? qsTr("Ascending") : qsTr("Descending")
+            ToolTip.text: (sortOrder === Qt.AscendingOrder) ? qsTr("Ascending") : qsTr(
+                                                                  "Descending")
 
             onClicked: {
                 sortOrder = (sortOrder
@@ -167,7 +168,7 @@ Item {
                 verticalCenter: parent.verticalCenter
             }
         }
-        Button {
+        ToolButton {
             id: sortButton
             icon.source: "qrc:/assets/icons/icon_sort_button.svg"
             icon.width: 16
@@ -180,6 +181,7 @@ Item {
 
                 MenuItem {
                     text: "Date"
+                    icon.source: "qrc:/assets/icons/icon_date.svg"
                     hoverEnabled: true
                     ToolTip.delay: 100
                     ToolTip.timeout: 5000
@@ -188,6 +190,7 @@ Item {
                 }
                 MenuItem {
                     text: "Size"
+                    icon.source: "qrc:/assets/icons/icon_size.svg"
                     hoverEnabled: true
                     ToolTip.delay: 100
                     ToolTip.timeout: 5000