diff --git a/res/app/components/stf/screen/screen-directive.js b/res/app/components/stf/screen/screen-directive.js
index c77f4733..5dafc79d 100644
--- a/res/app/components/stf/screen/screen-directive.js
+++ b/res/app/components/stf/screen/screen-directive.js
@@ -259,16 +259,16 @@ module.exports = function DeviceScreenDirective($document, ScalingService,
               // changes from 180 to 270 (it will do a reverse rotation).
               switch (rotation) {
                 case 0:
-                  canvas.style[cssTransform] = 'translate(-50%, -50%) rotate(0deg)'
+                  canvas.style[cssTransform] = 'rotate(0deg)'
                   break
                 case 90:
-                  canvas.style[cssTransform] = 'translate(-50%, -50%) rotate(-90deg)'
+                  canvas.style[cssTransform] = 'rotate(-90deg)'
                   break
                 case 180:
-                  canvas.style[cssTransform] = 'translate(-50%, -50%) rotate(-180deg)'
+                  canvas.style[cssTransform] = 'rotate(-180deg)'
                   break
                 case 270:
-                  canvas.style[cssTransform] = 'translate(-50%, -50%) rotate(90deg)'
+                  canvas.style[cssTransform] = 'rotate(90deg)'
                   break
               }
             }
diff --git a/res/app/control-panes/device-control/device-control.css b/res/app/control-panes/device-control/device-control.css
index 4a0e71e7..673134f6 100644
--- a/res/app/control-panes/device-control/device-control.css
+++ b/res/app/control-panes/device-control/device-control.css
@@ -3,6 +3,7 @@
   -moz-transition: 1s linear opacity;
   -o-transition: 1s linear opacity;
   transition: 1s linear opacity;
+
   opacity: 0;
 }
 
@@ -10,6 +11,14 @@
   opacity: 1;
 }
 
+device-screen canvas {
+  transition: width 100ms linear, -webkit-transform 250ms ease-in-out;
+  -webkit-transform-origin: 50% 50%;
+  transform-origin: 50% 50%;
+  -webkit-transform: width, rotate(0deg);
+  transform: width, rotate(0deg);
+}
+
 device-screen {
   position: relative;
   display: block;
@@ -26,14 +35,12 @@ device-screen {
 
 device-screen canvas {
   position: absolute;
-  top: 50%;
-  left: 50%;
-  pointer-events: none; /* MUST HAVE or touch coordinates will be off */
-  transition: width 100ms linear, -webkit-transform 250ms ease-in-out;
-  -webkit-transform-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  -webkit-transform: rotate(0deg);
-  transform: translate(-50%, -50%) rotate(0deg);
+  margin: auto;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  pointer-events: none; /* MUST HAVE */
 }
 
 device-screen .finger {