diff --git a/plugins/tools/svgtexttool/SvgTextEditor.cpp b/plugins/tools/svgtexttool/SvgTextEditor.cpp
index 1516e0fa20..64a2404b84 100644
--- a/plugins/tools/svgtexttool/SvgTextEditor.cpp
+++ b/plugins/tools/svgtexttool/SvgTextEditor.cpp
@@ -1,903 +1,864 @@
 /* This file is part of the KDE project
  *
  * Copyright 2017 Boudewijn Rempt <boud@valdyas.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "SvgTextEditor.h"
 
 #include <QPainter>
 #include <QVBoxLayout>
 #include <QUrl>
 #include <QPushButton>
 #include <QDebug>
 #include <QAction>
 #include <QWidgetAction>
 #include <QMenu>
 #include <QTabWidget>
 #include <QFontComboBox>
 #include <QComboBox>
 #include <QMessageBox>
 #include <QBuffer>
 #include <QSvgGenerator>
 #include <QTextEdit>
 #include <QDialogButtonBox>
 #include <QDoubleSpinBox>
 
 #include <kcharselect.h>
 #include <klocalizedstring.h>
 #include <ksharedconfig.h>
 #include <kconfiggroup.h>
 #include <kactioncollection.h>
 #include <kxmlguifactory.h>
 #include <ktoolbar.h>
 #include <ktoggleaction.h>
 #include <kguiitem.h>
 
 #include <KoDialog.h>
 #include <KoResourcePaths.h>
 #include <KoSvgTextShape.h>
 #include <KoSvgTextShapeMarkupConverter.h>
 #include <KoColorSpaceRegistry.h>
 #include <KoColorPopupAction.h>
 #include <svg/SvgUtil.h>
 
 #include <kis_icon.h>
 #include <kis_config.h>
 #include <kis_file_name_requester.h>
 #include <BasicXMLSyntaxHighlighter.h>
 #include <kis_action_registry.h>
 
 #include "kis_font_family_combo_box.h"
 
 SvgTextEditor::SvgTextEditor(QWidget *parent, Qt::WindowFlags flags)
     : KXmlGuiWindow(parent, flags)
     , m_page(new QWidget(this))
     , m_charSelectDialog(new KoDialog(this))
 {
     m_textEditorWidget.setupUi(m_page);
     setCentralWidget(m_page);
 
     KCharSelect *charSelector = new KCharSelect(m_charSelectDialog, 0, KCharSelect::AllGuiElements);
     m_charSelectDialog->setMainWidget(charSelector);
     connect(charSelector, SIGNAL(currentCharChanged(QChar)), SLOT(insertCharacter(QChar)));
     m_charSelectDialog->hide();
     m_charSelectDialog->setButtons(KoDialog::Close);
 
     connect(m_textEditorWidget.buttons, SIGNAL(accepted()), this, SLOT(save()));
     connect(m_textEditorWidget.buttons, SIGNAL(rejected()), this, SLOT(close()));
     connect(m_textEditorWidget.buttons, SIGNAL(clicked(QAbstractButton*)), this, SLOT(dialogButtonClicked(QAbstractButton*)));
 
     KConfigGroup cg(KSharedConfig::openConfig(), "SvgTextTool");
     actionCollection()->setConfigGroup("SvgTextTool");
     actionCollection()->setComponentName("svgtexttool");
     actionCollection()->setComponentDisplayName(i18n("Text Tool"));
 
     QByteArray state;
     if (cg.hasKey("WindowState")) {
         state = cg.readEntry("State", state);
         state = QByteArray::fromBase64(state);
         // One day will need to load the version number, but for now, assume 0
         restoreState(state);
     }
 
     setAcceptDrops(true);
     setStandardToolBarMenuEnabled(true);
 #ifdef Q_OS_OSX
     setUnifiedTitleAndToolBarOnMac(true);
 #endif
     setTabPosition(Qt::AllDockWidgetAreas, QTabWidget::North);
 
     BasicXMLSyntaxHighlighter *hl = new BasicXMLSyntaxHighlighter(m_textEditorWidget.svgTextEdit);
     Q_UNUSED(hl);
 
     createActions();
     // If we have customized the toolbars, load that first
     setLocalXMLFile(KoResourcePaths::locateLocal("data", "svgtexttool.xmlgui"));
     setXMLFile(":/kxmlgui5/svgtexttool.xmlgui");
 
     guiFactory()->addClient(this);
 
     // Create and plug toolbar list for Settings menu
     QList<QAction *> toolbarList;
     Q_FOREACH (QWidget* it, guiFactory()->containers("ToolBar")) {
         KToolBar * toolBar = ::qobject_cast<KToolBar *>(it);
 
         if (toolBar) {
             KToggleAction* act = new KToggleAction(i18n("Show %1 Toolbar", toolBar->windowTitle()), this);
             actionCollection()->addAction(toolBar->objectName().toUtf8(), act);
             act->setCheckedState(KGuiItem(i18n("Hide %1 Toolbar", toolBar->windowTitle())));
             connect(act, SIGNAL(toggled(bool)), this, SLOT(slotToolbarToggled(bool)));
             act->setChecked(!toolBar->isHidden());
             toolbarList.append(act);
         }
     }
     plugActionList("toolbarlist", toolbarList);
     connect(m_textEditorWidget.textTab, SIGNAL(currentChanged(int)), this, SLOT(switchTextEditorTab()));
     switchTextEditorTab();
 
     m_textEditorWidget.richTextEdit->document()->setDefaultStyleSheet("p {margin:0px;}");
 }
 
 SvgTextEditor::~SvgTextEditor()
 {
     KConfigGroup g(KSharedConfig::openConfig(), "SvgTextTool");
     QByteArray ba = saveState();
     g.writeEntry("windowState", ba.toBase64());
 }
 
 
 void SvgTextEditor::setShape(KoSvgTextShape *shape)
 {
     m_shape = shape;
     if (m_shape) {
         KoSvgTextShapeMarkupConverter converter(m_shape);
 
         QString svg;
         QString styles;
         QString html;
 
         if (converter.convertToHtml(&html)) {
 
             qDebug() << "html:" << html;
 
             m_textEditorWidget.richTextEdit->document()->clear();
             m_textEditorWidget.richTextEdit->document()->setHtml(html);
             m_textEditorWidget.richTextEdit->document()->setModified(false);
         }
 
         if (converter.convertToSvg(&svg, &styles)) {
             m_textEditorWidget.svgTextEdit->setPlainText(svg);
             m_textEditorWidget.svgStylesEdit->setPlainText(styles);
             m_textEditorWidget.svgTextEdit->document()->setModified(false);
 
         }
         else {
             QMessageBox::warning(this, i18n("Conversion failed"), "Could not get svg text from the shape:\n" + converter.errors().join('\n') + "\n" + converter.warnings().join('\n'));
         }
     }
 
 }
 
 void SvgTextEditor::save()
 {
     if (m_shape) {
         if (m_textEditorWidget.textTab->currentIndex() == Richtext) {
 
             QString svg;
             QString styles;
             KoSvgTextShapeMarkupConverter converter(m_shape);
 
             if (!converter.convertFromHtml(m_textEditorWidget.richTextEdit->document()->toHtml(), &svg, &styles)) {
                 qWarning() << "Eeeek";
             }
             m_textEditorWidget.richTextEdit->document()->setModified(false);
             emit textUpdated(svg, styles);
         }
         else {
             emit textUpdated(m_textEditorWidget.svgTextEdit->document()->toPlainText(), m_textEditorWidget.svgStylesEdit->document()->toPlainText());
             m_textEditorWidget.svgTextEdit->document()->setModified(false);
         }
     }
 
 }
 
 void SvgTextEditor::switchTextEditorTab()
 {
     KoSvgTextShape shape;
     KoSvgTextShapeMarkupConverter converter(&shape);
 
     if (m_currentEditor) {
         disconnect(m_currentEditor->document(), SIGNAL(modificationChanged(bool)), this, SLOT(setModified(bool)));
     }
 
     if (m_textEditorWidget.textTab->currentIndex() == Richtext) {
         //first, make buttons checkable
         enableRichTextActions(true);
 
         //then connect the cursor change to the checkformat();
         connect(m_textEditorWidget.richTextEdit, SIGNAL(cursorPositionChanged()), this, SLOT(checkFormat()));
         if (m_shape) {
 
             // Convert the svg text to html XXX: Fix resolution! Also, the rect should be the image rect, not the shape rect.
             if (!converter.convertFromSvg(m_textEditorWidget.svgTextEdit->document()->toPlainText(), m_textEditorWidget.svgStylesEdit->document()->toPlainText(),
                                           m_shape->boundingRect(), 72.0)) {
                 qDebug() << "Eeek 3";
             }
             QString html;
             if (!converter.convertToHtml(&html)) {
                 qDebug() << "Eeek 4";
             }
             m_textEditorWidget.richTextEdit->document()->setHtml(html);
         }
         m_currentEditor = m_textEditorWidget.richTextEdit;
     }
     else {
         //first, make buttons uncheckable
         enableRichTextActions(false);
         disconnect(m_textEditorWidget.richTextEdit, SIGNAL(cursorPositionChanged()), this, SLOT(checkFormat()));
 
         // Convert the rich text to svg and styles strings
         if (m_shape) {
             QString svg;
             QString styles;
 
             if (!converter.convertFromHtml(m_textEditorWidget.richTextEdit->document()->toHtml(), &svg, &styles)) {
                 qWarning() << "Eeeek";
             }
             //if (!converter.convertToSvg(&svg, &styles)) {
             //    qDebug() << "Eeeek 2";
             //}
             m_textEditorWidget.svgTextEdit->setPlainText(svg);
             m_textEditorWidget.svgStylesEdit->setPlainText(styles);
         }
         m_currentEditor = m_textEditorWidget.svgTextEdit;
     }
 
     connect(m_currentEditor->document(), SIGNAL(modificationChanged(bool)), SLOT(setModified(bool)));
 }
 
 void SvgTextEditor::checkFormat()
 {
     QTextCharFormat format = m_textEditorWidget.richTextEdit->textCursor().charFormat();
     QTextBlockFormat blockFormat = m_textEditorWidget.richTextEdit->textCursor().blockFormat();
     if (format.fontWeight() > QFont::Normal) {
-        actionCollection()->action("weight_bold")->setChecked(true);
+        actionCollection()->action("svg_weight_bold")->setChecked(true);
     } else {
-        actionCollection()->action("weight_bold")->setChecked(false);
+        actionCollection()->action("svg_weight_bold")->setChecked(false);
     }
-    actionCollection()->action("format_italic")->setChecked(format.fontItalic());
-    actionCollection()->action("format_underline")->setChecked(format.fontUnderline());
-    actionCollection()->action("format_strike_through")->setChecked(format.fontStrikeOut());
+    actionCollection()->action("svg_format_italic")->setChecked(format.fontItalic());
+    actionCollection()->action("svg_format_underline")->setChecked(format.fontUnderline());
+    actionCollection()->action("svg_format_strike_through")->setChecked(format.fontStrikeOut());
 
     qobject_cast<KisFontComboBoxes*>(qobject_cast<QWidgetAction*>(actionCollection()->action("svg_font"))->defaultWidget())->setCurrentFont(format.font());
     QComboBox *fontSizeCombo = qobject_cast<QComboBox*>(qobject_cast<QWidgetAction*>(actionCollection()->action("svg_font_size"))->defaultWidget());
     fontSizeCombo->setCurrentIndex(QFontDatabase::standardSizes().indexOf(format.font().pointSize()));
 
     KoColor fg(format.foreground().color(), KoColorSpaceRegistry::instance()->rgb8());
     qobject_cast<KoColorPopupAction*>(actionCollection()->action("svg_format_textcolor"))->setCurrentColor(fg);
 
     KoColor bg(format.foreground().color(), KoColorSpaceRegistry::instance()->rgb8());
     qobject_cast<KoColorPopupAction*>(actionCollection()->action("svg_background_color"))->setCurrentColor(bg);
 
-    QDoubleSpinBox *spnLineHeight = qobject_cast<QDoubleSpinBox*>(qobject_cast<QWidgetAction*>(actionCollection()->action("line_height"))->defaultWidget());
+    QDoubleSpinBox *spnLineHeight = qobject_cast<QDoubleSpinBox*>(qobject_cast<QWidgetAction*>(actionCollection()->action("svg_line_height"))->defaultWidget());
     if (blockFormat.lineHeightType()==QTextBlockFormat::SingleHeight) {
         spnLineHeight->setValue(1.0);
     } else if(blockFormat.lineHeightType()==QTextBlockFormat::ProportionalHeight) {
         spnLineHeight->setValue(double(blockFormat.lineHeight()/100.0));
     }
 }
 
 void SvgTextEditor::undo()
 {
     m_currentEditor->undo();
 }
 
 void SvgTextEditor::redo()
 {
     m_currentEditor->redo();
 }
 
 void SvgTextEditor::cut()
 {
     m_currentEditor->cut();
 }
 
 void SvgTextEditor::copy()
 {
     m_currentEditor->copy();
 }
 
 void SvgTextEditor::paste()
 {
     m_currentEditor->paste();
 }
 
 void SvgTextEditor::selectAll()
 {
     m_currentEditor->selectAll();
 }
 
 void SvgTextEditor::deselect()
 {
     m_currentEditor->textCursor().clearSelection();
 }
 
 void SvgTextEditor::find()
 {
 
 }
 
 void SvgTextEditor::findNext()
 {
 
 }
 
 void SvgTextEditor::findPrev()
 {
 
 }
 
 void SvgTextEditor::replace()
 {
 
 }
 
 
 void SvgTextEditor::zoomOut()
 {
     m_currentEditor->zoomOut();
 }
 
 void SvgTextEditor::zoomIn()
 {
     m_currentEditor->zoomIn();
 }
 
 void SvgTextEditor::showInsertSpecialCharacterDialog()
 {
     m_charSelectDialog->setVisible(!m_charSelectDialog->isVisible());
 }
 
 void SvgTextEditor::insertCharacter(const QChar &c)
 {
     m_currentEditor->textCursor().insertText(QString(c));
 }
 
 
 void SvgTextEditor::setTextBold(QFont::Weight weight)
 {
     if (m_textEditorWidget.textTab->currentIndex() == Richtext) {
         QTextCharFormat format;
         if (m_textEditorWidget.richTextEdit->textCursor().charFormat().fontWeight() > QFont::Normal && weight==QFont::Bold) {
             format.setFontWeight(QFont::Normal);
         } else {
             format.setFontWeight(weight);
         }
         m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
     } else {
         QTextCursor cursor = m_textEditorWidget.svgTextEdit->textCursor();
         if (cursor.hasSelection()) {
             QString selectionModified = "<tspan style=\"font-weight:700;\">" + cursor.selectedText() + "</tspan>";
             cursor.removeSelectedText();
             cursor.insertText(selectionModified);
         }
     }
 }
 
 void SvgTextEditor::setTextWeightLight()
 {
     if (m_textEditorWidget.richTextEdit->textCursor().charFormat().fontWeight() < QFont::Normal) {
         setTextBold(QFont::Normal);
     } else {
         setTextBold(QFont::Light);
     }
 }
 
 void SvgTextEditor::setTextWeightNormal()
 {
     setTextBold(QFont::Normal);
 }
 
 void SvgTextEditor::setTextWeightDemi()
 {
     if (m_textEditorWidget.richTextEdit->textCursor().charFormat().fontWeight()>QFont::Normal
             && m_textEditorWidget.richTextEdit->textCursor().charFormat().fontWeight()<QFont::Normal) {
         setTextBold(QFont::Normal);
     } else {
         setTextBold(QFont::DemiBold);
     }
 }
 
 void SvgTextEditor::setTextWeightBlack()
 {
     if (m_textEditorWidget.richTextEdit->textCursor().charFormat().fontWeight()>QFont::Normal) {
         setTextBold(QFont::Normal);
     } else {
         setTextBold(QFont::Black);
     }
 }
 
 void SvgTextEditor::setTextItalic(QFont::Style style)
 {
     QTextCursor cursor = m_textEditorWidget.svgTextEdit->textCursor();
     QString fontStyle = "inherit";
 
     if (style == QFont::StyleItalic) {
         fontStyle = "italic";
     } else if(style == QFont::StyleOblique) {
         fontStyle = "oblique";
     }
 
     if (m_textEditorWidget.textTab->currentIndex() == Richtext) {
         QTextCharFormat format;
         format.setFontItalic(!m_textEditorWidget.richTextEdit->textCursor().charFormat().fontItalic());
         m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
     }
     else {
         if (cursor.hasSelection()) {
             QString selectionModified = "<tspan style=\"font-style:"+fontStyle+";\">" + cursor.selectedText() + "</tspan>";
             cursor.removeSelectedText();
             cursor.insertText(selectionModified);
         }
     }
 }
 
 void SvgTextEditor::setTextDecoration(KoSvgText::TextDecoration decor)
 {
     QTextCursor cursor = m_textEditorWidget.svgTextEdit->textCursor();
     QTextCharFormat currentFormat = m_textEditorWidget.richTextEdit->textCursor().charFormat();
     QTextCharFormat format;
     QString textDecoration = "inherit";
 
     if (decor == KoSvgText::DecorationUnderline) {
         textDecoration = "underline";
         if (currentFormat.fontUnderline()) {
             format.setFontUnderline(false);
         }
         else {
             format.setFontUnderline(true);
         }
         format.setFontOverline(false);
         format.setFontStrikeOut(false);
     }
     else if (decor == KoSvgText::DecorationLineThrough) {
         textDecoration = "line-through";
         format.setFontUnderline(false);
         format.setFontOverline(false);
         if (currentFormat.fontStrikeOut()) {
             format.setFontStrikeOut(false);
         }
         else {
             format.setFontStrikeOut(true);
         }
     }
     else if (decor == KoSvgText::DecorationOverline) {
         textDecoration = "overline";
         format.setFontUnderline(false);
         if (currentFormat.fontOverline()) {
             format.setFontOverline(false);
         }
         else {
             format.setFontOverline(true);
         }
         format.setFontStrikeOut(false);
     }
 
     if (m_textEditorWidget.textTab->currentIndex() == Richtext) {
         m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
     }
     else {
         if (cursor.hasSelection()) {
             QString selectionModified = "<tspan style=\"text-decoration:" + textDecoration + ";\">" + cursor.selectedText() + "</tspan>";
             cursor.removeSelectedText();
             cursor.insertText(selectionModified);
         }
     }
 }
 
 void SvgTextEditor::setTextUnderline()
 {
     setTextDecoration(KoSvgText::DecorationUnderline);
 }
 
 void SvgTextEditor::setTextOverline()
 {
     setTextDecoration(KoSvgText::DecorationOverline);
 }
 
 void SvgTextEditor::setTextStrikethrough()
 {
     setTextDecoration(KoSvgText::DecorationLineThrough);
 }
 
 void SvgTextEditor::setTextSubscript()
 {
     QTextCharFormat format = m_textEditorWidget.richTextEdit->textCursor().charFormat();
     if (format.verticalAlignment()==QTextCharFormat::AlignSubScript) {
         format.setVerticalAlignment(QTextCharFormat::AlignNormal);
     } else {
         format.setVerticalAlignment(QTextCharFormat::AlignSubScript);
     }
     m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
 }
 
 void SvgTextEditor::setTextSuperScript()
 {
     QTextCharFormat format = m_textEditorWidget.richTextEdit->textCursor().charFormat();
     if (format.verticalAlignment()==QTextCharFormat::AlignSuperScript) {
         format.setVerticalAlignment(QTextCharFormat::AlignNormal);
     } else {
         format.setVerticalAlignment(QTextCharFormat::AlignSuperScript);
     }
     m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
 }
 
 void SvgTextEditor::increaseTextSize()
 {
     QTextCharFormat format;
     int pointSize = m_textEditorWidget.richTextEdit->textCursor().charFormat().font().pointSize();
     if (pointSize<0) {
         pointSize = m_textEditorWidget.richTextEdit->textCursor().charFormat().font().pixelSize();
     }
     qDebug()<<pointSize;
     format.setFontPointSize(pointSize+1.0);
     m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
 }
 
 void SvgTextEditor::decreaseTextSize()
 {
     QTextCharFormat format;
     int pointSize = m_textEditorWidget.richTextEdit->textCursor().charFormat().font().pointSize();
     if (pointSize<1) {
         pointSize = m_textEditorWidget.richTextEdit->textCursor().charFormat().font().pixelSize();
     }
     format.setFontPointSize(qMax(pointSize-1.0, 1.0));
     m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
 }
 
 void SvgTextEditor::setLineHeight(double lineHeightEm)
 {
     QTextBlockFormat format = m_textEditorWidget.richTextEdit->textCursor().blockFormat();
     format.setLineHeight(lineHeightEm*100, QTextBlockFormat::ProportionalHeight);
      m_textEditorWidget.richTextEdit->textCursor().mergeBlockFormat(format);
 }
 
 
 void SvgTextEditor::alignLeft()
 {
     QTextBlockFormat format = m_textEditorWidget.richTextEdit->textCursor().blockFormat();
     format.setAlignment(Qt::AlignLeft);
     m_textEditorWidget.richTextEdit->textCursor().mergeBlockFormat(format);
 }
 
 void SvgTextEditor::alignRight()
 {
     QTextBlockFormat format = m_textEditorWidget.richTextEdit->textCursor().blockFormat();
     format.setAlignment(Qt::AlignRight);
     m_textEditorWidget.richTextEdit->textCursor().mergeBlockFormat(format);
 }
 
 void SvgTextEditor::alignCenter()
 {
     QTextBlockFormat format = m_textEditorWidget.richTextEdit->textCursor().blockFormat();
     format.setAlignment(Qt::AlignCenter);
     m_textEditorWidget.richTextEdit->textCursor().mergeBlockFormat(format);
 }
 
 void SvgTextEditor::alignJustified()
 {
     QTextBlockFormat format = m_textEditorWidget.richTextEdit->textCursor().blockFormat();
     format.setAlignment(Qt::AlignJustify);
     m_textEditorWidget.richTextEdit->textCursor().mergeBlockFormat(format);
 }
 
 void SvgTextEditor::setShapeProperties()
 {
 
 }
 
 void SvgTextEditor::slotConfigureToolbars()
 {
 
 }
 
 void SvgTextEditor::slotToolbarToggled(bool)
 {
 
 }
 
 void SvgTextEditor::setFontColor(const KoColor &c)
 {
     QColor color = c.toQColor();
     if (m_textEditorWidget.textTab->currentIndex() == Richtext) {
         QTextCharFormat format;
         format.setForeground(QBrush(color));
         m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
     }
     else {
         QTextCursor cursor = m_textEditorWidget.svgTextEdit->textCursor();
         if (cursor.hasSelection()) {
             QString selectionModified = "<tspan fill=\""+color.name()+"\">" + cursor.selectedText() + "</tspan>";
             cursor.removeSelectedText();
             cursor.insertText(selectionModified);
         }
     }
 }
 
 void SvgTextEditor::setBackgroundColor(const KoColor &c)
 {
     QColor color = c.toQColor();
     QTextCursor cursor = m_textEditorWidget.svgTextEdit->textCursor();
     if (cursor.hasSelection()) {
         QString selectionModified = "<tspan stroke=\""+color.name()+"\">" + cursor.selectedText() + "</tspan>";
         cursor.removeSelectedText();
         cursor.insertText(selectionModified);
     }
 }
 
 void SvgTextEditor::setModified(bool modified)
 {
     if (modified) {
         m_textEditorWidget.buttons->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Discard);
     }
     else {
         m_textEditorWidget.buttons->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Close);
     }
 }
 
 void SvgTextEditor::dialogButtonClicked(QAbstractButton *button)
 {
     if (m_textEditorWidget.buttons->standardButton(button) == QDialogButtonBox::Discard) {
         if (QMessageBox::warning(this, i18nc("@title:window", "Krita"), i18n("You have modified the text. Discard changes?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
             close();
         }
     }
 }
 
 void SvgTextEditor::setFont(const QString &fontName)
 {
     QFont font;
     font.fromString(fontName);
     QTextCharFormat format = m_textEditorWidget.richTextEdit->textCursor().charFormat();
     font.setPointSize(format.font().pointSize());
     format.setFont(font);
     if (m_textEditorWidget.textTab->currentIndex() == Richtext) {
         m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
     } else {
         QTextCursor cursor = m_textEditorWidget.svgTextEdit->textCursor();
         if (cursor.hasSelection()) {
             QString selectionModified = "<tspan style=\"font-family:"+font.family()+" "+font.styleName()+";\">" + cursor.selectedText() + "</tspan>";
             cursor.removeSelectedText();
             cursor.insertText(selectionModified);
         }
     }
 }
 
 void SvgTextEditor::setFontSize(const QString &fontSize)
 {
     if (m_textEditorWidget.textTab->currentIndex() == Richtext) {
         QTextCharFormat format;
         format.setFontPointSize((qreal)fontSize.toInt());
         m_textEditorWidget.richTextEdit->mergeCurrentCharFormat(format);
     } else {
         QTextCursor cursor = m_textEditorWidget.svgTextEdit->textCursor();
         if (cursor.hasSelection()) {
             QString selectionModified = "<tspan style=\"font-size:"+fontSize+";\">" + cursor.selectedText() + "</tspan>";
             cursor.removeSelectedText();
             cursor.insertText(selectionModified);
         }
     }
 }
 
 void SvgTextEditor::setBaseline(KoSvgText::BaselineShiftMode)
 {
 
     QTextCursor cursor = m_textEditorWidget.svgTextEdit->textCursor();
     if (cursor.hasSelection()) {
         QString selectionModified = "<tspan style=\"font-size:50%;baseline-shift:super;\">" + cursor.selectedText() + "</tspan>";
         cursor.removeSelectedText();
         cursor.insertText(selectionModified);
     }
 }
 
 void SvgTextEditor::wheelEvent(QWheelEvent *event)
 {
     if (event->modifiers() & Qt::ControlModifier) {
         int numDegrees = event->delta() / 8;
         int numSteps = numDegrees / 7;
         m_textEditorWidget.svgTextEdit->zoomOut(numSteps);
         event->accept();
     }
 }
 
-QAction *SvgTextEditor::createAction(const QString &name, const QString &text, const QString &icon, const char *member)
+QAction *SvgTextEditor::createAction(const QString &name, const char *member)
 {
-    QAction *action = new QAction(KisIconUtils::loadIcon(icon), text, this);
+    QAction *action = new QAction(this);
     KisActionRegistry *actionRegistry = KisActionRegistry::instance();
     actionRegistry->propertizeAction(name, action);
 
     actionCollection()->addAction(name, action);
     QObject::connect(action, SIGNAL(triggered(bool)), this, member);
     return action;
 }
 
 
 void SvgTextEditor::createActions()
 {
     KisActionRegistry *actionRegistry = KisActionRegistry::instance();
 
 
     // File: new, open, save, save as, close
-    KStandardAction::openNew(this, SLOT(openNew()), actionCollection());
-    KStandardAction::open(this, SLOT(open()), actionCollection());
     KStandardAction::save(this, SLOT(save()), actionCollection());
-    KStandardAction::saveAs(this, SLOT(saveAs()), actionCollection());
     KStandardAction::close(this, SLOT(close()), actionCollection());
 
     // Edit
     KStandardAction::undo(this, SLOT(undo()), actionCollection());
     KStandardAction::redo(this, SLOT(redo()), actionCollection());
     KStandardAction::cut(this, SLOT(cut()), actionCollection());
     KStandardAction::copy(this, SLOT(copy()), actionCollection());
     KStandardAction::paste(this, SLOT(paste()), actionCollection());
     KStandardAction::selectAll(this, SLOT(selectAll()), actionCollection());
     KStandardAction::deselect(this, SLOT(deselect()), actionCollection());
     KStandardAction::find(this, SLOT(find()), actionCollection());
     KStandardAction::findNext(this, SLOT(findNext()), actionCollection());
     KStandardAction::findPrev(this, SLOT(findPrev()), actionCollection());
     KStandardAction::replace(this, SLOT(replace()), actionCollection());
 
     // View
     KStandardAction::zoomOut(this, SLOT(zoomOut()), actionCollection());
     KStandardAction::zoomIn(this, SLOT(zoomIn()), actionCollection());
 
     // Insert:
-    QAction * insertAction = createAction("insert_special_character",
-                                          i18n("Insert Special Character"),
-                                          "insert-special-character",
+    QAction * insertAction = createAction("svg_insert_special_character",
                                           SLOT(showInsertSpecialCharacterDialog()));
     insertAction->setCheckable(true);
     insertAction->setChecked(false);
 
     // Format:
-    m_richTextActions << createAction("weight_bold",
-                                      i18n("Bold"),
-                                      "format-text-bold",
+    m_richTextActions << createAction("svg_weight_bold",
                                       SLOT(setTextBold()));
 
-    m_richTextActions << createAction("format_italic",
-                                      i18n("Italic"),
-                                      "format-text-italic",
+    m_richTextActions << createAction("svg_format_italic",
                                       SLOT(setTextItalic()));
 
-    m_richTextActions << createAction("format_underline",
-                                      i18n("Underline"),
-                                      "format-text-underline",
+    m_richTextActions << createAction("svg_format_underline",
                                       SLOT(setTextUnderline()));
 
-    m_richTextActions << createAction("format_strike_through",
-                                      i18n("Strike-through"),
-                                      "format-text-strike-through",
+    m_richTextActions << createAction("svg_format_strike_through",
                                       SLOT(setTextStrikethrough()));
 
-    m_richTextActions << createAction("format_superscript",
-                                      i18n("Superscript"),
-                                      "format-text-superscript",
+    m_richTextActions << createAction("svg_format_superscript",
                                       SLOT(setTextSuperScript()));
 
-    m_richTextActions << createAction("format_subscript",
-                                      i18n("Subscript"),
-                                      "format-text-subscript",
+    m_richTextActions << createAction("svg_format_subscript",
                                       SLOT(setTextSubscript()));
 
-    m_richTextActions << createAction("weight_light",
-                                      i18n("Light"),
-                                      "format-text-light",
+    m_richTextActions << createAction("svg_weight_light",
                                       SLOT(setTextWeightLight()));
 
-    m_richTextActions << createAction("weight_normal",
-                                      i18n("Normal"),
-                                      "format-text-normal",
+    m_richTextActions << createAction("svg_weight_normal",
                                       SLOT(setTextWeightNormal()));
 
-    m_richTextActions << createAction("weight_demi",
-                                      i18n("Demi"),
-                                      "format-text-demi",
+    m_richTextActions << createAction("svg_weight_demi",
                                       SLOT(setTextWeightDemi()));
 
-    m_richTextActions << createAction("weight_black",
-                                      i18n("Black"),
-                                      "format-text-black",
+    m_richTextActions << createAction("svg_weight_black",
                                       SLOT(setTextWeightBlack()));
 
-    m_richTextActions << createAction("increase_font_size",
-                                      i18n("Larger"),
-                                      "increase-font-size",
+    m_richTextActions << createAction("svg_increase_font_size",
                                       SLOT(increaseTextSize()));
 
-    m_richTextActions << createAction("decrease_font_size",
-                                      i18n("Smaller"),
-                                      "decrease-font-size",
+    m_richTextActions << createAction("svg_decrease_font_size",
                                       SLOT(decreaseTextSize()));
 
-    m_richTextActions << createAction("align_left",
-                                      i18n("Align Left"),
-                                      "align-left",
+    m_richTextActions << createAction("svg_align_left",
                                       SLOT(alignLeft()));
 
-    m_richTextActions << createAction("align_right",
-                                      i18n("Alight Right"),
-                                      "align-right",
+    m_richTextActions << createAction("svg_align_right",
                                       SLOT(alignRight()));
 
-    m_richTextActions << createAction("align_center",
-                                      i18n("Align Center"),
-                                      "align-center",
+    m_richTextActions << createAction("svg_align_center",
                                       SLOT(alignCenter()));
 
-//    m_richTextActions << createAction("align_justified",
-//                                      i18n("Alight Justified"),
-//                                      "align-justified",
+//    m_richTextActions << createAction("svg_align_justified",
 //                                      SLOT(alignJustified()));
 
     // Settings: configure toolbars
-    m_richTextActions << createAction("options_shape_properties",
-                                      i18n("Properties"),
-                                      "svg_settings",
+    m_richTextActions << createAction("svg_options_shape_properties",
                                       SLOT(setShapeProperties()));
 
     KStandardAction::configureToolbars(this, SLOT(slotConfigureToolbars()), actionCollection());
 
     QWidgetAction *fontComboAction = new QWidgetAction(this);
     fontComboAction->setToolTip(i18n("Font"));
     KisFontComboBoxes *fontCombo = new KisFontComboBoxes();
     connect(fontCombo, SIGNAL(fontChanged(QString)), SLOT(setFont(QString)));
     fontComboAction->setDefaultWidget(fontCombo);
     actionCollection()->addAction("svg_font", fontComboAction);
     m_richTextActions << fontComboAction;
     actionRegistry->propertizeAction("svg_font", fontComboAction);
 
     QWidgetAction *fontSizeAction = new QWidgetAction(this);
     fontSizeAction->setToolTip(i18n("Size"));
     QComboBox *fontSizeCombo = new QComboBox();
     Q_FOREACH (int size, QFontDatabase::standardSizes()) {
         fontSizeCombo->addItem(QString::number(size));
     }
     fontSizeCombo->setCurrentIndex(QFontDatabase::standardSizes().indexOf(QApplication::font().pointSize()));
     connect(fontSizeCombo, SIGNAL(activated(QString)), SLOT(setFontSize(QString)));
     fontSizeAction->setDefaultWidget(fontSizeCombo);
     actionCollection()->addAction("svg_font_size", fontSizeAction);
     m_richTextActions << fontSizeAction;
     actionRegistry->propertizeAction("svg_font_size", fontSizeAction);
 
 
     KoColorPopupAction *fgColor = new KoColorPopupAction(this);
     fgColor->setCurrentColor(QColor(Qt::black));
     fgColor->setToolTip(i18n("Text Color"));
     connect(fgColor, SIGNAL(colorChanged(KoColor)), SLOT(setFontColor(KoColor)));
     actionCollection()->addAction("svg_format_textcolor", fgColor);
     m_richTextActions << fgColor;
     actionRegistry->propertizeAction("svg_format_textcolor", fgColor);
 
     KoColorPopupAction *bgColor = new KoColorPopupAction(this);
     bgColor->setCurrentColor(QColor(Qt::white));
     bgColor->setToolTip(i18n("Background Color"));
     connect(bgColor, SIGNAL(colorChanged(KoColor)), SLOT(setBackgroundColor(KoColor)));
     actionCollection()->addAction("svg_background_color", bgColor);
     actionRegistry->propertizeAction("svg_background_color", bgColor);
     m_richTextActions << bgColor;
 
     QWidgetAction *lineHeight = new QWidgetAction(this);
     lineHeight->setToolTip(i18n("Line height"));
     QDoubleSpinBox *spnLineHeight = new QDoubleSpinBox();
     spnLineHeight->setRange(0.0, 99.0);
     spnLineHeight->setSingleStep(0.1);
     spnLineHeight->setSuffix(i18n(" em"));//Does this need to be translated?
     connect(spnLineHeight, SIGNAL(valueChanged(double)), SLOT(setLineHeight(double)));
     lineHeight->setDefaultWidget(spnLineHeight);
-    actionCollection()->addAction("line_height", lineHeight);
+    actionCollection()->addAction("svg_line_height", lineHeight);
     m_richTextActions << lineHeight;
-    actionRegistry->propertizeAction("line_height", lineHeight);
+    actionRegistry->propertizeAction("svg_line_height", lineHeight);
 }
 
 void SvgTextEditor::enableRichTextActions(bool enable)
 {
     Q_FOREACH(QAction *action, m_richTextActions) {
         action->setEnabled(enable);
     }
 }
diff --git a/plugins/tools/svgtexttool/SvgTextEditor.h b/plugins/tools/svgtexttool/SvgTextEditor.h
index 9374503a51..49461813c2 100644
--- a/plugins/tools/svgtexttool/SvgTextEditor.h
+++ b/plugins/tools/svgtexttool/SvgTextEditor.h
@@ -1,144 +1,142 @@
 /* This file is part of the KDE project
  *
  * Copyright 2017 Boudewijn Rempt <boud@valdyas.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef TEXTNGSHAPECONFIGWIDGET_H
 #define TEXTNGSHAPECONFIGWIDGET_H
 
 #include <QWidget>
 #include <QTextEdit>
 
 #include <kxmlguiwindow.h>
 #include <KoColor.h>
 #include <KoSvgText.h>//for the enums
 
 #include "ui_WdgSvgTextEditor.h"
 
 class KoSvgTextShape;
 class KisFileNameRequester;
 class KoDialog;
 
 class SvgTextEditor : public KXmlGuiWindow
 {
     Q_OBJECT
 public:
     SvgTextEditor(QWidget *parent = 0, Qt::WindowFlags flags = 0);
     ~SvgTextEditor();
 
     //tiny enum to keep track of the tab on which editor something happens while keeping the code readable.
     enum Editor {
         Richtext, // 0
         SVGsource // 1
     };
 
     void setShape(KoSvgTextShape *shape);
 
 private Q_SLOTS:
 
     /**
      * switch the text editor tab.
      */
     void switchTextEditorTab();
     /**
      * in rich text, check the current format, and toggle the given buttons.
      */
     void checkFormat();
 
     void save();
 
     void undo();
     void redo();
     void cut();
     void copy();
     void paste();
     void selectAll();
     void deselect();
     void find();
     void findNext();
     void findPrev();
     void replace();
 
     void zoomOut();
     void zoomIn();
 
     void showInsertSpecialCharacterDialog();
     void insertCharacter(const QChar &c);
 
     void setTextBold(QFont::Weight weight = QFont::Bold);
     void setTextWeightLight();
     void setTextWeightNormal();
     void setTextWeightDemi();
     void setTextWeightBlack();
 
     void setTextItalic(QFont::Style style = QFont::StyleOblique);
     void setTextDecoration(KoSvgText::TextDecoration decor);
     void setTextUnderline();
     void setTextOverline();
     void setTextStrikethrough();
     void setTextSubscript();
     void setTextSuperScript();
     void increaseTextSize();
     void decreaseTextSize();
 
     void setLineHeight(double lineHeightEm);
     void alignLeft();
     void alignRight();
     void alignCenter();
     void alignJustified();
 
     void setFont(const QString &fontName);
     void setFontSize(const QString &size);
     void setBaseline(KoSvgText::BaselineShiftMode baseline);
 
     void setShapeProperties();
     void slotConfigureToolbars();
     void slotToolbarToggled(bool);
 
     void setFontColor(const KoColor &c);
     void setBackgroundColor(const KoColor &c);
 
     void setModified(bool modified);
     void dialogButtonClicked(QAbstractButton *button);
 
 Q_SIGNALS:
 
     void textUpdated(const QString &svg, const QString &defs);
 
 protected:
 
     void wheelEvent(QWheelEvent *event) override;
 
 private:
 
     QAction *createAction(const QString &name,
-                          const QString &text,
-                          const QString &icon,
                           const char *member);
     void createActions();
     void enableRichTextActions(bool enable);
 
     Ui_WdgSvgTextEditor m_textEditorWidget;
     QTextEdit *m_currentEditor {0};
     QWidget *m_page {0};
     QList<QAction*> m_richTextActions;
     KoSvgTextShape *m_shape {0};
     KoDialog *m_charSelectDialog {0};
 };
 
 #endif //TEXTNGSHAPECONFIGWIDGET_H
