diff --git a/resources/iconsets/1_5_1/16/flip-object-horizontal.png b/resources/iconsets/1_5_1/16/flip-object-horizontal.png
index b5053fa7f..ccc1e982a 100644
Binary files a/resources/iconsets/1_5_1/16/flip-object-horizontal.png and b/resources/iconsets/1_5_1/16/flip-object-horizontal.png differ
diff --git a/resources/iconsets/1_5_1/16/flip-object-vertical.png b/resources/iconsets/1_5_1/16/flip-object-vertical.png
index d94b746f7..d3281a0f0 100644
Binary files a/resources/iconsets/1_5_1/16/flip-object-vertical.png and b/resources/iconsets/1_5_1/16/flip-object-vertical.png differ
diff --git a/resources/iconsets/1_5_1/chain-small-closed.png b/resources/iconsets/1_5_1/chain-small-closed.png
new file mode 100644
index 000000000..d5105d0a4
Binary files /dev/null and b/resources/iconsets/1_5_1/chain-small-closed.png differ
diff --git a/resources/iconsets/1_5_1/chain-small-open.png b/resources/iconsets/1_5_1/chain-small-open.png
new file mode 100644
index 000000000..d32371f6a
Binary files /dev/null and b/resources/iconsets/1_5_1/chain-small-open.png differ
diff --git a/resources/iconsets/1_5_1/group.png b/resources/iconsets/1_5_1/group.png
deleted file mode 100644
index d2aae0af6..000000000
Binary files a/resources/iconsets/1_5_1/group.png and /dev/null differ
diff --git a/resources/iconsets/1_5_1/level-bottom.png b/resources/iconsets/1_5_1/level-bottom.png
new file mode 100644
index 000000000..89dd044a8
Binary files /dev/null and b/resources/iconsets/1_5_1/level-bottom.png differ
diff --git a/resources/iconsets/1_5_1/level-down.png b/resources/iconsets/1_5_1/level-down.png
new file mode 100644
index 000000000..de94d3c76
Binary files /dev/null and b/resources/iconsets/1_5_1/level-down.png differ
diff --git a/resources/iconsets/1_5_1/level-top.png b/resources/iconsets/1_5_1/level-top.png
new file mode 100644
index 000000000..d34bc0084
Binary files /dev/null and b/resources/iconsets/1_5_1/level-top.png differ
diff --git a/resources/iconsets/1_5_1/level-up.png b/resources/iconsets/1_5_1/level-up.png
new file mode 100644
index 000000000..d863d84a8
Binary files /dev/null and b/resources/iconsets/1_5_1/level-up.png differ
diff --git a/resources/iconsets/1_5_1/ungroup.png b/resources/iconsets/1_5_1/ungroup.png
deleted file mode 100644
index 52a8f19b9..000000000
Binary files a/resources/iconsets/1_5_1/ungroup.png and /dev/null differ
diff --git a/scribus/ui/propertiespalette_xyz.cpp b/scribus/ui/propertiespalette_xyz.cpp
index 62be16af1..52268ee77 100644
--- a/scribus/ui/propertiespalette_xyz.cpp
+++ b/scribus/ui/propertiespalette_xyz.cpp
@@ -61,32 +61,30 @@ PropertiesPalette_XYZ::PropertiesPalette_XYZ( QWidget* parent) : QWidget(parent)
 	connect(userActionSniffer, SIGNAL(actionStart()), this, SLOT(spinboxStartUserAction()));
 	connect(userActionSniffer, SIGNAL(actionEnd()), this, SLOT(spinboxFinishUserAction()));
 
-	nameEdit->setFocusPolicy(Qt::ClickFocus);
-
 	installSniffer(xposSpin);
 	installSniffer(yposSpin);
 	installSniffer(widthSpin);
 	installSniffer(heightSpin);
 
+	IconManager& im=IconManager::instance();
+
 	keepFrameWHRatioButton->setCheckable( true );
-	keepFrameWHRatioButton->setAutoRaise( true );
-	keepFrameWHRatioButton->setMaximumSize( QSize( 15, 32767 ) );
-	keepFrameWHRatioButton->setChecked(false);
+	{
+		QIcon icon = QIcon();
+		icon.addPixmap(im.loadPixmap("chain-small-closed.png"), QIcon::Normal, QIcon::On);
+		icon.addPixmap(im.loadPixmap("chain-small-open.png"), QIcon::Normal, QIcon::Off);
+		keepFrameWHRatioButton->setIcon(icon);
+	}
 
