diff --git a/libs/resources/KisStorageModel.cpp b/libs/resources/KisStorageModel.cpp
index b2ed43d923..afd93caef0 100644
--- a/libs/resources/KisStorageModel.cpp
+++ b/libs/resources/KisStorageModel.cpp
@@ -1,193 +1,230 @@
 /*
  * Copyright (c) 2019 boud <boud@valdyas.org>
  *
  *  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 "KisStorageModel.h"
 
 #include <QtSql>
 
 #include <KisResourceLocator.h>
 
 Q_GLOBAL_STATIC(KisStorageModel, s_instance)
 
 struct KisStorageModel::Private {
     int cachedRowCount {-1};
     QSqlQuery query;
 };
 
 KisStorageModel::KisStorageModel(QObject *parent)
     : QAbstractTableModel(parent)
     , d(new Private())
 {
     prepareQuery();
 }
 
 KisStorageModel *KisStorageModel::instance()
 {
     return s_instance;
 }
 
 KisStorageModel::~KisStorageModel()
 {
 }
 
 int KisStorageModel::rowCount(const QModelIndex & /*parent*/) const
 {
     if (d->cachedRowCount < 0) {
         QSqlQuery q;
         q.prepare("SELECT count(*)\n"
                   "FROM   storages\n");
         q.exec();
         q.first();
 
         const_cast<KisStorageModel*>(this)->d->cachedRowCount = q.value(0).toInt();
     }
     return d->cachedRowCount;
 }
 
 int KisStorageModel::columnCount(const QModelIndex &/*parent*/) const
 {
     return 6;
 }
 
 QVariant KisStorageModel::data(const QModelIndex &index, int role) const
 {
     QVariant v;
     if (!index.isValid()) return v;
     if (index.row() > rowCount()) return v;
     if (index.column() > (int)Active) return v;
 
     bool pos = d->query.seek(index.row());
 
     if (pos) {
         switch(role) {
         case Qt::DisplayRole:
         {
             switch(index.column()) {
             case Id:
                 return d->query.value("id");
             case StorageType:
                 return d->query.value("storage_type");
             case Location:
                 return d->query.value("location");
             case TimeStamp:
                return d->query.value("timestamp");
             case PreInstalled:
                 return d->query.value("pre_installed");
             case Active:
                 return d->query.value("active");
             case Thumbnail:
             {
                 QByteArray ba = d->query.value("thumbnail").toByteArray();
                 QBuffer buf(&ba);
                 buf.open(QBuffer::ReadOnly);
                 QImage img;
                 img.load(&buf, "PNG");
                 return QVariant::fromValue<QImage>(img);
             }
             default:
                 return v;
             }
         }
         case Qt::UserRole + Id:
             return d->query.value("id");
         case Qt::UserRole + StorageType:
             return d->query.value("storage_type");
         case Qt::UserRole + Location:
             return d->query.value("location");
         case Qt::UserRole + TimeStamp:
            return d->query.value("timestamp");
         case Qt::UserRole + PreInstalled:
             return d->query.value("pre_installed");
         case Qt::UserRole + Active:
             return d->query.value("active");
         case Qt::UserRole + Thumbnail:
         {
             QByteArray ba = d->query.value("thumbnail").toByteArray();
             QBuffer buf(&ba);
             buf.open(QBuffer::ReadOnly);
             QImage img;
             img.load(&buf, "PNG");
             return QVariant::fromValue<QImage>(img);
         }
         default:
             ;
         }
     }
     return v;
 
 }
 
 bool KisStorageModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
     if (index.isValid()) {
         if (role == Qt::CheckStateRole) {
             QSqlQuery q;
             bool r = q.prepare("UPDATE storages\n"
                                "SET    active = :active\n"
                                "WHERE  id = :id\n");
             q.bindValue(":active", value);
             q.bindValue(":id", index.data(Qt::UserRole + Id));
             if (!r) {
                 qWarning() << "Could not prepare KisStorageModel update query" << d->query.lastError();
                 return false;
             }
             r = q.exec();
             if (!r) {
                 qWarning() << "Could not execute KisStorageModel update query" << d->query.lastError();
                 return false;
             }
 
         }
     }
     QAbstractTableModel::setData(index, value, role);
     return prepareQuery();
 }
 
 Qt::ItemFlags KisStorageModel::flags(const QModelIndex &index) const
 {
     return QAbstractTableModel::flags(index) | Qt::ItemIsEditable;
 }
 
 KisResourceStorageSP KisStorageModel::storageForId(const QModelIndex &index) const
 {
     return KisResourceLocator::instance()->storageByLocation(index.data(Qt::UserRole + Location).toString());
 }
 