diff --git a/plugins/tools/svgtexttool/SvgTextTool.action b/plugins/tools/svgtexttool/SvgTextTool.action
index 369ed511c4..1593e80733 100644
--- a/plugins/tools/svgtexttool/SvgTextTool.action
+++ b/plugins/tools/svgtexttool/SvgTextTool.action
@@ -1,216 +1,235 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ActionCollection version="2" name="Tools">
+<ActionCollection version="2" name="svg_Tools">
   <Actions category="Text Tool">
     <text>SVG Text Tool</text>
     <Action name="svg_format_textcolor">
       <iconText>Text Color</iconText>
       <shortcut/>
       <toolTip>Text Color...</toolTip>
       <icon>format-text-color</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Text Color</text>
     </Action>
     <Action name="svg_background_color">
       <iconText>Background</iconText>
       <shortcut/>
       <toolTip>Background Color...</toolTip>
       <icon>format-fill-color</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Background</text>
     </Action>
     <Action name="svg_font_size">
       <iconText>Font Size</iconText>
       <shortcut/>
       <toolTip>Font Size</toolTip>
       <icon/>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Font Size</text>
     </Action>
     <Action name="svg_font">
       <iconText>Font</iconText>
       <shortcut>Ctrl+Alt+F</shortcut>
       <toolTip>Change character size, font, boldface, italics etc.</toolTip>
       <icon/>
       <whatsThis>Change the attributes of the currently selected characters.</whatsThis>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Font...</text>
     </Action>