+	// rotation->setPixmap(im.loadPixmap("rotation.png")); // TODO: using the unicode char might even be better... but i did not manage to load the pixmap in the label
 	rotationSpin->setNewUnit(6);
 	rotationSpin->setWrapping( true );
 	installSniffer(rotationSpin);
-	rotationLabel->setBuddy(rotationSpin);
-
-	IconManager& im=IconManager::instance();
-	levelUp->setIcon(im.loadIcon("16/go-up.png"));
-	levelDown->setIcon(im.loadIcon("16/go-down.png"));
-	levelTop->setIcon(im.loadIcon("16/go-top.png"));
-	levelBottom->setIcon(im.loadIcon("16/go-bottom.png"));
-	levelLabel->setAlignment( Qt::AlignCenter );
 
-	doGroup->setIcon(im.loadIcon("group.png"));
-	doUnGroup->setIcon(im.loadIcon("ungroup.png"));
+	levelUp->setIcon(IconManager::instance().loadIcon("level-up.png"));
+	levelDown->setIcon(IconManager::instance().loadIcon("level-down.png"));
+	levelTop->setIcon(IconManager::instance().loadIcon("level-top.png"));
+	levelBottom->setIcon(IconManager::instance().loadIcon("level-bottom.png"));
 
 	flipH->setIcon(im.loadIcon("16/flip-object-horizontal.png"));
 	flipH->setCheckable( true );
@@ -128,12 +126,9 @@ PropertiesPalette_XYZ::PropertiesPalette_XYZ( QWidget* parent) : QWidget(parent)
 	connect(levelBottom, SIGNAL(clicked()), this, SLOT(handleBack()));
 	connect(basePointWidget, SIGNAL(buttonClicked(int)), this, SLOT(handleBasePoint(int)));
 
-	connect(nameEdit , SIGNAL(Leaved()) , this, SLOT(handleNewName()));
 	connect(doLock   , SIGNAL(clicked()), this, SLOT(handleLock()));
 	connect(noPrint  , SIGNAL(clicked()), this, SLOT(handlePrint()));
 	connect(noResize , SIGNAL(clicked()), this, SLOT(handleLockSize()));
-	connect(doGroup  , SIGNAL(clicked()), this, SLOT(handleGrouping()) );
-	connect(doUnGroup, SIGNAL(clicked()), this, SLOT(handleUngrouping()) );
 
 	m_haveItem = false;
 	xposSpin->showValue(0);
@@ -203,19 +198,16 @@ void PropertiesPalette_XYZ::unsetDoc()
 	m_haveItem = false;
 	m_doc   = nullptr;
 	m_item  = nullptr;
-	nameEdit->clear();
 	xposSpin->setConstants(nullptr);
 	yposSpin->setConstants(nullptr);
 	widthSpin->setConstants(nullptr);
 	heightSpin->setConstants(nullptr);
-	doGroup->setEnabled(false);
-	doUnGroup->setEnabled(false);
 	flipH->setEnabled(false);
 	flipV->setEnabled(false);
-	xposLabel->setText( tr( "&X-Pos:" ) );
-	yposLabel->setText( tr( "&Y-Pos:" ) );
-	widthLabel->setText( tr( "&Width:" ) );
-	heightLabel->setText( tr( "&Height:" ) );
+	xposLabel->setText(tr("&X"));
+	yposLabel->setText(tr("&Y"));
+	widthLabel->setText(tr("&W"));
+	heightLabel->setText(tr("&H"));
 	xposSpin->showValue(0);
 	yposSpin->showValue(0);
 	widthSpin->showValue(0);
@@ -288,16 +280,11 @@ void PropertiesPalette_XYZ::setCurrentItem(PageItem *item)
 	if (!m_doc)
 		setDoc(item->doc());
 
-	disconnect(nameEdit, SIGNAL(Leaved()), this, SLOT(handleNewName()));
-
 	m_haveItem = false;
 	m_item = item;
 
-	nameEdit->setText(m_item->itemName());
 	levelLabel->setText( QString::number(m_item->level()) );
 