+QVariant KisStorageModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    QVariant v = QVariant();
+    if (role != Qt::DisplayRole) {
+        return v;
+    }
+    if (orientation == Qt::Horizontal) {
+        switch(section) {
+        case 0:
+            v = i18n("Id");
+            break;
+        case 1:
+            v = i18n("Type");
+            break;
+        case 2:
+            v = i18n("Location");
+            break;
+        case 3:
+            v = i18n("Creation Date");
+            break;
+        case 4:
+            v = i18n("Preinstalled");
+            break;
+        case 5:
+            v = i18n("Active");
+            break;
+        case 6:
+            v = i18n("Thumbnail");
+            break;
+        default:
+            v = QString::number(section);
+        }
+        return v;
+    }
+    return QAbstractTableModel::headerData(section, orientation, role);
+}
+
 bool KisStorageModel::prepareQuery()
 {
     beginResetModel();
     bool r = d->query.prepare("SELECT storages.id as id\n"
                               ",      storage_types.name as storage_type\n"
                               ",      location\n"
                               ",      timestamp\n"
                               ",      pre_installed\n"
                               ",      active\n"
                               ",      thumbnail\n"
                               "FROM   storages\n"
                               ",      storage_types\n"
                               "WHERE  storages.storage_type_id = storage_types.id\n");
     if (!r) {
         qWarning() << "Could not prepare KisStorageModel query" << d->query.lastError();
     }
     r = d->query.exec();
     if (!r) {
         qWarning() << "Could not execute KisStorageModel query" << d->query.lastError();
     }
     d->cachedRowCount = -1;
     endResetModel();
     return r;
 }