-    <Action name="insert_special_character">
+    <Action name="svg_insert_special_character">
       <iconText>Special Character</iconText>
       <shortcut>Alt+Shift+C</shortcut>
       <toolTip>Insert one or more symbols or characters not found on the keyboard</toolTip>
       <icon>character-set</icon>
       <whatsThis>Insert one or more symbols or characters not found on the keyboard.</whatsThis>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Special Character...</text>
     </Action>
-    <Action name="align_right">
+    <Action name="svg_align_right">
       <iconText>Align Right</iconText>
       <shortcut>Ctrl+Alt+R</shortcut>
       <toolTip>Align Right</toolTip>
       <icon>format-justify-right</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Align Right</text>
     </Action>
-    <Action name="align_left">
+    <Action name="svg_align_left">
       <iconText>Align Left</iconText>
       <shortcut/>
       <toolTip>Align Left</toolTip>
       <icon>format-justify-left</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Align Left</text>
     </Action>
-    <Action name="align_justified">
+    <Action name="svg_align_justified">
       <iconText>Align Block</iconText>
       <shortcut>Ctrl+Alt+R</shortcut>
       <toolTip>Align Block</toolTip>
       <icon>format-justify-fill</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Align Block</text>
     </Action>
-    <Action name="align_center">
+    <Action name="svg_align_center">
       <iconText>Align Center</iconText>
       <shortcut>Ctrl+Alt+C</shortcut>
       <toolTip>Align Center</toolTip>
       <icon>format-justify-center</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Align Center</text>
     </Action>
