diff --git a/libs/ui/dialogs/KisDlgPaletteEditor.cpp b/libs/ui/dialogs/KisDlgPaletteEditor.cpp
index 6c93dc6e57..7d7cf09f6f 100644
--- a/libs/ui/dialogs/KisDlgPaletteEditor.cpp
+++ b/libs/ui/dialogs/KisDlgPaletteEditor.cpp
@@ -1,221 +1,235 @@
 /*
  *  Copyright (c) 2018 Michael Zhou <simeirxh@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <QAction>
 #include <QFileInfo>
 #include <QSpinBox>
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QLineEdit>
 #include <QMessageBox>
 #include <QComboBox>
 #include <QInputDialog>
 #include <QFormLayout>
 #include <QPicture>
 #include <QPushButton>
 #include <QSignalBlocker>
 
 #include <KoResourceServerProvider.h>
 #include <KoResourceServer.h>
 #include <KoDialog.h>
 #include <KoColorSet.h>
 #include <kis_global.h>
 #include <KisPaletteModel.h>
 
 #include "KisPaletteEditor.h"
 
 #include "ui_WdgDlgPaletteEditor.h"
 
 #include "KisDlgPaletteEditor.h"
 
 KisDlgPaletteEditor::KisDlgPaletteEditor()
     : m_ui(new Ui_WdgDlgPaletteEditor)
     , m_actAddGroup(new QAction(i18n("Add a group")))
     , m_actDelGroup(new QAction(i18n("Delete this group")))
     , m_actRenGroup(new QAction(i18n("Rename this group")))
+    , m_globalButtons(new QButtonGroup(this))
     , m_paletteEditor(new KisPaletteEditor(this))
     , m_currentGroupOriginalName(KoColorSet::GLOBAL_GROUP_NAME)
 {
     setWindowTitle(i18n("Palette Editor"));
 
     m_ui->setupUi(this);
     m_ui->gbxPalette->setTitle(i18n("Palette settings"));
     m_ui->labelFilename->setText(i18n("Filename"));
     m_ui->labelName->setText(i18n("Palette Name"));
     m_ui->bnAddGroup->setDefaultAction(m_actAddGroup.data());
 
     m_ui->gbxGroup->setTitle(i18n("Group settings"));
     m_ui->labelColCount->setText(i18n("Column count"));
     m_ui->labelRowCount->setText(i18n("Row count"));
     m_ui->bnDelGroup->setDefaultAction(m_actDelGroup.data());
     m_ui->bnRenGroup->setDefaultAction(m_actRenGroup.data());
 
     connect(m_actAddGroup.data(), SIGNAL(triggered(bool)), SLOT(slotAddGroup()));
     connect(m_actDelGroup.data(), SIGNAL(triggered(bool)), SLOT(slotDelGroup()));
     connect(m_actRenGroup.data(), SIGNAL(triggered(bool)), SLOT(slotRenGroup()));
     connect(m_ui->spinBoxRow, SIGNAL(valueChanged(int)), SLOT(slotRowCountChanged(int)));
     connect(m_ui->spinBoxCol, SIGNAL(valueChanged(int)), SLOT(slotColCountChanged(int)));
     connect(m_ui->lineEditName, SIGNAL(editingFinished()), SLOT(slotNameChanged()));
     connect(m_ui->lineEditFilename, SIGNAL(textEdited(QString)), SLOT(slotFilenameChanged(QString)));
     connect(m_ui->lineEditFilename, SIGNAL(editingFinished()), SLOT(slotFilenameInputFinished()));
-    connect(m_ui->ckxGlobal, SIGNAL(stateChanged(int)), SLOT(slotSetGlobal(int)));
+
+    m_globalButtons->addButton(m_ui->rb_global, 0);
+    m_globalButtons->addButton(m_ui->rb_document, 1);
+    connect(m_globalButtons.data(), SIGNAL(buttonClicked(int)), SLOT(slotSetGlobal()));
+
 
     connect(this, SIGNAL(accepted()), SLOT(slotAccepted()));
 
     m_warnPalette.setColor(QPalette::Text, Qt::red);
 }
 
 KisDlgPaletteEditor::~KisDlgPaletteEditor()
 { }
 
 void KisDlgPaletteEditor::setPaletteModel(KisPaletteModel *model)
 {
     m_colorSet = model->colorSet();
     if (m_colorSet.isNull()) {
         return;
     }
     m_paletteEditor->setPaletteModel(model);
 
     // don't let editor make changes when initializing
     const QSignalBlocker blocker1(m_ui->lineEditFilename);
     const QSignalBlocker blocker2(m_ui->lineEditName);
     const QSignalBlocker blocker3(m_ui->spinBoxCol);
     const QSignalBlocker blocker4(m_ui->spinBoxRow);
-    const QSignalBlocker blocker5(m_ui->ckxGlobal);
+    const QSignalBlocker blocker5(m_ui->rb_global);
+    const QSignalBlocker blocker6(m_ui->rb_document);
     const QSignalBlocker blocker7(m_ui->cbxGroup);
 
     m_ui->lineEditName->setText(m_colorSet->name());
     m_ui->lineEditFilename->setText(m_paletteEditor->relativePathFromSaveLocation());
     m_ui->spinBoxCol->setValue(m_colorSet->columnCount());
-    m_ui->ckxGlobal->setCheckState(m_colorSet->isGlobal() ? Qt::Checked : Qt::Unchecked);
+    if (m_colorSet->isGlobal()) {
+        m_globalButtons->button(0)->setChecked(true);
+    } else {
+        m_globalButtons->button(1)->setChecked(true);
+    }
 
     Q_FOREACH (const QString & groupName, m_colorSet->getGroupNames()) {
         m_ui->cbxGroup->addItem(groupName);
     }
 
     connect(m_ui->cbxGroup, SIGNAL(currentTextChanged(QString)), SLOT(slotGroupChosen(QString)));
     m_ui->cbxGroup->setCurrentText(KoColorSet::GLOBAL_GROUP_NAME);
     m_ui->bnDelGroup->setEnabled(false);
     m_ui->bnRenGroup->setEnabled(false);
 
     m_ui->spinBoxRow->setValue(m_paletteEditor->rowNumberOfGroup(KoColorSet::GLOBAL_GROUP_NAME));
 
     bool canWrite = m_colorSet->isEditable();
     m_ui->lineEditName->setEnabled(canWrite);
     m_ui->lineEditFilename->setEnabled(canWrite);
     m_ui->spinBoxCol->setEnabled(canWrite);
     m_ui->spinBoxRow->setEnabled(canWrite);
-    m_ui->ckxGlobal->setEnabled(canWrite);
+    m_ui->rb_global->setEnabled(canWrite);
+    m_ui->rb_document->setEnabled(canWrite);
     m_ui->bnAddGroup->setEnabled(canWrite);
 }
 
 void KisDlgPaletteEditor::setView(KisViewManager *view)
 {
     m_paletteEditor->setView(view);
 }
 
 void KisDlgPaletteEditor::slotAddGroup()
 {
     QString newGroupName = m_paletteEditor->addGroup();
     if (!newGroupName.isEmpty()) {
         m_ui->cbxGroup->addItem(newGroupName);
         m_ui->cbxGroup->setCurrentIndex(m_ui->cbxGroup->count() - 1);
     };
 }
 
 void KisDlgPaletteEditor::slotRenGroup()
 {
     QString newName = m_paletteEditor->renameGroup(m_currentGroupOriginalName);
     if (!newName.isEmpty()) {
         int idx = m_ui->cbxGroup->currentIndex();
         m_ui->cbxGroup->removeItem(idx);
         m_ui->cbxGroup->insertItem(idx, newName);
         m_ui->cbxGroup->setCurrentIndex(idx);
     }
 }
 
 void KisDlgPaletteEditor::slotDelGroup()
 {
     int deletedIdx = m_ui->cbxGroup->currentIndex();
     if (m_paletteEditor->removeGroup(m_currentGroupOriginalName)) {
         m_ui->cbxGroup->setCurrentIndex(0);
         m_ui->cbxGroup->removeItem(deletedIdx);
     }
 }
 
 void KisDlgPaletteEditor::slotGroupChosen(const QString &groupName)
 {
     if (groupName == KoColorSet::GLOBAL_GROUP_NAME) {
         m_ui->bnDelGroup->setEnabled(false);
         m_ui->bnRenGroup->setEnabled(false);
     } else {
         m_ui->bnDelGroup->setEnabled(true);
         m_ui->bnRenGroup->setEnabled(true);
     }
     m_currentGroupOriginalName = m_paletteEditor->oldNameFromNewName(groupName);
     m_ui->spinBoxRow->setValue(m_paletteEditor->rowNumberOfGroup(m_currentGroupOriginalName));
 }
 
 void KisDlgPaletteEditor::slotRowCountChanged(int newCount)
 {
     m_paletteEditor->changeGroupRowCount(m_currentGroupOriginalName, newCount);
 }
 
-void KisDlgPaletteEditor::slotSetGlobal(int state)
+void KisDlgPaletteEditor::slotSetGlobal()
 {
-    bool toGlobal = (state == Qt::Checked);
+    bool toGlobal = false;
+    if (m_ui->rb_global->isChecked()) {
+        toGlobal = true;
+    }
     m_paletteEditor->setGlobal(toGlobal);
 }
 
 void KisDlgPaletteEditor::slotNameChanged()
 {
     m_paletteEditor->rename(qobject_cast<QLineEdit*>(sender())->text());
 }
 
 void KisDlgPaletteEditor::slotFilenameChanged(const QString &newFilename)
 {
     bool global = m_colorSet->isGlobal();
     if (m_paletteEditor->duplicateExistsFilename(newFilename, global)) {
         m_ui->lineEditFilename->setPalette(m_warnPalette);
         m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
         return;
     }
     m_ui->lineEditFilename->setPalette(m_normalPalette);
     m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
     m_paletteEditor->changeFilename(newFilename);
 }
 
 void KisDlgPaletteEditor::slotFilenameInputFinished()
 {
     QString newName = m_ui->lineEditFilename->text();
     bool global = m_colorSet->isGlobal();
     if (m_paletteEditor->duplicateExistsFilename(newName, global)) {
         return;
     }
     m_paletteEditor->changeFilename(newName);
 }
 
 void KisDlgPaletteEditor::slotColCountChanged(int newCount)
 {
     m_paletteEditor->changeColCount(newCount);
 }
 
 void KisDlgPaletteEditor::slotAccepted()
 {
     m_paletteEditor->updatePalette();
 }
diff --git a/libs/ui/dialogs/KisDlgPaletteEditor.h b/libs/ui/dialogs/KisDlgPaletteEditor.h
index adbadbc9f0..dedd193f08 100644
--- a/libs/ui/dialogs/KisDlgPaletteEditor.h
+++ b/libs/ui/dialogs/KisDlgPaletteEditor.h
@@ -1,93 +1,95 @@
 /*
  *  Copyright (c) 2018 Michael Zhou <simeirxh@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program 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 General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef KISDLGPALETTEEDITOR_H
 #define KISDLGPALETTEEDITOR_H
 
 #include <QDialog>
 #include <QPointer>
 #include <QPair>
 #include <QScopedPointer>
 #include <QHash>
 #include <QSet>
+#include <QButtonGroup>
 
 #include "kritaui_export.h"
 
 class QAction;
 
 class KoColorSet;
 class KisPaletteModel;
 class KisSwatchGroup;
 class KoDialog;
 class KisViewManager;
 
 class KisPaletteEditor;
 class Ui_WdgDlgPaletteEditor;
 
 /**
  * @brief The KisDlgPaletteEditor class
  * a dialog used by the palette docker to make modifications to a palette.
  * it automatically uploads all changes into the resource server when
  * the change is accepted
  */
 class KRITAUI_EXPORT KisDlgPaletteEditor : public QDialog
 {
     Q_OBJECT
 public:
     explicit KisDlgPaletteEditor();
     ~KisDlgPaletteEditor();
 
 public:
     void setPaletteModel(KisPaletteModel *);
     KoColorSet* palette() const { return m_colorSet; }
     void setView(KisViewManager *);
 
 private Q_SLOTS:
     void slotDelGroup();
     void slotAddGroup();
     void slotRenGroup();
 
     void slotGroupChosen(const QString &groupName);
 
     void slotRowCountChanged(int);
-    void slotSetGlobal(int);
+    void slotSetGlobal();
 
     void slotNameChanged();
     void slotFilenameChanged(const QString &newFilename);
     void slotFilenameInputFinished();
     void slotColCountChanged(int);
 
     void slotAccepted();
 
 private:
     QString oldNameFromNewName(const QString &newName) const;
 
 private:
     QScopedPointer<Ui_WdgDlgPaletteEditor> m_ui;
     QScopedPointer<QAction> m_actAddGroup;
     QScopedPointer<QAction> m_actDelGroup;
     QScopedPointer<QAction> m_actRenGroup;
+    QScopedPointer<QButtonGroup> m_globalButtons;
     QScopedPointer<KisPaletteEditor> m_paletteEditor;
     QPointer<KoColorSet> m_colorSet;
     QString m_currentGroupOriginalName;
 
     QPalette m_normalPalette;
     QPalette m_warnPalette;
 };
 
 #endif // KISKisDlgPaletteEditor_H