diff --git a/libs/resources/KisStorageModel.h b/libs/resources/KisStorageModel.h
index 61c47be1b3..1c2021536f 100644
--- a/libs/resources/KisStorageModel.h
+++ b/libs/resources/KisStorageModel.h
@@ -1,68 +1,70 @@
 /*
  * Copyright (c) 2019 boud <boud@valdyas.org>
  *
  *  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 KISSTORAGEMODEL_H
 #define KISSTORAGEMODEL_H
 
 #include <QAbstractTableModel>
 #include <QObject>
 #include <QScopedPointer>
 
 #include "KisResourceStorage.h"
 #include "kritaresources_export.h"
 
 class KRITARESOURCES_EXPORT KisStorageModel : public QAbstractTableModel
 {
 public:
 
     enum Columns {
         Id = 0,
         StorageType,
         Location,
         TimeStamp,
         PreInstalled,
         Active,
         Thumbnail
     };
 
     static KisStorageModel * instance();
 
     KisStorageModel(QObject *parent = 0);
     ~KisStorageModel() override;
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
     int columnCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role) const override;
     bool setData(const QModelIndex &index, const QVariant &value, int role) override;
     Qt::ItemFlags flags(const QModelIndex &index) const override;
 
     KisResourceStorageSP storageForId(const QModelIndex &index) const;
 
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
 private:
 
     KisStorageModel(const KisStorageModel&);
     KisStorageModel operator=(const KisStorageModel&);
 
     bool prepareQuery();
 
     struct Private;
     QScopedPointer<Private> d;
 
 
 };
 
 #endif // KISSTORAGEMODEL_H
diff --git a/plugins/extensions/resourcemanager/wdgdlgbundlemanager.ui b/plugins/extensions/resourcemanager/wdgdlgbundlemanager.ui
index 0c3d5872fc..f8913cf172 100644
--- a/plugins/extensions/resourcemanager/wdgdlgbundlemanager.ui
+++ b/plugins/extensions/resourcemanager/wdgdlgbundlemanager.ui
@@ -1,362 +1,371 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgDlgBundleManager</class>
  <widget class="QWidget" name="WdgDlgBundleManager">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>778</width>
     <height>572</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_4">
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QTableView" name="tableView">
        <property name="iconSize">
         <size>
          <width>48</width>
          <height>48</height>
         </size>
        </property>
+       <attribute name="horizontalHeaderStretchLastSection">
+        <bool>true</bool>
+       </attribute>
+       <attribute name="verticalHeaderStretchLastSection">
+        <bool>true</bool>
+       </attribute>
       </widget>
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
        <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>
        <item>
         <widget class="QToolButton" name="bnAdd">
          <property name="toolTip">
           <string>Import a resource library</string>
          </property>
          <property name="text">
           <string>...</string>
          </property>
          <property name="icon">
-          <iconset theme="new"/>
+          <iconset theme="new">
+           <normaloff>.</normaloff>.</iconset>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QToolButton" name="bnNew">
          <property name="toolTip">
           <string>Create a resource library</string>
          </property>
          <property name="text">
           <string>...</string>
          </property>
          <property name="icon">
-          <iconset theme="add"/>
+          <iconset theme="add">
+           <normaloff>.</normaloff>.</iconset>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QToolButton" name="bnDelete">
          <property name="toolTip">
           <string>Delete a resource library</string>
          </property>
          <property name="text">
           <string>...</string>
          </property>
          <property name="icon">
-          <iconset theme="delete"/>
+          <iconset theme="delete">
+           <normaloff>.</normaloff>.</iconset>
          </property>
         </widget>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="BundleSelectedGroupBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
      <property name="title">
       <string/>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_8">
       <item>
        <widget class="QSplitter" name="splitter_2">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="childrenCollapsible">
          <bool>false</bool>
         </property>
         <widget class="QWidget" name="selectedBundleInfoContainer">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>10</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_4">
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_2">
             <item>
              <widget class="QLabel" name="lblName">
               <property name="text">
                <string>Bundle Name</string>
               </property>
               <property name="textFormat">
                <enum>Qt::AutoText</enum>
               </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>
            <widget class="QPlainTextEdit" name="lblDescription">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
               <horstretch>0</horstretch>
               <verstretch>10</verstretch>
              </sizepolicy>
             </property>
             <property name="minimumSize">
              <size>
               <width>0</width>
               <height>50</height>
              </size>
             </property>
             <property name="readOnly">
              <bool>true</bool>
             </property>
            </widget>
           </item>
           <item>
            <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0">
             <item>
              <layout class="QVBoxLayout" name="verticalLayout_9">
               <item>
                <widget class="QLabel" name="lblPreview">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="minimumSize">
                  <size>
                   <width>128</width>
                   <height>128</height>
                  </size>
                 </property>
                 <property name="maximumSize">
                  <size>
                   <width>128</width>
                   <height>128</height>
                  </size>
                 </property>
                 <property name="frameShape">
                  <enum>QFrame::StyledPanel</enum>
                 </property>
                 <property name="frameShadow">
                  <enum>QFrame::Plain</enum>
                 </property>
                 <property name="text">
                  <string/>
                 </property>
                 <property name="scaledContents">
                  <bool>true</bool>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignCenter</set>
                 </property>
                </widget>
               </item>
               <item>
                <spacer name="verticalSpacer_2">
                 <property name="orientation">
                  <enum>Qt::Vertical</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>20</width>
                   <height>0</height>
                  </size>
                 </property>
                </spacer>
               </item>
              </layout>
             </item>
             <item>
              <layout class="QGridLayout" name="gridLayout">
               <property name="verticalSpacing">
                <number>3</number>
               </property>
               <item row="0" column="1">
                <widget class="QLabel" name="lblAuthor">
                 <property name="text">
                  <string/>
                 </property>
                </widget>
               </item>
               <item row="1" column="1">
                <widget class="QLabel" name="lblLicense">
                 <property name="text">
                  <string/>
                 </property>
                </widget>
               </item>
               <item row="4" column="1">
                <widget class="QLabel" name="lblCreated">
                 <property name="text">
                  <string/>
                 </property>
                </widget>
               </item>
               <item row="0" column="0">
                <widget class="QLabel" name="label_3">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                   <horstretch>0</horstretch>
                   <verstretch>0</verstretch>
                  </sizepolicy>
                 </property>
                 <property name="text">
                  <string>Author:</string>
                 </property>
                 <property name="scaledContents">
                  <bool>false</bool>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
                 </property>
                </widget>
               </item>
               <item row="1" column="0">
                <widget class="QLabel" name="label_4">
                 <property name="text">
                  <string>License:</string>
                 </property>
                </widget>
               </item>
               <item row="5" column="1">
                <widget class="QLabel" name="lblUpdated">
                 <property name="text">
                  <string/>
                 </property>
                </widget>
               </item>
               <item row="4" column="0">
                <widget class="QLabel" name="label_6">
                 <property name="text">
                  <string>Created:</string>
                 </property>
                </widget>
               </item>
               <item row="3" column="0">
                <widget class="QLabel" name="label_8">
                 <property name="text">
                  <string>Email:</string>
                 </property>
                </widget>
               </item>
               <item row="5" column="0">
                <widget class="QLabel" name="label_7">
                 <property name="text">
                  <string>Updated:</string>
                 </property>
                </widget>
               </item>
               <item row="3" column="1">
                <widget class="QLabel" name="lblEmail">
                 <property name="text">
                  <string/>
                 </property>
                </widget>
               </item>
               <item row="2" column="0">
                <widget class="QLabel" name="label_5">
                 <property name="text">
                  <string>Website:</string>
                 </property>
                </widget>
               </item>
               <item row="2" column="1">
                <widget class="QLabel" name="lblWebsite">
                 <property name="text">
                  <string/>
                 </property>
                </widget>
               </item>
               <item row="6" column="0" colspan="2">
                <spacer name="verticalSpacer_5">
                 <property name="orientation">
                  <enum>Qt::Vertical</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
                   <width>20</width>
                   <height>0</height>
                  </size>
                 </property>
                </spacer>
               </item>
              </layout>
             </item>
            </layout>
           </item>
          </layout>
         </widget>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>tableView</tabstop>
   <tabstop>bnAdd</tabstop>
   <tabstop>bnNew</tabstop>
   <tabstop>bnDelete</tabstop>
   <tabstop>lblDescription</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>