-    <Action name="decrease_font_size">
+    <Action name="svg_decrease_font_size">
       <iconText>Decrease Font Size</iconText>
       <shortcut>Ctrl+&lt;</shortcut>
       <toolTip>Decrease Font Size</toolTip>
       <icon/>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Decrease Font Size</text>
     </Action>
-    <Action name="increase_font_size">
+    <Action name="svg_increase_font_size">
       <iconText>Increase Font Size</iconText>
       <shortcut>Ctrl+&gt;</shortcut>
       <toolTip>Increase Font Size</toolTip>
       <icon/>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Increase Font Size</text>
     </Action>
-    <Action name="format_subscript">
+    <Action name="svg_format_subscript">
       <iconText>Subscript</iconText>
       <shortcut>Ctrl+Shift+B</shortcut>
       <toolTip>Subscript</toolTip>
       <icon>format-text-subscript</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Subscript</text>
     </Action>
-    <Action name="format_superscript">
+    <Action name="svg_format_superscript">
       <iconText>Superscript</iconText>
       <shortcut>Ctrl+Shift+P</shortcut>
       <toolTip>Superscript</toolTip>
       <icon>format-text-superscript</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Superscript</text>
     </Action>
-    <Action name="format_underline">
+    <Action name="svg_format_underline">
       <iconText>Underline</iconText>
       <shortcut>Ctrl+U</shortcut>
       <toolTip>Underline</toolTip>
       <icon>format-text-underline</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Underline</text>
     </Action>
