diff --git a/de.bmotionstudio.gef.editor/icons/eclipse16/updated_col.gif b/de.bmotionstudio.gef.editor/icons/eclipse16/updated_col.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cab08b4083c5102f7c5f203ee59e7e605dcd11a2
Binary files /dev/null and b/de.bmotionstudio.gef.editor/icons/eclipse16/updated_col.gif differ
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/EditorImageRegistry.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/EditorImageRegistry.java
index 16392c44ec9ef763e4f8303bfc97480bf9c73781..5829e8f85304e9f030a9b896bc0aefaa917bfd21 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/EditorImageRegistry.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/EditorImageRegistry.java
@@ -26,6 +26,7 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
 	public static final String IMG_ICON_NEW_WIZ = "icon_new_wiz";
 	public static final String IMG_ICON_DELETE_EDIT = "icon_delete_edit";
 	public static final String IMG_ICON_TR_UP = "icon_tr_up";
+	public static final String IMG_ICON_TR_LEFT = "icon_tr_left";
 
 	public static final String IMG_ICON_JPG = "icon_jpg";
 	public static final String IMG_ICON_GIF = "icon_gif";
@@ -70,6 +71,9 @@ public class EditorImageRegistry implements IBMotionStudioImageRegistry {
 		BMotionStudioImage
 				.registerImage(IMG_ICON_TR_UP, BMotionEditorPlugin.PLUGIN_ID,
 						"icons/eclipse16/updated_co.gif");
+		BMotionStudioImage.registerImage(IMG_ICON_TR_LEFT,
+				BMotionEditorPlugin.PLUGIN_ID,
+				"icons/eclipse16/updated_col.gif");
 
 		BMotionStudioImage.registerImage(IMG_ICON_JPG,
 				BMotionEditorPlugin.PLUGIN_ID, "icons/icon_jpg.gif");
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableColumnFigure.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableColumnFigure.java
index cec191ca8a38b612351aa75c3d862174e86c0ba5..ce1c1f6b842ad8604c98a0e7e665f448370448ae 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableColumnFigure.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableColumnFigure.java
@@ -9,7 +9,6 @@ public class TableColumnFigure extends AbstractTableFigure {
 
 	public TableColumnFigure() {
 		ToolbarLayout toolbarLayout = new ToolbarLayout();
-		toolbarLayout.setSpacing(0);
 		setLayoutManager(toolbarLayout);
 		setOpaque(true);
 	}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableFigure.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableFigure.java
index 5a1b14a33082c6a93bf4b817b878d90597fe755f..e1b395942dda8da0f35d5952b53cfcead3d5384c 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableFigure.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableFigure.java
@@ -15,7 +15,6 @@ public class TableFigure extends AbstractTableFigure {
 	public TableFigure() {
 		ToolbarLayout toolbarLayout = new ToolbarLayout();
 		toolbarLayout.setHorizontal(true);
-		toolbarLayout.setStretchMinorAxis(false);
 		setLayoutManager(toolbarLayout);
 		setOpaque(true);
 	}
@@ -25,7 +24,7 @@ public class TableFigure extends AbstractTableFigure {
 		Rectangle r = getClientArea();
 		g.setForegroundColor(getForegroundColor());
 		// Right table border line
-		g.drawLine(r.x + r.width - 1, r.y, r.x + r.width - 1, r.y + r.height
+		g.drawLine(r.x + r.width - 21, r.y, r.x + r.width - 21, r.y + r.height
 				- 15);
 		super.paintBorder(g);
 	}
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTablePart.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTablePart.java
index c1042055d09615887e405ae1ee8fae1eac09546e..95f025ef1acbe7bb595e18db990dbcede706d3a3 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTablePart.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTablePart.java
@@ -4,11 +4,14 @@ import java.beans.PropertyChangeEvent;
 import java.util.List;
 
 import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gef.EditPolicy;
 import org.eclipse.swt.graphics.RGB;
 
 import de.bmotionstudio.gef.editor.AttributeConstants;
+import de.bmotionstudio.gef.editor.BMotionStudioImage;
+import de.bmotionstudio.gef.editor.EditorImageRegistry;
 import de.bmotionstudio.gef.editor.command.CreateCommand;
 import de.bmotionstudio.gef.editor.editpolicy.AppDeletePolicy;
 import de.bmotionstudio.gef.editor.editpolicy.BMotionNodeEditPolicy;
@@ -22,7 +25,15 @@ public class BTablePart extends AppAbstractEditPart {
 
 	@Override
 	protected IFigure createEditFigure() {
-		return new TableFigure();
+		TableFigure tableFigure = new TableFigure();
+		Label figure = new Label();
+		figure.setOpaque(true);
+		tableFigure.add(figure);
+		if (!isRunning()) {
+			figure.setIcon(BMotionStudioImage
+					.getImage(EditorImageRegistry.IMG_ICON_TR_LEFT));
+		}
+		return tableFigure;
 	}
 
 	@Override
@@ -54,7 +65,7 @@ public class BTablePart extends AppAbstractEditPart {
 		figure.getParent().setConstraint(
 				figure,
 				new Rectangle(control.getLocation().x, control.getLocation().y,
-						width + 1, (rows * 20) + 15));
+						width + 21, (rows * 20) + 15));
 
 		// super.refreshEditLayout(figure, control);