diff --git a/mix/qml/Debugger.qml b/mix/qml/Debugger.qml
index 316ec86c7..52587dd4e 100644
--- a/mix/qml/Debugger.qml
+++ b/mix/qml/Debugger.qml
@@ -164,7 +164,7 @@ Rectangle {
 				Rectangle {
 					// step button + slider
 					id: buttonRow
-					height: 27
+					height: 30
 					Layout.fillWidth: true
 					color: "transparent"
 
@@ -184,7 +184,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpoutback.png"
 								disableStateImg: "qrc:/qml/img/jumpoutbackdisabled.png"
 								onClicked: Debugger.stepOutBack()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "Ctrl+Shift+F11"
 								buttonTooltip: qsTr("Step Out Back")
@@ -196,7 +196,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpintoback.png"
 								disableStateImg: "qrc:/qml/img/jumpintobackdisabled.png"
 								onClicked: Debugger.stepIntoBack()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "Ctrl+F11"
 								buttonTooltip: qsTr("Step Into Back")
@@ -208,7 +208,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpoverback.png"
 								disableStateImg: "qrc:/qml/img/jumpoverbackdisabled.png"
 								onClicked: Debugger.stepOverBack()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "Ctrl+F10"
 								buttonTooltip: qsTr("Step Over Back")
@@ -220,7 +220,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpoverforward.png"
 								disableStateImg: "qrc:/qml/img/jumpoverforwarddisabled.png"
 								onClicked: Debugger.stepOverForward()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "F10"
 								buttonTooltip: qsTr("Step Over Forward")
@@ -232,7 +232,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpintoforward.png"
 								disableStateImg: "qrc:/qml/img/jumpintoforwarddisabled.png"
 								onClicked: Debugger.stepIntoForward()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "F11"
 								buttonTooltip: qsTr("Step Into Forward")
@@ -244,7 +244,7 @@ Rectangle {
 								enabledStateImg: "qrc:/qml/img/jumpoutforward.png"
 								disableStateImg: "qrc:/qml/img/jumpoutforwarddisabled.png"
 								onClicked: Debugger.stepOutForward()
-								width: 28
+								width: 30
 								height: 30
 								buttonShortcut: "Shift+F11"
 								buttonTooltip: qsTr("Step Out Forward")
diff --git a/mix/qml/ProjectList.qml b/mix/qml/ProjectList.qml
index d4875220a..ba162793b 100644
--- a/mix/qml/ProjectList.qml
+++ b/mix/qml/ProjectList.qml
@@ -25,11 +25,15 @@ Item {
 			Layout.fillWidth: true
 			Image {
 				id: projectIcon
-				source: "qrc:/qml/img/projecticon.png"
-				sourceSize.height: 30
+				source: "qrc:/qml/img/dappProjectIcon.png"
+				//sourceSize.height: 32
 				anchors.right: projectTitle.left
 				anchors.verticalCenter: parent.verticalCenter
 				anchors.rightMargin: 6
+				//anchors.centerIn: parent
+				fillMode: Image.PreserveAspectFit
+				width: 32
+				height: 32
 			}
 
 			Text
@@ -115,7 +119,7 @@ Item {
 											ci++;
 										}
 									}
-								}
+								}	
 							}
 						}
 
