diff --git a/libs/resourcewidgets/dbexplorer/DlgDbExplorer.cpp b/libs/resourcewidgets/dbexplorer/DlgDbExplorer.cpp
index 6f796f89d7..57866e3d84 100644
--- a/libs/resourcewidgets/dbexplorer/DlgDbExplorer.cpp
+++ b/libs/resourcewidgets/dbexplorer/DlgDbExplorer.cpp
@@ -1,173 +1,198 @@
 /*
  * Copyright (c) 2018 Boudewijn Rempt <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 "DlgDbExplorer.h"
 
 #include <klocalizedstring.h>
 #include <kis_debug.h>
 
 #include <QDataWidgetMapper>
 #include <QTableView>
 #include <QtSql>
 #include <QStyledItemDelegate>
 
 #include <TableModel.h>
 #include <KisResourceModel.h>
 #include <KisResourceGridProxyModel.h>
 #include <KisTagFilterResourceProxyModel.h>
 #include <KisResourceModelProvider.h>
 #include <KisResourceTypeModel.h>
 #include <KisTagModel.h>
 #include <KisResourceItemDelegate.h>
 #include <KisResourceItemListView.h>
 
 DlgDbExplorer::DlgDbExplorer(QWidget *parent)
     : KoDialog(parent)
 {
     setCaption(i18n("Resources Cache Database Explorer"));
 
     setButtons(Ok);
 
     m_page = new WdgDbExplorer(this);
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
 
     m_resourceTypeModel = new KisResourceTypeModel(this);
     m_tagModel = new KisTagModel("", this);
 
     {
         TableModel *storagesModel = new TableModel(this, QSqlDatabase::database());
         TableDelegate *storagesDelegate = new TableDelegate(m_page->tableStorages);
         storagesModel->setTable("storages");
         storagesModel->setHeaderData(0, Qt::Horizontal, i18n("Id"));
         storagesModel->setHeaderData(1, Qt::Horizontal, i18n("Type"));
         storagesModel->setRelation(1, QSqlRelation("storage_types", "id", "name"));
         storagesModel->setHeaderData(2, Qt::Horizontal, i18n("Location"));
         storagesModel->setHeaderData(3, Qt::Horizontal, i18n("Creation Date"));
         storagesModel->addDateTimeColumn(3);
         storagesDelegate->addDateTimeColumn(3);
         storagesModel->setHeaderData(4, Qt::Horizontal, i18n("Preinstalled"));
         storagesModel->addBooleanColumn(4);
         storagesDelegate->addBooleanColumn(4);
         storagesModel->setHeaderData(5, Qt::Horizontal, i18n("Active"));
         storagesModel->addBooleanColumn(5);
         storagesDelegate->addBooleanColumn(5);
         storagesModel->select();
         m_page->tableStorages->setModel(storagesModel);
         m_page->tableStorages->hideColumn(0);
         m_page->tableStorages->setItemDelegate(storagesDelegate);
         m_page->tableStorages->setSelectionMode(QAbstractItemView::SingleSelection);
         m_page->tableStorages->resizeColumnsToContents();
     }
 
     {
-        KisResourceModel *resourcesModel = KisResourceModelProvider::resourceModel(ResourceType::Gradients);
+        KisResourceModel *resourcesModel = KisResourceModelProvider::resourceModel(ResourceType::Brushes);
         m_page->tableResources->setModel(resourcesModel);
         m_page->tableResources->hideColumn(0);
         m_page->tableResources->setSelectionMode(QAbstractItemView::SingleSelection);
 
-        m_page->cmbResourceTypes->setModel(KisResourceModelProvider::resourceModel(ResourceType::Gradients));
+        m_page->cmbResourceTypes->setModel(m_resourceTypeModel);
         m_page->cmbResourceTypes->setModelColumn(KisResourceTypeModel::Name);
+
+        connect(m_page->cmbResourceTypes, SIGNAL(activated(int)), SLOT(slotTbResourceTypeSelected(int)));
+        connect(m_page->tableResources, SIGNAL(clicked(QModelIndex)), SLOT(slotTbResourceItemSelected()));
     }
 
     {
         TableModel *tagsModel = new TableModel(this, QSqlDatabase::database());
         TableDelegate *tagsDelegate = new TableDelegate(m_page->tableStorages);
         tagsDelegate->setEditable(true);
         tagsModel->setTable("tags");
         tagsModel->setHeaderData(0, Qt::Horizontal, i18n("Id"));
         tagsModel->setHeaderData(1, Qt::Horizontal, i18n("Type"));
         tagsModel->setRelation(1, QSqlRelation("resource_types", "id", "name"));
         tagsModel->setHeaderData(2, Qt::Horizontal, i18n("Tag"));
         tagsModel->setHeaderData(3, Qt::Horizontal, i18n("Name"));
         tagsModel->setHeaderData(4, Qt::Horizontal, i18n("Comment"));
         tagsModel->setHeaderData(5, Qt::Horizontal, i18n("Active"));
         tagsModel->addBooleanColumn(5);
         tagsDelegate->addBooleanColumn(5);
         tagsModel->select();
 
         m_page->tableTags->setModel(tagsModel);
         m_page->tableTags->hideColumn(0);
         m_page->tableTags->setItemDelegate(tagsDelegate);
         m_page->tableTags->setSelectionMode(QAbstractItemView::SingleSelection);
         m_page->tableTags->resizeColumnsToContents();
     }
 
     {
         QSqlTableModel *versionModel = new QSqlTableModel(this, QSqlDatabase::database());
         versionModel->setTable("version_information");
         versionModel->setHeaderData(0, Qt::Horizontal, "id");
         versionModel->setHeaderData(1, Qt::Horizontal, "database_version");
         versionModel->setHeaderData(2, Qt::Horizontal, "krita_version");
         versionModel->setHeaderData(3, Qt::Horizontal, "creation_date");
         versionModel->select();
         QSqlRecord r = versionModel->record(0);
 
         m_page->lblDatabaseVersion->setText(r.value("database_version").toString());
         m_page->lblKritaVersion->setText(r.value("krita_version").toString());
         m_page->lblCreationDate->setText(r.value("creation_date").toString());
     }
 
 
     {
         m_page->cmbRvResourceTypes->setModel(m_resourceTypeModel);
         m_page->cmbRvResourceTypes->setModelColumn(KisResourceTypeModel::Name);
         connect(m_page->cmbRvResourceTypes, SIGNAL(activated(int)), SLOT(slotRvResourceTypeSelected(int)));
 
         m_page->cmbRvTags->setModelColumn(KisTagModel::Name);
         m_page->cmbRvTags->setModel(m_tagModel);
         connect(m_page->cmbRvTags, SIGNAL(activated(int)), SLOT(slotRvTagSelected(int)));
 
         m_page->cmbRvResourceTypes->setCurrentIndex(0);
         slotRvResourceTypeSelected(0);
 
         m_page->resourceItemView->setItemDelegate(new KisResourceItemDelegate(this));
         m_page->resourceItemView->setSelectionMode(QAbstractItemView::SingleSelection);
     }
 
 }
 
 DlgDbExplorer::~DlgDbExplorer()
 {
 }
 
 void DlgDbExplorer::slotRvResourceTypeSelected(int index)
 {
-    QModelIndex idx = m_page->cmbRvResourceTypes->model()->index(index, KisResourceTypeModel::ResourceType);
+    QModelIndex idx = m_page->cmbResourceTypes->model()->index(index, KisResourceTypeModel::ResourceType);
     QString resourceType = idx.data(Qt::DisplayRole).toString();
     qDebug() << resourceType;
     m_tagModel->setResourceType(idx.data(Qt::DisplayRole).toString());
 
     KisResourceModel *resourceModel = KisResourceModelProvider::resourceModel(resourceType);
 
     KisTagFilterResourceProxyModel *tagFilterModel = new KisTagFilterResourceProxyModel(this);
     tagFilterModel->setSourceModel(resourceModel);
 
-    //KisResourceGridProxyModel *resourceProxyModel = new KisResourceGridProxyModel(this);
-    //resourceProxyModel->setSourceModel(tagFilterModel);
-    //resourceProxyModel->setRowStride(10);
+    m_page->resourceItemView->setModel(tagFilterModel);
+}
+
+void DlgDbExplorer::slotTbResourceTypeSelected(int index)
+{
+    QModelIndex idx = m_page->cmbRvResourceTypes->model()->index(index, KisResourceTypeModel::ResourceType);
+    QString resourceType = idx.data(Qt::DisplayRole).toString();
+    qDebug() << resourceType;
+
+    KisResourceModel *resourceModel = KisResourceModelProvider::resourceModel(resourceType);
+    m_page->tableResources->setModel(resourceModel);
+    m_page->tableResources->setCurrentIndex(m_page->tableResources->model()->index(0, 0));
+    slotTbResourceItemSelected();
+    m_page->tableResources->resizeColumnsToContents();
+}
+
+void DlgDbExplorer::slotTbResourceItemSelected()
+{
+    QModelIndex idx = m_page->tableResources->selectionModel()->selectedIndexes().first();
 
+    QImage thumb = idx.data(Qt::UserRole + KisResourceModel::Image).value<QImage>();
+    Qt::TransformationMode mode = Qt::SmoothTransformation;
+    if (thumb.size().width() < 100 && thumb.size().height() < 100) {
+        mode = Qt::FastTransformation;
+    }
 
-    m_page->resourceItemView->setModel(tagFilterModel);
+    m_page->lblThumbnail->setPixmap(QPixmap::fromImage(thumb.scaled(100, 100, Qt::KeepAspectRatio, mode)));
+    //If we could get a list of versions for a given resource, this would be the moment to add them...
 }
 
 void DlgDbExplorer::slotRvTagSelected(int index)
 {
     qDebug() << "selected tag" << index;
 }
diff --git a/libs/resourcewidgets/dbexplorer/DlgDbExplorer.h b/libs/resourcewidgets/dbexplorer/DlgDbExplorer.h
index b985ad62d2..16d0396d68 100644
--- a/libs/resourcewidgets/dbexplorer/DlgDbExplorer.h
+++ b/libs/resourcewidgets/dbexplorer/DlgDbExplorer.h
@@ -1,61 +1,64 @@
 /*
  * Copyright (c) 2018 Boudewijn Rempt <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 DLG_DBEXPLORER
 #define DLG_DBEXPLORER
 
 #include <KoDialog.h>
 
 #include "ui_WdgDbExplorer.h"
 
 class KisResourceModel;
 class KisTagModel;
 class KisResourceTypeModel;
 
 
 
 class WdgDbExplorer : public QWidget, public Ui::WdgDbExplorer
 {
     Q_OBJECT
 
 public:
     WdgDbExplorer(QWidget *parent) : QWidget(parent) {
         setupUi(this);
     }
 };
 
 class DlgDbExplorer: public KoDialog
 {
     Q_OBJECT
 public:
     DlgDbExplorer(QWidget * parent = 0);
     ~DlgDbExplorer() override;
 
 private Q_SLOTS:
 
+    void slotTbResourceTypeSelected(int index);
+    void slotTbResourceItemSelected();
+
     void slotRvResourceTypeSelected(int index);
     void slotRvTagSelected(int index);
 
 private:
     WdgDbExplorer *m_page {0};
 
     KisTagModel *m_tagModel {0};
     KisResourceTypeModel *m_resourceTypeModel {0};
 };
 
 #endif // DLG_DBEXPLORER
diff --git a/libs/resourcewidgets/dbexplorer/WdgDbExplorer.ui b/libs/resourcewidgets/dbexplorer/WdgDbExplorer.ui
index 7f8fb493da..9c998a8a4a 100644
--- a/libs/resourcewidgets/dbexplorer/WdgDbExplorer.ui
+++ b/libs/resourcewidgets/dbexplorer/WdgDbExplorer.ui
@@ -1,212 +1,228 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WdgDbExplorer</class>
  <widget class="QWidget" name="WdgDbExplorer">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>975</width>
     <height>545</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="1">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>4</number>
      </property>
      <widget class="QWidget" name="tabStorages">
       <attribute name="title">
        <string>Storages</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <widget class="QTableView" name="tableStorages"/>
+        <widget class="QTableView" name="tableStorages">
+         <attribute name="horizontalHeaderStretchLastSection">
+          <bool>true</bool>
+         </attribute>
+        </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabResources">
       <attribute name="title">
        <string>Resources</string>
       </attribute>
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout">
            <item>
             <widget class="QLabel" name="label">
              <property name="text">
-              <string>TextLabel</string>
+              <string>Resource Type</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QComboBox" name="cmbResourceTypes"/>
            </item>
           </layout>
          </item>
          <item>
-          <widget class="QTableView" name="tableResources"/>
+          <widget class="QTableView" name="tableResources">
+           <attribute name="horizontalHeaderStretchLastSection">
+            <bool>true</bool>
+           </attribute>
+          </widget>
          </item>
         </layout>
        </item>
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <item>
-          <widget class="QLabel" name="label_3">
+          <widget class="QLabel" name="lblThumbnail">
            <property name="text">
             <string>lblThumbnail</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLabel" name="label_2">
            <property name="text">
             <string>Versions</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QTableView" name="tableVersions"/>
          </item>
         </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabTags">
       <attribute name="title">
        <string>Tags</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <item>
-        <widget class="QTableView" name="tableTags"/>
+        <widget class="QTableView" name="tableTags">
+         <attribute name="horizontalHeaderStretchLastSection">
+          <bool>true</bool>
+         </attribute>
+        </widget>
        </item>
        <item>
-        <widget class="QTableView" name="tableTaggedResources"/>
+        <widget class="QTableView" name="tableTaggedResources">
+         <attribute name="horizontalHeaderStretchLastSection">
+          <bool>true</bool>
+         </attribute>
+        </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabSchema">
       <attribute name="title">
        <string>Schema Information</string>
       </attribute>
       <layout class="QFormLayout" name="formLayout">
        <item row="0" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>Database Version</string>
          </property>
         </widget>
        </item>
        <item row="0" column="1">
         <widget class="QLabel" name="lblDatabaseVersion">
          <property name="text">
           <string>TextLabel</string>
          </property>
         </widget>
        </item>
        <item row="1" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
           <string>Krita Version</string>
          </property>
         </widget>
        </item>
        <item row="1" column="1">
         <widget class="QLabel" name="lblKritaVersion">
          <property name="text">
           <string>TextLabel</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
         <widget class="QLabel" name="label_6">
          <property name="text">
           <string>Creation Date</string>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
         <widget class="QLabel" name="lblCreationDate">
          <property name="text">
           <string>TextLabel</string>
          </property>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tabResourceView">
       <attribute name="title">
        <string>Resource View</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <item>
         <layout class="QFormLayout" name="formLayout_2">
          <item row="0" column="0">
           <widget class="QLabel" name="label_7">
            <property name="text">
             <string>Resource Type:</string>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="KComboBox" name="cmbRvResourceTypes"/>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="label_8">
            <property name="text">
             <string>Tag:</string>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QComboBox" name="cmbRvTags">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
           </widget>
          </item>
         </layout>
        </item>
        <item>
         <widget class="KisResourceItemListView" name="resourceItemView"/>
        </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>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KisResourceItemListView</class>
    <extends>QListView</extends>
    <header location="global">KisResourceItemListView.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>