-	connect(nameEdit, SIGNAL(Leaved()), this, SLOT(handleNewName()));
-
 //CB replaces old emits from PageItem::emitAllToGUI()
 	disconnect(xposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewX()));
 	disconnect(yposSpin, SIGNAL(valueChanged(double)), this, SLOT(handleNewY()));
@@ -344,29 +331,34 @@ void PropertiesPalette_XYZ::setCurrentItem(PageItem *item)
 	connect(flipV   , SIGNAL(clicked()), this, SLOT(handleFlipV()), Qt::UniqueConnection);
 	connect(rotationSpin, SIGNAL(valueChanged(double)), this, SLOT(handleRotation()), Qt::UniqueConnection);
 
-	bool setter = false;
-	xposSpin->setEnabled(!setter);
-	yposSpin->setEnabled(!setter);
-	bool haveSameParent = m_doc->m_Selection->objectsHaveSameParent();
-	levelGroup->setEnabled(haveSameParent && !item->locked());
+	xposSpin->setEnabled(true);
+	yposSpin->setEnabled(true);
+	{
+		bool enabled = m_doc->m_Selection->objectsHaveSameParent() && !item->locked();
+		levelTop->setEnabled(enabled);
+		levelUp->setEnabled(enabled);
+		levelDown->setEnabled(enabled);
+		levelBottom->setEnabled(enabled);
+	}
+	// TODO: what is doing this?
 	if ((m_item->isGroup()) && (!m_item->isSingleSel))
 	{
 		setEnabled(true);
 	}
 	if ((m_item->itemType() == PageItem::Line) && m_lineMode)
 	{
-		xposLabel->setText( tr( "&X1:" ) );
-		yposLabel->setText( tr( "Y&1:" ) );
-		widthLabel->setText( tr( "X&2:" ) );
-		heightLabel->setText( tr( "&Y2:" ) );
+		xposLabel->setText(tr("&X1"));
+		yposLabel->setText(tr("Y&1"));
+		widthLabel->setText(tr("X&2"));
+		heightLabel->setText(tr("&Y2"));
 		rotationSpin->setEnabled(false);
 	}
 	else
 	{
-		xposLabel->setText( tr( "&X-Pos:" ) );
-		yposLabel->setText( tr( "&Y-Pos:" ) );
-		widthLabel->setText( tr( "&Width:" ) );
-		heightLabel->setText( tr( "&Height:" ) );
+		xposLabel->setText(tr("&X"));
+		yposLabel->setText(tr("&Y"));
+		widthLabel->setText(tr("&W"));
+		heightLabel->setText(tr("&H"));
 		rotationSpin->setEnabled(true);
 	}
 	m_haveItem = true;
@@ -389,14 +381,6 @@ void PropertiesPalette_XYZ::setCurrentItem(PageItem *item)
 		rrR = 360 - rrR;
 	noResize->setEnabled(!m_item->isArc());
 	
