diff --git a/cmd/mist/assets/qml/main.qml b/cmd/mist/assets/qml/main.qml
index 18174e4c71..8042e90a3e 100644
--- a/cmd/mist/assets/qml/main.qml
+++ b/cmd/mist/assets/qml/main.qml
@@ -14,7 +14,7 @@ ApplicationWindow {
     id: root
     
     flags: Qt.FramelessWindowHint | Qt.Window
-    //flags: Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowSystemMenuHint
+    //flags: Qt.Window | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint | Qt.WindowMinimizeButtonHint
     // Use this to make the window frameless. But then you'll need to do move and resize by hand
     color: "transparent"
 
@@ -794,9 +794,6 @@ ApplicationWindow {
                  anchors.left: parent.left
                  anchors.right: parent.right
                  spacing: 3
-                
-
-
 
                 /************************/
                 /*   Semafor Buttons    */
@@ -810,49 +807,77 @@ ApplicationWindow {
                         right: parent.right
                         leftMargin: 8
                         bottomMargin: 8
+                        topMargin: 0
                     }
+
                     height: 37
                     spacing: 6
-                    
+
                     Rectangle {
-                        color: 'red'
-                        width: 11
-                        height: 11
-                        radius: 7
-                        MouseArea {
-                            anchors.fill: parent
-                            onClicked: {
-                                console.log("stop");
-                                //gui.stop();
+                        color: "transparent"
+                        anchors.fill: parent
+                    }
+
+                    Rectangle {
+                        color: 'transparent'
+                        width: 13
+                        height: 20
+                        
+                        Image {
+                             height: 13
+                             width: 13
+                             source: toolbarCloseButton.containsMouse ?  "../window-control/window-close.png" :  "../window-control/window-close-hover.png"
+                             anchors.centerIn: parent
+                             
+                             MouseArea {
+                                id: toolbarCloseButton
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                onClicked: Qt.quit() //gui.stop();
                             }
-                        }   
+                         }  
+                    }
+                    Rectangle {
+                        color: 'transparent'
+                        width: 13
+                        height: 20
+                        
+                        Image {
+                             height: 13
+                             width: 13
+                             source: toolbarminimizeButton.containsMouse ?  "../window-control/window-minimize.png" :  "../window-control/window-minimize-hover.png"
+                             anchors.centerIn: parent
+                             
+                             MouseArea {
+                                id: toolbarminimizeButton
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                onClicked: Qt.quit() //gui.stop();
+                            }
+                         }  
+                    }
+
+                    Rectangle {
+                        color: 'transparent'
+                        width: 13
+                        height: 20
+                        
+                        Image {
+                             height: 13
+                             width: 13
+                             source: toolbarzoomButton.containsMouse ?  "../window-control/window-zoom.png" :  "../window-control/window-zoom-hover.png"
+                             anchors.centerIn: parent
+                             
+                             MouseArea {
+                                id: toolbarzoomButton
+                                anchors.fill: parent
+                                hoverEnabled: true
+                                onClicked: Qt.quit() //gui.stop();
+                            }
+                         }  
                     }
                                         
-                    Rectangle {
-                        color: 'yellow'
-                        width: 11
-                        height: 11
-                        radius: 7
-                        MouseArea {
-                            anchors.fill: parent
-                            onClicked: {
-                                console.log("minimize window");
-                            }
-                        }   
-                    }
                     
-                    Rectangle {
-                        color: 'green'
-                        width: 11
-                        height: 11
-                        radius: 7
-                        MouseArea {
-                            anchors.fill: parent
-                            onClicked: {
-                                console.log("maximize window");
-                            }
-                        }   
-                    }
                    
                 }
 
diff --git a/cmd/mist/assets/window-control/window-close-hover.png b/cmd/mist/assets/window-control/window-close-hover.png
new file mode 100644
index 0000000000..f3a0455b04
Binary files /dev/null and b/cmd/mist/assets/window-control/window-close-hover.png differ
diff --git a/cmd/mist/assets/window-control/window-close-hover@2x.png b/cmd/mist/assets/window-control/window-close-hover@2x.png
new file mode 100644
index 0000000000..b101950055
Binary files /dev/null and b/cmd/mist/assets/window-control/window-close-hover@2x.png differ
diff --git a/cmd/mist/assets/window-control/window-close.png b/cmd/mist/assets/window-control/window-close.png
new file mode 100644
index 0000000000..39ecae905c
Binary files /dev/null and b/cmd/mist/assets/window-control/window-close.png differ
diff --git a/cmd/mist/assets/window-control/window-close@2x.png b/cmd/mist/assets/window-control/window-close@2x.png
new file mode 100644
index 0000000000..49bd12a0eb
Binary files /dev/null and b/cmd/mist/assets/window-control/window-close@2x.png differ
diff --git a/cmd/mist/assets/window-control/window-minimize-hover.png b/cmd/mist/assets/window-control/window-minimize-hover.png
new file mode 100644
index 0000000000..97a7a4cb0b
Binary files /dev/null and b/cmd/mist/assets/window-control/window-minimize-hover.png differ
diff --git a/cmd/mist/assets/window-control/window-minimize-hover@2x.png b/cmd/mist/assets/window-control/window-minimize-hover@2x.png
new file mode 100644
index 0000000000..bb7bf4f902
Binary files /dev/null and b/cmd/mist/assets/window-control/window-minimize-hover@2x.png differ
diff --git a/cmd/mist/assets/window-control/window-minimize.png b/cmd/mist/assets/window-control/window-minimize.png
new file mode 100644
index 0000000000..ff68c8da93
Binary files /dev/null and b/cmd/mist/assets/window-control/window-minimize.png differ
diff --git a/cmd/mist/assets/window-control/window-minimize@2x.png b/cmd/mist/assets/window-control/window-minimize@2x.png
new file mode 100644
index 0000000000..2b1e0e05bd
Binary files /dev/null and b/cmd/mist/assets/window-control/window-minimize@2x.png differ
diff --git a/cmd/mist/assets/window-control/window-zoom-hover.png b/cmd/mist/assets/window-control/window-zoom-hover.png
new file mode 100644
index 0000000000..d6c65bb93b
Binary files /dev/null and b/cmd/mist/assets/window-control/window-zoom-hover.png differ
diff --git a/cmd/mist/assets/window-control/window-zoom-hover@2x.png b/cmd/mist/assets/window-control/window-zoom-hover@2x.png
new file mode 100644
index 0000000000..3084c06755
Binary files /dev/null and b/cmd/mist/assets/window-control/window-zoom-hover@2x.png differ
diff --git a/cmd/mist/assets/window-control/window-zoom.png b/cmd/mist/assets/window-control/window-zoom.png
new file mode 100644
index 0000000000..fe30855db6
Binary files /dev/null and b/cmd/mist/assets/window-control/window-zoom.png differ
diff --git a/cmd/mist/assets/window-control/window-zoom@2x.png b/cmd/mist/assets/window-control/window-zoom@2x.png
new file mode 100644
index 0000000000..02fca3f3b6
Binary files /dev/null and b/cmd/mist/assets/window-control/window-zoom@2x.png differ