diff --git a/mix/qml/StepActionImage.qml b/mix/qml/StepActionImage.qml
index a4ff23e54..e5129e379 100644
--- a/mix/qml/StepActionImage.qml
+++ b/mix/qml/StepActionImage.qml
@@ -16,19 +16,26 @@ Rectangle {
 	{
 		buttonAction.enabled = state;
 		if (state)
-			debugImg.iconSource = enabledStateImg;
+			debugImage.source = enabledStateImg;
 		else
-			debugImg.iconSource = disableStateImg;
+			debugImage.source = disableStateImg;
 	}
 
 	Button
 	{
 		anchors.fill: parent
 		id: debugImg
-		iconSource: enabledStateImg
-		action: buttonAction
-		width: buttonActionContainer.width - 3
-		height: buttonActionContainer.height
+/*		iconSource: enabledStateImg
+*/		action: buttonAction
+	}
+
+	Image {
+		id: debugImage
+		source: enabledStateImg
+		anchors.centerIn: parent
+		fillMode: Image.PreserveAspectFit
+		width: 15
+		height: 15
 	}
 
 	Action {
diff --git a/mix/qml/html/cm/codemirror.css b/mix/qml/html/cm/codemirror.css
index b5f69e6aa..f08bacc89 100644
--- a/mix/qml/html/cm/codemirror.css
+++ b/mix/qml/html/cm/codemirror.css
@@ -5,7 +5,7 @@
   font-family: monospace;
   border: 1px solid black;
   height: 100%;
-  font-size:16px
+  font-size:12px
 }
 
 /* PADDING */
diff --git a/mix/qml/img/dappProjectIcon.png b/mix/qml/img/dappProjectIcon.png
new file mode 100644
index 000000000..eea9025d0
Binary files /dev/null and b/mix/qml/img/dappProjectIcon.png differ
diff --git a/mix/qml/img/jumpintoback.png b/mix/qml/img/jumpintoback.png
index cf5e10007..1b4454777 100644
Binary files a/mix/qml/img/jumpintoback.png and b/mix/qml/img/jumpintoback.png differ
diff --git a/mix/qml/img/jumpintobackdisabled.png b/mix/qml/img/jumpintobackdisabled.png
index a66b5ba41..d4d33a3a9 100644
Binary files a/mix/qml/img/jumpintobackdisabled.png and b/mix/qml/img/jumpintobackdisabled.png differ
diff --git a/mix/qml/img/jumpintoforward.png b/mix/qml/img/jumpintoforward.png
index b47f741eb..eeedeada9 100644
Binary files a/mix/qml/img/jumpintoforward.png and b/mix/qml/img/jumpintoforward.png differ
diff --git a/mix/qml/img/jumpintoforwarddisabled.png b/mix/qml/img/jumpintoforwarddisabled.png
index 07364cdde..933fcf333 100644
Binary files a/mix/qml/img/jumpintoforwarddisabled.png and b/mix/qml/img/jumpintoforwarddisabled.png differ
diff --git a/mix/qml/img/jumpoutback.png b/mix/qml/img/jumpoutback.png
index d619ff082..a1c4c0a40 100644
Binary files a/mix/qml/img/jumpoutback.png and b/mix/qml/img/jumpoutback.png differ
diff --git a/mix/qml/img/jumpoutbackdisabled.png b/mix/qml/img/jumpoutbackdisabled.png
index 893af6998..c3e58478c 100644
Binary files a/mix/qml/img/jumpoutbackdisabled.png and b/mix/qml/img/jumpoutbackdisabled.png differ
diff --git a/mix/qml/img/jumpoutforward.png b/mix/qml/img/jumpoutforward.png
index 29745f756..10c58c53a 100644
Binary files a/mix/qml/img/jumpoutforward.png and b/mix/qml/img/jumpoutforward.png differ
diff --git a/mix/qml/img/jumpoutforwarddisabled.png b/mix/qml/img/jumpoutforwarddisabled.png
index c7243c859..f1104b4a8 100644
Binary files a/mix/qml/img/jumpoutforwarddisabled.png and b/mix/qml/img/jumpoutforwarddisabled.png differ
diff --git a/mix/qml/img/jumpoverback.png b/mix/qml/img/jumpoverback.png
index 371e02245..358ac29e8 100644
Binary files a/mix/qml/img/jumpoverback.png and b/mix/qml/img/jumpoverback.png differ
diff --git a/mix/qml/img/jumpoverbackdisabled.png b/mix/qml/img/jumpoverbackdisabled.png
index 73fc6358e..1742d80ac 100644
Binary files a/mix/qml/img/jumpoverbackdisabled.png and b/mix/qml/img/jumpoverbackdisabled.png differ
diff --git a/mix/qml/img/jumpoverforward.png b/mix/qml/img/jumpoverforward.png
index 690d3ab49..bee403957 100644
Binary files a/mix/qml/img/jumpoverforward.png and b/mix/qml/img/jumpoverforward.png differ
diff --git a/mix/qml/img/jumpoverforwarddisabled.png b/mix/qml/img/jumpoverforwarddisabled.png
new file mode 100644
index 000000000..973474098
Binary files /dev/null and b/mix/qml/img/jumpoverforwarddisabled.png differ
diff --git a/mix/qml/img/opentriangleindicator@2x.png b/mix/qml/img/opentriangleindicator@2x.png
new file mode 100644
index 000000000..fd948d73b
Binary files /dev/null and b/mix/qml/img/opentriangleindicator@2x.png differ
diff --git a/mix/res.qrc b/mix/res.qrc
index 0acf9f39e..20e51a9b3 100644
--- a/mix/res.qrc
+++ b/mix/res.qrc
@@ -10,12 +10,14 @@
         <file>qml/StateDialog.qml</file>
         <file>qml/StateList.qml</file>
         <file>qml/StateListModel.qml</file>
+        <file>qml/img/dappProjectIcon.png</file>
         <file>qml/img/jumpintoback.png</file>
         <file>qml/img/jumpintoforward.png</file>
         <file>qml/img/jumpoutback.png</file>
         <file>qml/img/jumpoutforward.png</file>
         <file>qml/img/jumpoverback.png</file>
         <file>qml/img/jumpoverforward.png</file>
+        <file>qml/img/jumpoverforwarddisabled.png</file>
         <file>qml/StepActionImage.qml</file>
         <file>qml/img/jumpintobackdisabled.png</file>
         <file>qml/img/jumpintoforwarddisabled.png</file>