diff --git a/mix/qml/LogsPane.qml b/mix/qml/LogsPane.qml
index 6b8a66638..eb8669df6 100644
--- a/mix/qml/LogsPane.qml
+++ b/mix/qml/LogsPane.qml
@@ -146,10 +146,13 @@ Rectangle
 
 
 						DefaultLabel {
+							id: dateLabel
 							text: date;
 							font.family: logStyle.generic.layout.logLabelFont
 							width: logStyle.generic.layout.dateWidth
 							font.pointSize: appStyle.absoluteSize(-1)
+							clip: true
+							elide: Text.ElideRight
 							anchors.left: parent.left
 							anchors.leftMargin: 15
 							anchors.verticalCenter: parent.verticalCenter
@@ -160,11 +163,14 @@ Rectangle
 
 						DefaultLabel {
 							text: type;
+							id: typeLabel
 							font.family: logStyle.generic.layout.logLabelFont
 							width: logStyle.generic.layout.typeWidth
+							clip: true
+							elide: Text.ElideRight
 							font.pointSize: appStyle.absoluteSize(-1)
-							anchors.left: parent.left
-							anchors.leftMargin: 100
+							anchors.left: dateLabel.right
+							anchors.leftMargin: 2
 							anchors.verticalCenter: parent.verticalCenter
 							color: {
 								parent.getColor(level);
@@ -179,8 +185,8 @@ Rectangle
 							font.pointSize: appStyle.absoluteSize(-1)
 							anchors.verticalCenter: parent.verticalCenter
 							elide: Text.ElideRight
-							anchors.left: parent.left
-							anchors.leftMargin: 230
+							anchors.left: typeLabel.right
+							anchors.leftMargin: 2
 							color: {
 								parent.getColor(level);
 							}
@@ -242,6 +248,8 @@ Rectangle
 				width: 40
 				DefaultLabel
 				{
+					width: 40
+					elide: Text.ElideRight
 					anchors.verticalCenter: parent.verticalCenter
 					color: logStyle.generic.layout.logLabelColor
 					font.pointSize: appStyle.absoluteSize(-3)
@@ -268,7 +276,7 @@ Rectangle
 				id: javascriptButton
 				checkable: true
 				height: logStyle.generic.layout.headerButtonHeight
-				width: 20
+				width: 30
 				anchors.verticalCenter: parent.verticalCenter
 				checked: true
 				onCheckedChanged: {
@@ -279,12 +287,22 @@ Rectangle
 					ButtonStyle {
 					label:
 						Item {
-						DefaultLabel {
-							font.family: logStyle.generic.layout.logLabelFont
-							font.pointSize: appStyle.absoluteSize(-3)
-							color: logStyle.generic.layout.logLabelColor
+						Rectangle
+						{
+							width: labelJs.width
+							height: labelJs.height
 							anchors.centerIn: parent
-							text: qsTr("JS")
+							color: "transparent"
+							DefaultLabel {
+								id: labelJs
+								width: 15
+								elide: Text.ElideRight
+								anchors.horizontalCenter: parent.horizontalCenter
+								font.family: logStyle.generic.layout.logLabelFont
+								font.pointSize: appStyle.absoluteSize(-3)
+								color: logStyle.generic.layout.logLabelColor
+								text: qsTr("JS")
+							}
 						}
 					}
 					background:
@@ -312,7 +330,7 @@ Rectangle
 				id: runButton
 				checkable: true
 				height: logStyle.generic.layout.headerButtonHeight
-				width: 30
+				width: 40
 				anchors.verticalCenter: parent.verticalCenter
 				checked: true
 				onCheckedChanged: {
@@ -323,12 +341,22 @@ Rectangle
 					ButtonStyle {
 					label:
 						Item {
-						DefaultLabel {
-							font.family: logStyle.generic.layout.logLabelFont
-							font.pointSize: appStyle.absoluteSize(-3)
-							color: logStyle.generic.layout.logLabelColor
+						Rectangle
+						{
+							width: labelRun.width
+							height: labelRun.height
 							anchors.centerIn: parent
-							text: qsTr("Run")
+							color: "transparent"
+							DefaultLabel {
+								id: labelRun
+								width: 25
+								anchors.horizontalCenter: parent.horizontalCenter
+								elide: Text.ElideRight
+								font.family: logStyle.generic.layout.logLabelFont
+								font.pointSize: appStyle.absoluteSize(-3)
+								color: logStyle.generic.layout.logLabelColor
+								text: qsTr("Run")
+							}
 						}
 					}
 					background:
@@ -357,7 +385,7 @@ Rectangle
 				checkable: true
 				height: logStyle.generic.layout.headerButtonHeight
 				anchors.verticalCenter: parent.verticalCenter
-				width: 35
+				width: 40
 				checked: true
 				onCheckedChanged: {
 					proxyModel.toogleFilter("state")
@@ -367,12 +395,22 @@ Rectangle
 					ButtonStyle {
 					label:
 						Item {
-						DefaultLabel {
-							font.family: logStyle.generic.layout.logLabelFont
-							font.pointSize: appStyle.absoluteSize(-3)
-							color: logStyle.generic.layout.logLabelColor
+						Rectangle
+						{
+							width: labelState.width
+							height: labelState.height
 							anchors.centerIn: parent
-							text: qsTr("State")
+							color: "transparent"
+							DefaultLabel {
+								id: labelState
+								width: 30
+								anchors.horizontalCenter: parent.horizontalCenter
+								elide: Text.ElideRight
+								font.family: logStyle.generic.layout.logLabelFont
+								font.pointSize: appStyle.absoluteSize(-3)
+								color: logStyle.generic.layout.logLabelColor
+								text: qsTr("State")
+							}
 						}
 					}
 					background:
@@ -411,12 +449,22 @@ Rectangle
 					ButtonStyle {
 					label:
 						Item {
-						DefaultLabel {
-							font.family: logStyle.generic.layout.logLabelFont
-							font.pointSize: appStyle.absoluteSize(-3)
-							color: logStyle.generic.layout.logLabelColor
+						Rectangle
+						{
+							width: labelDeploy.width
+							height: labelDeploy.height
 							anchors.centerIn: parent
-							text: qsTr("Deploy.")
+							color: "transparent"
+							DefaultLabel {
+								width: 40
+								id: labelDeploy
+								anchors.horizontalCenter: parent.horizontalCenter
+								elide: Text.ElideRight
+								font.family: logStyle.generic.layout.logLabelFont
+								font.pointSize: appStyle.absoluteSize(-3)
+								color: logStyle.generic.layout.logLabelColor
+								text: qsTr("Deploy.")
+							}
 						}
 					}
 					background:
diff --git a/mix/qml/LogsPaneStyle.qml b/mix/qml/LogsPaneStyle.qml
index fe50610c8..31433def1 100644
--- a/mix/qml/LogsPaneStyle.qml
+++ b/mix/qml/LogsPaneStyle.qml
@@ -17,8 +17,8 @@ QtObject {
 			property string logLabelColor: "#4a4a4a"
 			property string logLabelFont: "sans serif"
 			property int headerInputWidth: 200
-			property int dateWidth: 150
-			property int typeWidth: 150
+			property int dateWidth: 100
+			property int typeWidth: 100
 			property int contentWidth: 560
 			property string logAlternateColor: "#f6f5f6"
 			property string errorColor: "#fffcd5"
diff --git a/mix/qml/StatusPane.qml b/mix/qml/StatusPane.qml
index 8e00eb759..d36b6fa75 100644
--- a/mix/qml/StatusPane.qml
+++ b/mix/qml/StatusPane.qml
@@ -142,7 +142,6 @@ Rectangle {
 			anchors.verticalCenter: parent.verticalCenter
 			anchors.horizontalCenter: parent.horizontalCenter
 			font.pointSize: appStyle.absoluteSize(-1)
-			height: 15
 			font.family: "sans serif"
 			objectName: "status"
 			wrapMode: Text.WrapAnywhere