-    <Action name="format_strike_through">
+    <Action name="svg_format_strike_through">
       <iconText>Strikethrough</iconText>
       <shortcut/>
       <toolTip>Strikethrough</toolTip>
       <icon>format-text-strikethrough</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Strikethrough</text>
     </Action>
-    <Action name="format_italic">
-      <iconText>Italic</iconText>
-      <shortcut>Ctrl+I</shortcut>
-      <toolTip>Italic</toolTip>
-      <icon>format-text-italic</icon>
-      <whatsThis/>
-      <statusTip/>
-      <isCheckable>false</isCheckable>
-      <text>Italic</text>
-    </Action>
-    <Action name="weight_bold">
+    <Action name="svg_weight_bold">
       <iconText>Bold</iconText>
       <shortcut>Ctrl+B</shortcut>
       <toolTip>Bold</toolTip>
       <icon>format-text-bold</icon>
       <whatsThis/>
       <statusTip/>
-      <isCheckable>false</isCheckable>
+      <isCheckable>true</isCheckable>
       <text>Bold</text>
     </Action>
-    <Action name="weight_normal">
+    <Action name="svg_format_italic">
+      <iconText>Italic</iconText>
+      <shortcut>Ctrl+I</shortcut>
+      <toolTip>Italic</toolTip>
+      <icon>format-text-italic</icon>
+      <whatsThis/>
+      <statusTip/>
+      <isCheckable>true</isCheckable>
+      <text>Italic</text>
+    </Action>
+    <Action name="svg_weight_normal">
       <iconText>Normal</iconText>
       <shortcut>Ctrl+N</shortcut>
       <toolTip>Normal</toolTip>
       <icon>format-text-normal</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Normal</text>
     </Action>
