8 files changed, 83 insertions, 36 deletions

diff --git a/components/kube/contents/ui/Kube.qml b/components/kube/contents/ui/Kube.qml
index e6dd7db1..8537dba2 100644
--- a/components/kube/contents/ui/Kube.qml
+++ b/components/kube/contents/ui/Kube.qml
@@ -179,6 +179,19 @@ Controls2.ApplicationWindow {
                     width: height
                 }
             }
+            Column {
+                anchors {
+                    bottom: parent.bottom
+                    bottomMargin: Kube.Units.smallSpacing
+                    horizontalCenter: parent.horizontalCenter
+                }
+
+                spacing: Kube.Units.largeSpacing - Kube.Units.smallSpacing
+                Kube.Outbox {
+                    height: Kube.Units.gridUnit * 1.5
+                    width: height
+                }
+            }
         }
 
         SplitView {
@@ -222,7 +235,7 @@ Controls2.ApplicationWindow {
                     width: parent.width - Kube.Units.largeSpacing
                 }
             }
-//TODO bring back status bar and outbox
+//TODO bring back status bar
 //                 Item {
 //                     id: statusBar
 //                     anchors {
@@ -250,17 +263,6 @@ Controls2.ApplicationWindow {
 //                         }
 //                     }
 //                 }
-//
-//                 Kube.Outbox {
-//                     id: outbox
-//
-//                     anchors {
-//                         bottom: toolBar.top
-//                         left: parent.left
-//                         right: parent.right
-//                     }
-//                     height: Kube.Units.gridUnit * 1.5
-//                 }
 
             Kube.MailListView  {
                 id: mailListView
diff --git a/framework/qml/Icons.qml b/framework/qml/Icons.qml
index 8d63f021..ee706d95 100644
--- a/framework/qml/Icons.qml
+++ b/framework/qml/Icons.qml
@@ -39,6 +39,8 @@ Item {
     property string moveToTrash: "edit-delete"
     property string edit: "document-edit"
     property string replyToSender: "mail-reply-sender"
+    property string outbox: "mail-folder-outbox"
+    property string outbox_inverted: "mail-folder-outbox-inverted"
 
     property string menu_inverted: "application-menu-inverted"
     property string user_inverted: "im-user-inverted"
diff --git a/framework/qml/Outbox.qml b/framework/qml/Outbox.qml
index 43d0f102..fc960667 100644
--- a/framework/qml/Outbox.qml
+++ b/framework/qml/Outbox.qml
@@ -25,7 +25,7 @@ import org.kde.kirigami 1.0 as Kirigami
 import org.kube.framework 1.0 as Kube
 
 
-Rectangle {
+Controls.ToolButton {
     id: root
 
     visible: outboxModel.count > 0
@@ -36,42 +36,32 @@ Rectangle {
     Kube.OutboxModel {
         id: outboxModel
     }
+    iconName: Kube.Icons.outbox
 
     states: [
         State {
             name: "busy"; when: outboxModel.status == Kube.OutboxModel.InProgressStatus
-            PropertyChanges { target: icon; iconName: Kube.Icons.busy_inverted }
+            PropertyChanges { target: root; iconName: Kube.Icons.busy_inverted }
         },
         State {
             name: "error"; when: outboxModel.status == Kube.OutboxModel.ErrorStatus
-            PropertyChanges { target: icon; iconName: Kube.Icons.error_inverted }
+            PropertyChanges { target: root; iconName: Kube.Icons.error_inverted }
         }
     ]
 
-    color: Kube.Colors.textColor
-    clip: true
-
-    Row {
-        anchors.centerIn: parent
-        spacing: Kube.Units.smallSpacing
-        Kube.Label {
-            id: text
-            anchors.verticalCenter: parent.verticalCenter
-            text: outboxModel.count > 0 ? "Pending (" + outboxModel.count + ")" : "Outbox"
-            color: Kube.Colors.highlightedTextColor
-        }
-        Icon {
-            id: icon
-            anchors.verticalCenter: parent.verticalCenter
-            iconName: ""
-            visible: iconName != ""
+    Kube.Label {
+        id: text
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
         }
+        width: Kube.Units.smallSpacing
+        text: outboxModel.count
+        color: Kube.Colors.disabledTextColor
+        font.pointSize: 9
     }
 
-    MouseArea {
-        anchors.fill: parent
-        onClicked: dialog.open()
-    }
+    onClicked: dialog.open()
 
     Kube.Popup {
         id: dialog
diff --git a/icons/breeze/icons/places/16/mail-folder-outbox-inverted.svg b/icons/breeze/icons/places/16/mail-folder-outbox-inverted.svg
new file mode 100644
index 00000000..bd677de8
--- /dev/null
+++ b/icons/breeze/icons/places/16/mail-folder-outbox-inverted.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 8 2 L 5 5 L 7 5 L 7 7 L 9 7 L 9 5 L 10 5 L 11 5 L 8 2 z M 3.8828125 6 L 1 10.994141 L 1 11.003906 L 1 12.996094 L 1 14.003906 L 4 14.003906 L 15 14.003906 L 15 13.003906 L 15 11.011719 L 15 11.001953 L 12.117188 6.0078125 L 12 6.0078125 L 10 6.0078125 L 10 7 L 11.539062 7 L 13.847656 11 L 12 11 L 11 12 L 5 12 L 4 11 L 2.1503906 11 L 4.4589844 7 L 6 7 L 6 6.0078125 L 5.0371094 6.0078125 L 3.8828125 6.0078125 L 3.8828125 6 z M 2 1041.3613 L 2 1042.3613 L 7 1042.3613 L 7 1044.3613 L 9 1044.3613 L 9 1042.3613 L 9 1041.3613 L 2 1041.3613 z " 
+        class="ColorScheme-Text"/>
+</svg>
diff --git a/icons/breeze/icons/places/16/mail-folder-outbox.svg b/icons/breeze/icons/places/16/mail-folder-outbox.svg
new file mode 100644
index 00000000..b0fbba26
--- /dev/null
+++ b/icons/breeze/icons/places/16/mail-folder-outbox.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+    <path 
+        style="fill:currentColor;fill-opacity:1;stroke:none" 
+        d="M 8 2 L 5 5 L 7 5 L 7 7 L 9 7 L 9 5 L 10 5 L 11 5 L 8 2 z M 3.8828125 6 L 1 10.994141 L 1 11.003906 L 1 12.996094 L 1 14.003906 L 4 14.003906 L 15 14.003906 L 15 13.003906 L 15 11.011719 L 15 11.001953 L 12.117188 6.0078125 L 12 6.0078125 L 10 6.0078125 L 10 7 L 11.539062 7 L 13.847656 11 L 12 11 L 11 12 L 5 12 L 4 11 L 2.1503906 11 L 4.4589844 7 L 6 7 L 6 6.0078125 L 5.0371094 6.0078125 L 3.8828125 6.0078125 L 3.8828125 6 z M 2 1041.3613 L 2 1042.3613 L 7 1042.3613 L 7 1044.3613 L 9 1044.3613 L 9 1042.3613 L 9 1041.3613 L 2 1041.3613 z " 
+        class="ColorScheme-Text"/>
+</svg>
diff --git a/icons/breeze/icons/places/22/mail-folder-outbox-inverted.svg b/icons/breeze/icons/places/22/mail-folder-outbox-inverted.svg
new file mode 100644
index 00000000..4598bc14
--- /dev/null
+++ b/icons/breeze/icons/places/22/mail-folder-outbox-inverted.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2
+      }
+      </style>
+  </defs>
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="M 11 3 L 7 7 L 9.75 7 L 9.75 10 L 12.25 10 L 12.25 7 L 15 7 L 11 3 z M 5.9550781 8 L 2 14.849609 L 2 16.310547 L 2 19 L 6 19 L 16 19 L 20 19 L 20 16.310547 L 20 14.849609 L 16.044922 8 L 16 8 L 13 8 L 13 9 L 15.46875 9 L 18.933594 15 L 16 15 L 15 17 L 7 17 L 6 15 L 3.0664062 15 L 6.53125 9 L 9 9 L 9 8 L 7.109375 8 L 5.9550781 8 z "
+       class="ColorScheme-Text" />
+</svg>
diff --git a/icons/breeze/icons/places/22/mail-folder-outbox.svg b/icons/breeze/icons/places/22/mail-folder-outbox.svg
new file mode 100644
index 00000000..239bc187
--- /dev/null
+++ b/icons/breeze/icons/places/22/mail-folder-outbox.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d
+      }
+      </style>
+  </defs>
+    <path
+       style="fill:currentColor;fill-opacity:1;stroke:none" 
+       d="M 11 3 L 7 7 L 9.75 7 L 9.75 10 L 12.25 10 L 12.25 7 L 15 7 L 11 3 z M 5.9550781 8 L 2 14.849609 L 2 16.310547 L 2 19 L 6 19 L 16 19 L 20 19 L 20 16.310547 L 20 14.849609 L 16.044922 8 L 16 8 L 13 8 L 13 9 L 15.46875 9 L 18.933594 15 L 16 15 L 15 17 L 7 17 L 6 15 L 3.0664062 15 L 6.53125 9 L 9 9 L 9 8 L 7.109375 8 L 5.9550781 8 z "
+       class="ColorScheme-Text" />
+</svg>
diff --git a/icons/copybreeze.sh b/icons/copybreeze.sh
index 6c6d8103..2d13c1f6 100755
--- a/icons/copybreeze.sh
+++ b/icons/copybreeze.sh
@@ -22,6 +22,7 @@ wantedIcons = [
     "mail-mark-important.svg",
     "mail-mark-unread-new.svg",
     "mail-reply-sender.svg",
+    "mail-folder-outbox.svg",
     "network-disconnect.svg",
     "view-refresh.svg",
     "go-down.svg",