diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
index 23ed6fc4b..ac91e6c5f 100644
--- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java
@@ -3041,6 +3041,13 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
         return mutable;
     }
     
+    public void applyTransformMatrix(Matrix matrix) {
+        transform = transform.preConcatenate(matrix);
+        Point2D newRegistrationPoint = new Point2D.Double();
+        matrix.toTransform().transform(registrationPoint, newRegistrationPoint);
+        registrationPoint = newRegistrationPoint;
+    }
+    
     private Rectangle2D getTransformBounds() {
         int time = frozen ? 0 : this.time;
         DepthState ds = null;
@@ -3073,7 +3080,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay {
                     int dframe = time % drawableFrameCount;
                     Shape outline = dt.getOutline(dframe, time, ds.ratio, renderContext, b.concatenate(new Matrix(ds.matrix)), true);    
                     Rectangle bounds = outline.getBounds();
-                    return new Rectangle2D.Double(bounds.x / SWF.unitDivisor, bounds.y / SWF.unitDivisor, bounds.width / SWF.unitDivisor, bounds.height / SWF.unitDivisor);                
+                    return new Rectangle2D.Double(bounds.x, bounds.y, bounds.width, bounds.height);                
                 }
             }
         }
diff --git a/src/com/jpexs/decompiler/flash/gui/TransformPanel.java b/src/com/jpexs/decompiler/flash/gui/TransformPanel.java
index 89f304fbe..14c09e84d 100644
--- a/src/com/jpexs/decompiler/flash/gui/TransformPanel.java
+++ b/src/com/jpexs/decompiler/flash/gui/TransformPanel.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.flash.gui;
 
+import com.jpexs.decompiler.flash.exporters.commonshape.Matrix;
 import com.jpexs.helpers.Reference;
 import java.awt.Component;
 import java.awt.FlowLayout;
@@ -85,8 +86,8 @@ public class TransformPanel extends JPanel {
     }
 
     public static enum Unit {
-        PX("px", 1.0, UnitKind.LENGTH),
-        TWIP("twip", 20.0, UnitKind.LENGTH),
+        PX("px", 1/20.0, UnitKind.LENGTH),
+        TWIP("twip", 1.0, UnitKind.LENGTH),
         PERCENT("%", 0.0, UnitKind.LENGTH),
         TURN("turn", 1 / 360.0, UnitKind.ANGLE),
         DEG("°", 1, UnitKind.ANGLE),
@@ -187,15 +188,15 @@ public class TransformPanel extends JPanel {
                     double scaleHeight = Double.parseDouble(scaleHeightTextField.getText());
 
                     if (prevUnit == Unit.PERCENT) {
-                        scaleWidthTextField.setText(formatDouble(convertUnit(bounds.getWidth() * scaleWidth / 100, Unit.PX, newUnit)));
-                        scaleHeightTextField.setText(formatDouble(convertUnit(bounds.getHeight() * scaleHeight / 100, Unit.PX, newUnit)));
+                        scaleWidthTextField.setText(formatDouble(convertUnit(bounds.getWidth() * scaleWidth / 100, Unit.TWIP, newUnit)));
+                        scaleHeightTextField.setText(formatDouble(convertUnit(bounds.getHeight() * scaleHeight / 100, Unit.TWIP, newUnit)));
                         return;
                     }
                     if (newUnit == Unit.PERCENT) {
-                        double scaleWidthPx = convertUnit(scaleWidth, prevUnit, Unit.PX);
-                        double scaleHeightPx = convertUnit(scaleHeight, prevUnit, Unit.PX);
-                        scaleWidthTextField.setText(formatDouble((scaleWidthPx * 100 / bounds.getWidth())));
-                        scaleHeightTextField.setText(formatDouble((scaleHeightPx * 100 / bounds.getHeight())));
+                        double scaleWidthTwip = convertUnit(scaleWidth, prevUnit, Unit.TWIP);
+                        double scaleHeightTwip = convertUnit(scaleHeight, prevUnit, Unit.TWIP);
+                        scaleWidthTextField.setText(formatDouble((scaleWidthTwip * 100 / bounds.getWidth())));
+                        scaleHeightTextField.setText(formatDouble((scaleHeightTwip * 100 / bounds.getHeight())));
                         return;
                     }
 
@@ -342,8 +343,8 @@ public class TransformPanel extends JPanel {
     private void update(Rectangle2D bounds) {
         this.bounds = bounds;
         if (!moveRelativeCheckBox.isSelected()) {
-            moveHorizontalTextField.setText(formatDouble(convertUnit(bounds.getX(), Unit.PX, (Unit) moveUnitComboBox.getSelectedItem())));
-            moveVerticalTextField.setText(formatDouble(convertUnit(bounds.getY(), Unit.PX, (Unit) moveUnitComboBox.getSelectedItem())));
+            moveHorizontalTextField.setText(formatDouble(convertUnit(bounds.getX(), Unit.TWIP, (Unit) moveUnitComboBox.getSelectedItem())));
+            moveVerticalTextField.setText(formatDouble(convertUnit(bounds.getY(), Unit.TWIP, (Unit) moveUnitComboBox.getSelectedItem())));
         }
         if (scaleProportionallyCheckBox.isSelected() && scaleUnitComboBox.getSelectedItem() != Unit.PERCENT) {
             try {
@@ -359,8 +360,9 @@ public class TransformPanel extends JPanel {
     }
 
     private void clearMoveActionPerformed(ActionEvent e) {
-        moveHorizontalTextField.setText(formatDouble(bounds.getX()));
-        moveVerticalTextField.setText(formatDouble(bounds.getY()));
+        moveHorizontalTextField.setText(formatDouble(convertUnit(bounds.getX(), Unit.TWIP, Unit.PX)));
+        moveVerticalTextField.setText(formatDouble(convertUnit(bounds.getY(), Unit.TWIP, Unit.PX)));
+        moveUnitComboBox.setSelectedItem(Unit.PX);
         moveRelativeCheckBox.setSelected(false);
     }