-    <Action name="weight_demi">
+    <Action name="svg_weight_demi">
       <iconText>Demi</iconText>
       <shortcut/>
       <toolTip>Demi</toolTip>
       <icon>format-text-demi</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Demi</text>
     </Action>
-    <Action name="weight_black">
+    <Action name="svg_weight_black">
       <iconText>Black</iconText>
       <shortcut/>
       <toolTip>Black</toolTip>
       <icon>format-text-black</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Black</text>
     </Action>
-    <Action name="weight_light">
+    <Action name="svg_weight_light">
       <iconText>Light</iconText>
       <shortcut>Ctrl+L</shortcut>
       <toolTip>Light</toolTip>
       <icon>format-text-light</icon>
       <whatsThis/>
       <statusTip/>
       <isCheckable>false</isCheckable>
       <text>Light</text>
     </Action>
-  </Actions>
+    <Action name="svg_line_height">
+      <iconText>Line Height</iconText>
+      <shortcut>Ctrl+H</shortcut>
+      <toolTip>Line Height in em</toolTip>
+      <icon></icon>
+      <whatsThis/>
+      <statusTip/>
+      <isCheckable>false</isCheckable>
+      <text>Line Height</text>
+    </Action>
+    <Action name="svg_options_shape_properties">
+      <iconText>Text Shape Properties</iconText>
+      <shortcut>L</shortcut>
+      <toolTip>Text Shape Properties</toolTip>
+      <icon></icon>
+      <whatsThis/>
+      <statusTip/>
+      <isCheckable>false</isCheckable>
+      <text>Text Shape Properties</text>
+    </Action></Actions>
 </ActionCollection>
