diff --git a/src/librssguard-greader/src/gui/greaderfeeddetails.ui b/src/librssguard-greader/src/gui/greaderfeeddetails.ui
index d188a9eeb..4f4dad8bd 100644
--- a/src/librssguard-greader/src/gui/greaderfeeddetails.ui
+++ b/src/librssguard-greader/src/gui/greaderfeeddetails.ui
@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="m_lblParentCategory">
      <property name="text">
-      <string>Parent folder</string>
+      <string>Parent category</string>
      </property>
      <property name="buddy">
       <cstring>m_cmbParentCategory</cstring>
diff --git a/src/librssguard-standard/src/gui/formdiscoverfeeds.ui b/src/librssguard-standard/src/gui/formdiscoverfeeds.ui
index 571726ab1..a718d1ce1 100644
--- a/src/librssguard-standard/src/gui/formdiscoverfeeds.ui
+++ b/src/librssguard-standard/src/gui/formdiscoverfeeds.ui
@@ -80,7 +80,7 @@
       <item row="0" column="0">
        <widget class="QLabel" name="m_lblParentCategory">
         <property name="text">
-         <string>Target parent folder</string>
+         <string>Target parent category</string>
         </property>
         <property name="buddy">
          <cstring>m_cmbParentCategory</cstring>
@@ -108,7 +108,7 @@
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -139,7 +139,7 @@
         <item>
          <spacer name="horizontalSpacer_3">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -157,10 +157,10 @@
          <bool>true</bool>
         </property>
         <property name="selectionMode">
-         <enum>QAbstractItemView::SingleSelection</enum>
+         <enum>QAbstractItemView::SelectionMode::SingleSelection</enum>
         </property>
         <property name="selectionBehavior">
-         <enum>QAbstractItemView::SelectRows</enum>
+         <enum>QAbstractItemView::SelectionBehavior::SelectRows</enum>
         </property>
         <property name="indentation">
          <number>0</number>
@@ -201,7 +201,7 @@
         <item>
          <spacer name="horizontalSpacer_2">
           <property name="orientation">
-           <enum>Qt::Horizontal</enum>
+           <enum>Qt::Orientation::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -219,10 +219,10 @@
    <item row="4" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="m_buttonBox">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
+      <set>QDialogButtonBox::StandardButton::Close</set>
      </property>
     </widget>
    </item>
diff --git a/src/librssguard-standard/src/gui/standardfeeddetails.ui b/src/librssguard-standard/src/gui/standardfeeddetails.ui
index d73a05ed8..46c1b1910 100644
--- a/src/librssguard-standard/src/gui/standardfeeddetails.ui
+++ b/src/librssguard-standard/src/gui/standardfeeddetails.ui
@@ -22,7 +22,7 @@
      <item>
       <widget class="QLabel" name="m_lblParentCategory">
        <property name="text">
-        <string>Parent folder</string>
+        <string>Parent category</string>
        </property>
        <property name="buddy">
         <cstring>m_cmbParentCategory</cstring>
@@ -225,7 +225,7 @@
         </sizepolicy>
        </property>
        <property name="layoutDirection">
-        <enum>Qt::RightToLeft</enum>
+        <enum>Qt::LayoutDirection::RightToLeft</enum>
        </property>
       </widget>
      </item>
@@ -275,20 +275,20 @@
       </size>
      </property>
      <property name="popupMode">
-      <enum>QToolButton::InstantPopup</enum>
+      <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
      </property>
      <property name="autoRaise">
       <bool>false</bool>
      </property>
      <property name="arrowType">
-      <enum>Qt::NoArrow</enum>
+      <enum>Qt::ArrowType::NoArrow</enum>
      </property>
     </widget>
    </item>
    <item row="11" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -304,6 +304,12 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>LineEditWithStatus</class>
+   <extends>QWidget</extends>
+   <header>lineeditwithstatus.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>MultiFeedEditCheckBox</class>
    <extends>QCheckBox</extends>
@@ -321,12 +327,6 @@
    <header>labelwithstatus.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>LineEditWithStatus</class>
-   <extends>QWidget</extends>
-   <header>lineeditwithstatus.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>TextEditWithStatus</class>
    <extends>QWidget</extends>
diff --git a/src/librssguard-ttrss/src/gui/ttrssfeeddetails.ui b/src/librssguard-ttrss/src/gui/ttrssfeeddetails.ui
index 6e3c75e55..1f318bc5d 100644
--- a/src/librssguard-ttrss/src/gui/ttrssfeeddetails.ui
+++ b/src/librssguard-ttrss/src/gui/ttrssfeeddetails.ui
@@ -17,7 +17,7 @@
    <item row="0" column="0">
     <widget class="QLabel" name="m_lblParentCategory">
      <property name="text">
-      <string>Parent folder</string>
+      <string>Parent category</string>
      </property>
      <property name="buddy">
       <cstring>m_cmbParentCategory</cstring>
diff --git a/src/librssguard/services/abstract/gui/formcategorydetails.ui b/src/librssguard/services/abstract/gui/formcategorydetails.ui
index 1f544fe46..eb4604994 100644
--- a/src/librssguard/services/abstract/gui/formcategorydetails.ui
+++ b/src/librssguard/services/abstract/gui/formcategorydetails.ui
@@ -28,7 +28,7 @@
      <item>
       <widget class="QLabel" name="m_lblParentCategory">
        <property name="text">
-        <string>Parent folder</string>
+        <string>Parent category</string>
        </property>
        <property name="buddy">
         <cstring>m_cmbParentCategory</cstring>
@@ -134,30 +134,30 @@
       </size>
      </property>
      <property name="popupMode">
-      <enum>QToolButton::InstantPopup</enum>
+      <enum>QToolButton::ToolButtonPopupMode::InstantPopup</enum>
      </property>
      <property name="autoRaise">
       <bool>false</bool>
      </property>
      <property name="arrowType">
-      <enum>Qt::NoArrow</enum>
+      <enum>Qt::ArrowType::NoArrow</enum>
      </property>
     </widget>
    </item>
    <item row="5" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="m_buttonBox">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
      </property>
     </widget>
    </item>
    <item row="4" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
-      <enum>Qt::Vertical</enum>
+      <enum>Qt::Orientation::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -170,17 +170,17 @@
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>MultiFeedEditCheckBox</class>
-   <extends>QCheckBox</extends>
-   <header>multifeededitcheckbox.h</header>
-  </customwidget>
   <customwidget>
    <class>LineEditWithStatus</class>
    <extends>QWidget</extends>
    <header>lineeditwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>MultiFeedEditCheckBox</class>
+   <extends>QCheckBox</extends>
+   <header>multifeededitcheckbox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m_buttonBox</tabstop>