-	doGroup->setEnabled(false);
-	doUnGroup->setEnabled(false);
-	if ((m_doc->m_Selection->count() > 1) && (haveSameParent))
-		doGroup->setEnabled(true);
-	if (m_doc->m_Selection->count() == 1)
-		doUnGroup->setEnabled(m_item->isGroup());
-	if ((m_doc->appMode == modeEditClip) && (m_item->isGroup()))
-		doUnGroup->setEnabled(false);
 	if (m_item->asOSGFrame())
 	{
 		setEnabled(true);
@@ -413,7 +397,6 @@ void PropertiesPalette_XYZ::handleAppModeChanged(int oldMode, int mode)
 {
 	if (!m_haveDoc || !m_haveItem || !m_ScMW || m_ScMW->scriptIsRunning())
 		return;
-	doUnGroup->setEnabled(mode != modeEdit && mode != modeEditClip && m_item->isGroup());
 	doLock->setEnabled(mode != modeEditClip);
 }
 
@@ -422,8 +405,6 @@ void PropertiesPalette_XYZ::handleSelectionChanged()
 	if (!m_haveDoc || !m_ScMW || m_ScMW->scriptIsRunning())
 		return;
 
-	nameEdit->setEnabled(m_doc->m_Selection->count() == 1);
-
 	PageItem* currItem = currentItemFromSelection();
 	if (m_doc->m_Selection->count() > 1)
 	{
@@ -458,7 +439,6 @@ void PropertiesPalette_XYZ::handleSelectionChanged()
 		heightSpin->setEnabled(true);
 		rotationSpin->setEnabled(true);
 
-		nameEdit->setEnabled(false);
 		flipH->setCheckable( false );
 		flipV->setCheckable( false );
 		flipH->setChecked(false);
@@ -474,12 +454,6 @@ void PropertiesPalette_XYZ::handleSelectionChanged()
 		int itemType = currItem ? (int) currItem->itemType() : -1;
 		
 		m_haveItem = (itemType!=-1);
-		if (itemType == -1)
-		{
-			doGroup->setEnabled(false);
-			doUnGroup->setEnabled(false);
-		}
-		nameEdit->setEnabled(true);
 		basePointWidget->setEnabled(true);
 
 		setEnabled(true);
@@ -1187,6 +1161,7 @@ void PropertiesPalette_XYZ::handleFlipV()
 	m_ScMW->scrActions["itemFlipV"]->toggle();
 }
 
+/*
 void PropertiesPalette_XYZ::handleNewName()
 {
 	if (m_ScMW->scriptIsRunning() || !m_haveDoc || !m_haveItem)
@@ -1233,6 +1208,7 @@ void PropertiesPalette_XYZ::handleNewName()
 		}
 	}
 }
+*/
 
 void PropertiesPalette_XYZ::installSniffer(ScrSpinBox *spinBox)
 {
@@ -1359,20 +1335,3 @@ void PropertiesPalette_XYZ::showFlippedV(bool isFlippedV)
 {
 	flipV->setChecked(isFlippedV);
 }
-
-void PropertiesPalette_XYZ::handleGrouping()
-{
-	m_ScMW->GroupObj();
-	doGroup->setEnabled(false);
-	doUnGroup->setEnabled(true);
-	handleSelectionChanged();
-	//FIXME
-	//TabStack->setItemEnabled(idShapeItem, false);
-}
-
-void PropertiesPalette_XYZ::handleUngrouping()
-{
-	m_ScMW->UnGroupObj();
-	m_doc->invalidateAll();
-	m_doc->regionsChanged()->update(QRect());
-}
diff --git a/scribus/ui/propertiespalette_xyz.h b/scribus/ui/propertiespalette_xyz.h
index 7892c5043..3d31181e5 100644
--- a/scribus/ui/propertiespalette_xyz.h
+++ b/scribus/ui/propertiespalette_xyz.h
@@ -84,9 +84,6 @@ private slots:
 	void handleLock();
 	void handleLockSize();
 	void handlePrint();
-	void handleNewName();
-	void handleGrouping();
-	void handleUngrouping();
 
 protected slots:
 	//virtual void reject();
diff --git a/scribus/ui/propertiespalette_xyzbase.ui b/scribus/ui/propertiespalette_xyzbase.ui
index 06e9c35d5..9171e3d76 100644
--- a/scribus/ui/propertiespalette_xyzbase.ui
+++ b/scribus/ui/propertiespalette_xyzbase.ui
@@ -30,353 +30,104 @@
     <number>0</number>
    </property>
    <item>
-    <widget class="QGroupBox" name="nameGroup">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Name</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>2</number>
-      </property>
-      <property name="leftMargin">
-       <number>2</number>
-      </property>
-      <property name="topMargin">
-       <number>2</number>
-      </property>
-      <property name="rightMargin">
-       <number>2</number>
-      </property>
-      <property name="bottomMargin">
-       <number>2</number>
-      </property>
-      <item>
-       <widget class="NameWidget" name="nameEdit">
-        <property name="focusPolicy">
-         <enum>Qt::ClickFocus</enum>
-        </property>
-        <property name="toolTip">
-         <string>Name of selected object</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="geoGroup">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Geometry</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="leftMargin">
-       <number>2</number>
-      </property>
-      <property name="topMargin">
-       <number>2</number>
-      </property>
-      <property name="rightMargin">
-       <number>2</number>
-      </property>
-      <property name="bottomMargin">
-       <number>2</number>
-      </property>
-      <item>
-       <layout class="QGridLayout" name="geoGroupLayout">
-        <property name="leftMargin">
-         <number>5</number>
-        </property>
-        <property name="topMargin">
-         <number>5</number>
-        </property>
-        <property name="rightMargin">
-         <number>5</number>
-        </property>
-        <property name="bottomMargin">
-         <number>5</number>
-        </property>
-        <property name="spacing">
-         <number>4</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="QLabel" name="xposLabel">
-          <property name="text">
-           <string>&amp;X-Pos:</string>
-          </property>
-          <property name="buddy">
-           <cstring>xposSpin</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="ScrSpinBox" name="xposSpin">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Horizontal position of current basepoint</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="widthLabel">
-          <property name="text">
-           <string>&amp;Width:</string>
-          </property>
-          <property name="buddy">
-           <cstring>widthSpin</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="yposLabel">
-          <property name="text">
-           <string>&amp;Y-Pos:</string>
-          </property>
-          <property name="buddy">
-           <cstring>yposSpin</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="ScrSpinBox" name="yposSpin">
-          <property name="toolTip">
-           <string>Vertical position of current basepoint</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="ScrSpinBox" name="widthSpin">
-          <property name="toolTip">
-           <string>Width of current selection</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="heightLabel">
-          <property name="text">
-           <string>&amp;Height:</string>
-          </property>
-          <property name="buddy">
-           <cstring>heightSpin</cstring>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="1">
-         <widget class="ScrSpinBox" name="heightSpin">
-          <property name="toolTip">
-           <string>Height of current selection</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="rotationLabel">
-          <property name="text">
-           <string>&amp;Rotation:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="ScrSpinBox" name="rotationSpin">
-          <property name="toolTip">
-           <string>Rotation of object at current basepoint</string>
-          </property>
-          <property name="wrapping">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="0">
-         <widget class="QLabel" name="basepointLabel">
-          <property name="toolTip">
-           <string>Point from which measurements or rotation angles are referenced</string>
-          </property>
-          <property name="text">
-           <string>Basepoint:</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1">
-         <widget class="BasePointWidget" name="basePointWidget" native="true"/>
-        </item>
-        <item row="2" column="2" rowspan="2">
-         <widget class="LinkButton" name="keepFrameWHRatioButton">
-          <property name="maximumSize">
-           <size>
-            <width>15</width>
-            <height>32767</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Keep the aspect ratio</string>
-          </property>
-          <property name="text">
-           <string>...</string>
-          </property>
-          <property name="checkable">
-           <bool>true</bool>
-          </property>
-          <property name="autoRaise">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QGroupBox" name="levelGroup">
-       <property name="title">
-        <string>Level</string>
+    <layout class="QGridLayout" name="gridLayout_3">
+     <item row="1" column="4">
+      <widget class="QLabel" name="heightLabel">
+       <property name="text">
+        <string>&amp;H</string>
+       </property>
+       <property name="buddy">
+        <cstring>heightSpin</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLabel" name="xposLabel">
+       <property name="text">
+        <string>&amp;X:</string>
+       </property>
+       <property name="buddy">
+        <cstring>xposSpin</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="5">
+      <widget class="ScrSpinBox" name="heightSpin">
+       <property name="toolTip">
+        <string>Height of current selection</string>
        </property>
-       <layout class="QGridLayout" name="gridLayout">
-        <property name="leftMargin">
-         <number>5</number>
-        </property>
-        <property name="topMargin">
-         <number>5</number>
-        </property>
-        <property name="rightMargin">
-         <number>5</number>
-        </property>
-        <property name="bottomMargin">
-         <number>5</number>
-        </property>
-        <property name="spacing">
-         <number>4</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="QToolButton" name="levelUp">
-          <property name="maximumSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Move one level up</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QToolButton" name="levelDown">
-          <property name="maximumSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Move one level down</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QToolButton" name="levelTop">
-          <property name="maximumSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Move to front</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QToolButton" name="levelBottom">
-          <property name="maximumSize">
-           <size>
-            <width>22</width>
-            <height>22</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Move to back</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2" rowspan="2">
-         <widget class="QLabel" name="levelLabel">
-          <property name="toolTip">
-           <string>Indicates the level the object is on, 1 means the object is at the bottom</string>
-          </property>
-          <property name="text">
-           <string>0</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
       </widget>
      </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+     <item row="0" column="2">
+      <widget class="ScrSpinBox" name="xposSpin">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
+       <property name="toolTip">
+        <string>Horizontal position of current basepoint</string>
        </property>
-      </spacer>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="ScrSpinBox" name="widthSpin">
+       <property name="toolTip">
+        <string>Width of current selection</string>
+       </property>
+      </widget>
      </item>
-     <item>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="0" column="0">
-        <widget class="QToolButton" name="doGroup">
+     <item row="0" column="5">
+      <widget class="ScrSpinBox" name="yposSpin">
+       <property name="toolTip">
+        <string>Vertical position of current basepoint</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QLabel" name="yposLabel">
+       <property name="text">
+        <string>&amp;Y:</string>
+       </property>
+       <property name="buddy">
+        <cstring>yposSpin</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="widthLabel">
+       <property name="text">
+        <string>&amp;W</string>
+       </property>
+       <property name="buddy">
+        <cstring>widthSpin</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2" colspan="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="ScrSpinBox" name="rotationSpin">
          <property name="toolTip">
-          <string>Group the selected objects</string>
+          <string>Rotation of object at current basepoint</string>
          </property>
-         <property name="text">
-          <string/>
+         <property name="wrapping">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QToolButton" name="doUnGroup">
+       <item>
+        <widget class="QToolButton" name="flipV">
          <property name="toolTip">
-          <string>Ungroup the selected group</string>
+          <string>Flip vertically</string>
          </property>
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
+       <item>
         <widget class="QToolButton" name="flipH">
          <property name="toolTip">
           <string>Flip horizontally</string>
@@ -386,48 +137,159 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QToolButton" name="flipV">
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="6">
+      <widget class="QToolButton" name="noResize">
+       <property name="toolTip">
+        <string>Lock or unlock the size of the object</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLabel" name="rotation">
+       <property name="text">
+        <string>⟳</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="6">
+      <widget class="QToolButton" name="doLock">
+       <property name="toolTip">
+        <string>Lock or unlock the object</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="2" colspan="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item>
+        <widget class="QToolButton" name="levelTop">
+         <property name="maximumSize">
+          <size>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
          <property name="toolTip">
-          <string>Flip vertically</string>
+          <string>Move to front</string>
          </property>
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
-       <item row="0" column="2">
-        <widget class="QToolButton" name="doLock">
+       <item>
+        <widget class="QToolButton" name="levelUp">
+         <property name="maximumSize">
+          <size>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
          <property name="toolTip">
-          <string>Lock or unlock the object</string>
+          <string>Move one level up</string>
          </property>
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
-       <item row="1" column="2">
-        <widget class="QToolButton" name="noPrint">
+       <item>
+        <widget class="QToolButton" name="levelDown">
+         <property name="maximumSize">
+          <size>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
          <property name="toolTip">
-          <string>Enable or disable exporting of the object</string>
+          <string>Move one level down</string>
          </property>
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
-       <item row="0" column="3">
-        <widget class="QToolButton" name="noResize">
+       <item>
+        <widget class="QToolButton" name="levelBottom">
+         <property name="maximumSize">
+          <size>
+           <width>22</width>
+           <height>22</height>
+          </size>
+         </property>
          <property name="toolTip">
-          <string>Lock or unlock the size of the object</string>
+          <string>Move to back</string>
          </property>
          <property name="text">
           <string/>
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QLabel" name="levelLabel">
+         <property name="toolTip">
+          <string>Indicates the level the object is on, 1 means the object is at the bottom</string>
+         </property>
+         <property name="text">
+          <string>0</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </item>
+     <item row="2" column="5" rowspan="3">
+      <widget class="BasePointWidget" name="basePointWidget" native="true"/>
+     </item>
+     <item row="2" column="6">
+      <widget class="QToolButton" name="noPrint">
+       <property name="toolTip">
+        <string>Enable or disable exporting of the object</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QToolButton" name="keepFrameWHRatioButton">
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>
@@ -446,11 +308,6 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>NameWidget</class>
-   <extends>QLineEdit</extends>
-   <header>ui/propertiespalette_utils.h</header>
-  </customwidget>
   <customwidget>
    <class>ScrSpinBox</class>
    <extends>QDoubleSpinBox</extends>
@@ -462,11 +319,6 @@
    <header>ui/basepointwidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>LinkButton</class>
-   <extends>QToolButton</extends>
-   <header>ui/linkbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