diff --git a/plugins/tools/svgtexttool/svgtexttool.xmlgui b/plugins/tools/svgtexttool/svgtexttool.xmlgui
index 58aacf9720..9f3f8b2c90 100644
--- a/plugins/tools/svgtexttool/svgtexttool.xmlgui
+++ b/plugins/tools/svgtexttool/svgtexttool.xmlgui
@@ -1,89 +1,89 @@
 <?xml version="1.0"?>
-<kpartgui xmlns="http://www.kde.org/standards/kxmlgui/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="SvgTextTool" version="1" xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0  http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
+<kpartgui xmlns="http://www.kde.org/standards/kxmlgui/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="svg_SvgTextTool" version="1" xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0  http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
   <MenuBar>
     <Menu name="file">
       <text>&amp;File</text>
       <Action name="file_save"/>
       <Separator/>
       <Action name="file_close"/>
     </Menu>
     <Menu name="edit">
       <text>&amp;Edit</text>
       <Action name="edit_undo"/>
       <Action name="edit_redo"/>
       <Separator/>
       <Action name="edit_cut"/>
       <Action name="edit_copy"/>
       <Action name="edit_paste"/>
       <Separator/>
       <Action name="edit_select_all"/>
       <Action name="edit_deselect"/>
       <Separator/>
       <Action name="edit_find"/>
       <Action name="edit_find_next"/>
       <Action name="edit_find_prev"/>
       <Action name="edit_replace"/>
     </Menu>
     <Menu name="view">
       <text>&amp;View</text>
       <Action name="view_zoom_out"/>
       <Action name="view_zoom_in"/>
     </Menu>
     <Menu name="insert">
       <text>&amp;Insert</text>
       <Action name="insert_special_character"/>
     </Menu>
     <Menu name="format">
       <text>&amp;Format</text>