diff --git a/libs/ui/forms/WdgDlgPaletteEditor.ui b/libs/ui/forms/WdgDlgPaletteEditor.ui
index 34d3a6bec1..f22c584c6b 100644
--- a/libs/ui/forms/WdgDlgPaletteEditor.ui
+++ b/libs/ui/forms/WdgDlgPaletteEditor.ui
@@ -1,207 +1,217 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgDlgPaletteEditor</class>
  <widget class="QDialog" name="WdgDlgPaletteEditor">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>524</width>
     <height>481</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QWidget" name="widget" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout_3">
       <item>
        <widget class="QGroupBox" name="gbxPalette">
         <property name="title">
          <string>Palette settings</string>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <item>
           <widget class="QLabel" name="labelName">
            <property name="text">
             <string>Palette Name</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="lineEditName"/>
          </item>
          <item>
           <widget class="QLabel" name="labelFilename">
            <property name="text">
             <string>File name</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLineEdit" name="lineEditFilename"/>
          </item>
          <item>
           <widget class="QLabel" name="labelColCount">
            <property name="text">
             <string>Column count</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QSpinBox" name="spinBoxCol"/>
          </item>
          <item>
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <layout class="QVBoxLayout" name="verticalLayout_4">
            <item>
-            <widget class="QCheckBox" name="ckxGlobal">
+            <widget class="QRadioButton" name="rb_global">
              <property name="text">
-              <string>Global</string>
+              <string>Resource Folder</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="rb_document">
+             <property name="text">
+              <string>Document</string>
              </property>
             </widget>
            </item>
           </layout>
          </item>
          <item>
           <spacer name="verticalSpacer_2">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>40</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QToolButton" name="bnAddGroup">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Add a group</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QGroupBox" name="gbxGroup">
         <property name="title">
          <string>Group settings</string>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <widget class="QComboBox" name="cbxGroup"/>
          </item>
          <item>
           <widget class="QLabel" name="labelRowCount">
            <property name="text">
             <string>Row count</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QSpinBox" name="spinBoxRow"/>
          </item>
          <item>
           <spacer name="verticalSpacer">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>40</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QToolButton" name="bnRenGroup">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Rename this group</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="bnDelGroup">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="text">
             <string>Delete this group</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>WdgDlgPaletteEditor</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
     <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
    <receiver>WdgDlgPaletteEditor</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
     <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>