diff --git a/src/gui/CategoryListWidget.cpp b/src/gui/CategoryListWidget.cpp
index 758709c0b..1c3c7dcce 100644
--- a/src/gui/CategoryListWidget.cpp
+++ b/src/gui/CategoryListWidget.cpp
@@ -26,10 +26,12 @@
 
 CategoryListWidget::CategoryListWidget(QWidget* parent)
     : QWidget(parent),
+      m_itemDelegate(nullptr),
       m_ui(new Ui::CategoryListWidget())
 {
     m_ui->setupUi(this);
-    m_ui->categoryList->setItemDelegate(new CategoryListWidgetDelegate(this));
+    m_itemDelegate = new CategoryListWidgetDelegate(m_ui->categoryList);
+    m_ui->categoryList->setItemDelegate(m_itemDelegate);
 
     connect(m_ui->categoryList, SIGNAL(currentRowChanged(int)), SLOT(emitCategoryChanged(int)));
 
@@ -47,10 +49,16 @@ QSize CategoryListWidget::sizeHint() const
 {
     QSize sizeHint = QWidget::sizeHint();
 
-    int width = m_ui->categoryList->sizeHintForColumn(0) + m_ui->categoryList->frameWidth() * 2;
+    int width = m_ui->categoryList->sizeHintForColumn(0);
     if (m_ui->categoryList->verticalScrollBar()->isVisible()) {
         width += m_ui->categoryList->verticalScrollBar()->width();
     }
+
+    QSize min = minimumSizeHint();
+    if (width < min.width()) {
+        width = min.width();
+    }
+    width += m_ui->categoryList->frameWidth() * 2;
     sizeHint.setWidth(width);
 
     return sizeHint;
@@ -58,7 +66,8 @@ QSize CategoryListWidget::sizeHint() const
 
 QSize CategoryListWidget::minimumSizeHint() const
 {
-    return QSize(sizeHint().width(), m_ui->categoryList->sizeHintForRow(0) * 2);
+    return QSize(m_ui->categoryList->sizeHintForColumn(0) + m_ui->categoryList->frameWidth() * 2,
+                 m_ui->categoryList->sizeHintForRow(0) * 2);
 }
 
 int CategoryListWidget::addCategory(const QString& labelText, const QIcon& icon)
@@ -101,6 +110,16 @@ void CategoryListWidget::showEvent(QShowEvent* event)
     updateCategoryScrollButtons();
 }
 
+void CategoryListWidget::resizeEvent(QResizeEvent* event)
+{
+    auto newDelegate = new CategoryListWidgetDelegate(m_ui->categoryList);
+    m_ui->categoryList->setItemDelegate(newDelegate);
+    m_itemDelegate->deleteLater();
+    m_itemDelegate = newDelegate;
+
+    QWidget::resizeEvent(event);
+}
+
 void CategoryListWidget::updateCategoryScrollButtons()
 {
     m_ui->scrollUp->setEnabled(m_ui->categoryList->verticalScrollBar()->value() != 0);
@@ -134,10 +153,15 @@ void CategoryListWidget::emitCategoryChanged(int index)
 /* =============================================================================================== */
 
 
-CategoryListWidgetDelegate::CategoryListWidgetDelegate(QWidget* parent)
+CategoryListWidgetDelegate::CategoryListWidgetDelegate(QListWidget* parent)
     : QStyledItemDelegate(parent),
-      m_size(96, 96)
-{}
+      m_listWidget(parent),
+      m_size(minWidth(), 96)
+{
+    if (m_listWidget && m_listWidget->width() > m_size.width()) {
+        m_size.setWidth(m_listWidget->width());
+    }
+}
 
 void CategoryListWidgetDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
@@ -147,7 +171,7 @@ void CategoryListWidgetDelegate::paint(QPainter* painter, const QStyleOptionView
     painter->save();
 
     QIcon icon = opt.icon;
-    QSize iconSize = opt.icon.actualSize(QSize(32, 32));
+    QSize iconSize = opt.icon.actualSize(QSize(ICON_SIZE, ICON_SIZE));
     opt.icon = QIcon();
     opt.decorationAlignment = Qt::AlignHCenter | Qt::AlignVCenter;
     opt.decorationPosition = QStyleOptionViewItem::Top;
@@ -156,7 +180,7 @@ void CategoryListWidgetDelegate::paint(QPainter* painter, const QStyleOptionView
     style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, opt.widget);
 
     QRect fontRect = painter->fontMetrics().boundingRect(
-      QRect(0, 0, m_size.width(), m_size.height()), Qt::AlignHCenter | Qt::AlignBottom | Qt::TextWordWrap, opt.text);
+        QRect(0, 0, minWidth(), m_size.height()), Qt::AlignHCenter | Qt::AlignBottom | Qt::TextWordWrap, opt.text);
 
     int paddingTop = fontRect.height() < 30 ? 15 : 10;
     int left = opt.rect.left() + opt.rect.width() / 2 - iconSize.width() / 2;
@@ -165,9 +189,33 @@ void CategoryListWidgetDelegate::paint(QPainter* painter, const QStyleOptionView
     painter->restore();
 }
 
+int CategoryListWidgetDelegate::minWidth() const
+{
+    int c = m_listWidget->count();
+    int maxWidth = 0;
+
+    for (int i = 0; i < c; ++i) {
+        QFontMetrics fm(m_listWidget->font());
+        QRect fontRect = fm.boundingRect(
+            QRect(0, 0, 0, 0), Qt::TextWordWrap | Qt::ElideNone, m_listWidget->item(i)->text());
+
+        if (fontRect.width() > maxWidth) {
+            maxWidth = fontRect.width();
+        }
+    }
+
+    return maxWidth > m_size.height() ? maxWidth + 5 : m_size.height();
+}
+
 QSize CategoryListWidgetDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
     Q_UNUSED(option);
     Q_UNUSED(index);
-    return m_size;
+
+    int w = minWidth();
+    if (m_listWidget->width() > w) {
+        w = m_listWidget->width();
+    }
+
+    return QSize(w, m_size.height());
 }
diff --git a/src/gui/CategoryListWidget.h b/src/gui/CategoryListWidget.h
index de910fdf3..23860f322 100644
--- a/src/gui/CategoryListWidget.h
+++ b/src/gui/CategoryListWidget.h
@@ -17,6 +17,10 @@
 
 #include <QWidget>
 #include <QStyledItemDelegate>
+#include <QPointer>
+
+class CategoryListWidgetDelegate;
+class QListWidget;
 
 namespace Ui {
     class CategoryListWidget;
@@ -42,6 +46,7 @@ signals:
 
 protected:
     void showEvent(QShowEvent* event) override;
+    void resizeEvent(QResizeEvent * event) override;
     QSize sizeHint() const override;
     QSize minimumSizeHint() const override;
 
@@ -52,6 +57,7 @@ protected slots:
     void emitCategoryChanged(int index);
 
 private:
+    QPointer<CategoryListWidgetDelegate> m_itemDelegate;
     const QScopedPointer<Ui::CategoryListWidget> m_ui;
 
     Q_DISABLE_COPY(CategoryListWidget)
@@ -66,13 +72,18 @@ class CategoryListWidgetDelegate : public QStyledItemDelegate
     Q_OBJECT
 
 public:
-    explicit CategoryListWidgetDelegate(QWidget* parent = nullptr);
+    explicit CategoryListWidgetDelegate(QListWidget* parent = nullptr);
 
 protected:
     void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
     QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
 private:
+    int minWidth() const;
+
+    const int ICON_SIZE = 32;
+
+    QPointer<QListWidget> m_listWidget;
     QSize m_size;
 
     Q_DISABLE_COPY(CategoryListWidgetDelegate)
diff --git a/src/gui/CategoryListWidget.ui b/src/gui/CategoryListWidget.ui
index 307a039b6..f16165cdb 100644
--- a/src/gui/CategoryListWidget.ui
+++ b/src/gui/CategoryListWidget.ui
@@ -10,6 +10,12 @@
     <height>418</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
@@ -29,7 +35,7 @@
    <item>
     <widget class="QToolButton" name="scrollUp">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -51,7 +57,7 @@
    <item>
     <widget class="QListWidget" name="categoryList">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -85,7 +91,7 @@
    <item>
     <widget class="QToolButton" name="scrollDown">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
diff --git a/src/gui/EditWidget.ui b/src/gui/EditWidget.ui
index 239c3d9f8..9be882121 100644
--- a/src/gui/EditWidget.ui
+++ b/src/gui/EditWidget.ui
@@ -38,9 +38,16 @@
     </spacer>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
      <item>
-      <widget class="CategoryListWidget" name="categoryList"/>
+      <widget class="CategoryListWidget" name="categoryList" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
      </item>
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
@@ -76,8 +83,9 @@
   </customwidget>
   <customwidget>
    <class>CategoryListWidget</class>
-   <extends>QListWidget</extends>
+   <extends>QWidget</extends>
    <header>gui/CategoryListWidget.h</header>
+   <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/http/OptionDialog.ui b/src/http/OptionDialog.ui
index d55ceecdf..3c5714e1d 100644
--- a/src/http/OptionDialog.ui
+++ b/src/http/OptionDialog.ui
@@ -24,9 +24,6 @@ This is required for accessing your databases from ChromeIPass or PassIFox</stri
    </item>
    <item>
     <widget class="QTabWidget" name="tabWidget">
-     <property name="tabShape">
-      <enum>QTabWidget::Rounded</enum>
-     </property>
      <property name="currentIndex">
       <number>0</number>
      </property>