-      <Action name="weight_bold"/>
-      <Action name="format_italic"/>
-      <Action name="format_underline"/>
-      <Action name="format_strike_through"/>
-      <Action name="format_superscript"/>
-      <Action name="format_subscript"/>
+      <Action name="svg_weight_bold"/>
+      <Action name="svg_format_italic"/>
+      <Action name="svg_format_underline"/>
+      <Action name="svg_format_strike_through"/>
+      <Action name="svg_format_superscript"/>
+      <Action name="svg_format_subscript"/>
       <Menu name="weight">
         <text>&amp;Weight</text>
-        <Action name="weight_light"/>
-        <Action name="weight_normal"/>
-        <Action name="weight_bold"/>
-        <Action name="weight_demi_bold"/>
-        <Action name="weight_black"/>
+        <Action name="svg_weight_light"/>
+        <Action name="svg_weight_normal"/>
+        <Action name="svg_weight_bold"/>
+        <Action name="svg_weight_demi_bold"/>
+        <Action name="svg_weight_black"/>
       </Menu>
       <Separator/>
-      <Action name="increase_text_size"/>
-      <Action name="decrease_text_size"/>
+      <Action name="svg_increase_text_size"/>
+      <Action name="svg_decrease_text_size"/>
       <Separator/>
-      <Action name="align_left"/>
-      <Action name="align_center"/>
-      <Action name="align_right"/>
-      <!--Action name="align_justified"/-->
+      <Action name="svg_align_left"/>
+      <Action name="svg_align_center"/>
+      <Action name="svg_align_right"/>
+      <!--Action name="svg_align_justified"/-->
     </Menu>
     <Menu name="settings">
       <text>Setti&amp;ngs</text>
-      <Action name="options_shape_properties"/>
-      <Action name="options_configure_toolbars"/>
-      <Merge name="StandardToolBarMenuHandler"/>
+      <Action name="svg_options_shape_properties"/>
+      <Action name="svg_options_configure_toolbars"/>
+      <Merge name="svg_StandardToolBarMenuHandler"/>
       <Separator/>
     </Menu>
   </MenuBar>
   <ToolBar name="mainToolBar" fullWidth="false" noMerge="1">
     <Text>File</Text>
     <Action name="edit_undo"/>
     <Action name="edit_redo"/>
     <Separator/>
     <Action name="edit_cut"/>
     <Action name="edit_copy"/>
     <Action name="edit_paste"/>
   </ToolBar>
   <ToolBar name="formatting" position="top">
     <Text>Formatting</Text>
     <Action name="svg_font"/>
     <Action name="svg_font_size"/>
-    <Action name="line_height"/>
+    <Action name="svg_line_height"/>
     <Action name="svg_font_color"/>
     <Action name="svg_background_color"/>
-    <Action name="weight_bold"/>
-    <Action name="format_italic"/>
-    <Action name="format_underline"/>
+    <Action name="svg_weight_bold"/>
+    <Action name="svg_format_italic"/>
+    <Action name="svg_format_underline"/>
   </ToolBar>
 </kpartgui>