diff --git a/client/citydlg.cpp b/client/citydlg.cpp
index acdadba01d..ec00654c94 100644
--- a/client/citydlg.cpp
+++ b/client/citydlg.cpp
@@ -904,6 +904,8 @@ city_dialog::city_dialog(QWidget *parent) : QWidget(parent)
   connect(ui.p_table_p->selectionModel(),
           &QItemSelectionModel::selectionChanged, this,
           &city_dialog::item_selected);
+  connect(ui.present_units_exp_col_but, &QAbstractButton::clicked, this,
+          &city_dialog::present_units_exp_col);
 
   // governor tab
   ui.qgbox->setTitle(_("Presets:"));
@@ -1789,11 +1791,37 @@ void city_dialog::update_units()
     units = pcity->tile->units;
   }
 
+  // set direction of the expand/collapse arrow
+  if (present_units_exp == false) {
+    ui.present_units_exp_col_but->setArrowType(Qt::UpArrow);
+  } else {
+    ui.present_units_exp_col_but->setArrowType(Qt::DownArrow);
+  }
+
   n = unit_list_size(units);
+  ui.present_units_list->setLayoutDirection(Qt::LeftToRight);
   ui.present_units_list->set_units(units);
   ui.present_units_list->setVisible(n > 0);
   fc_snprintf(buf, sizeof(buf), _("Present units: %d"), n);
-  ui.curr_units->setText(QString(buf));
+  ui.present_units_label->setText(QString(buf));
+}
+
+/**
+ * Slot to expand or collapse the present units list
+ */
+void city_dialog::present_units_exp_col()
+{
+  if (present_units_exp == false) {
+    ui.present_units_group_box->setSizePolicy(QSizePolicy::MinimumExpanding,
+                                              QSizePolicy::Expanding);
+    ui.present_units_exp_col_but->setArrowType(Qt::DownArrow);
+    present_units_exp = true;
+  } else {
+    ui.present_units_group_box->setSizePolicy(QSizePolicy::MinimumExpanding,
+                                              QSizePolicy::Minimum);
+    ui.present_units_exp_col_but->setArrowType(Qt::UpArrow);
+    present_units_exp = false;
+  }
 }
 
 /**
diff --git a/client/citydlg.h b/client/citydlg.h
index 7796ec3c71..d4075ca01b 100644
--- a/client/citydlg.h
+++ b/client/citydlg.h
@@ -298,6 +298,7 @@ class city_dialog : public QWidget {
   void refresh();
   struct city *pcity = nullptr;
   bool dont_focus{false};
+  bool present_units_exp = false;
 
 private:
   void update_title();
@@ -342,6 +343,7 @@ private slots:
   void cma_context_menu(const QPoint p);
   void save_cma();
   void city_rename();
+  void present_units_exp_col();
 
 protected:
   void showEvent(QShowEvent *event) override;
diff --git a/client/citydlg.ui b/client/citydlg.ui
index 1efbce18dd..229ecbf683 100644
--- a/client/citydlg.ui
+++ b/client/citydlg.ui
@@ -74,7 +74,7 @@
            <string>citizens</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignCenter</set>
+           <set>Qt::AlignmentFlag::AlignCenter</set>
           </property>
          </widget>
         </item>
@@ -122,13 +122,13 @@
            </size>
           </property>
           <property name="editTriggers">
-           <set>QAbstractItemView::NoEditTriggers</set>
+           <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
           </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="showGrid">
            <bool>false</bool>
@@ -206,7 +206,7 @@
         <item>
          <spacer name="verticalSpacer">
           <property name="orientation">
-           <enum>Qt::Vertical</enum>
+           <enum>Qt::Orientation::Vertical</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
@@ -268,7 +268,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>
@@ -302,7 +302,7 @@
    <item>
     <spacer name="horizontalSpacer">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Orientation::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
@@ -317,10 +317,10 @@
      <item>
       <spacer name="middleSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeType">
-        <enum>QSizePolicy::MinimumExpanding</enum>
+        <enum>QSizePolicy::Policy::MinimumExpanding</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -331,9 +331,9 @@
       </spacer>
      </item>
      <item>
-      <spacer name="verticalSpacer_3">
+      <spacer name="present_units_vertical_spacer">
        <property name="orientation">
-        <enum>Qt::Vertical</enum>
+        <enum>Qt::Orientation::Vertical</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
@@ -344,43 +344,59 @@
       </spacer>
      </item>
      <item>
-      <widget class="QGroupBox" name="groupBox_3">
-       <layout class="QVBoxLayout" name="verticalLayout_5">
-        <item>
-         <widget class="QLabel" name="curr_units">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
+      <widget class="QGroupBox" name="present_units_group_box">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="0">
+         <widget class="QLabel" name="present_units_label">
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>16777215</height>
+           </size>
           </property>
           <property name="text">
            <string>TextLabel</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
           </property>
          </widget>
         </item>
-        <item>
+        <item row="1" column="0" colspan="2">
          <widget class="unit_list_widget" name="present_units_list">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="selectionMode">
-           <enum>QAbstractItemView::ExtendedSelection</enum>
+           <enum>QAbstractItemView::SelectionMode::ExtendedSelection</enum>
           </property>
           <property name="flow">
-           <enum>QListView::LeftToRight</enum>
+           <enum>QListView::Flow::LeftToRight</enum>
           </property>
           <property name="resizeMode">
-           <enum>QListView::Adjust</enum>
+           <enum>QListView::ResizeMode::Adjust</enum>
           </property>
           <property name="viewMode">
-           <enum>QListView::IconMode</enum>
+           <enum>QListView::ViewMode::IconMode</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QToolButton" name="present_units_exp_col_but">
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="icon">
+           <iconset theme="QIcon::ThemeIcon::GoUp"/>
           </property>
          </widget>
         </item>
@@ -392,7 +408,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>
@@ -404,15 +420,15 @@
    </item>
    <item>
     <widget class="QWidget" name="widget_2" native="true">
-     <property name="autoFillBackground">
-      <bool>true</bool>
-     </property>
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="autoFillBackground">
+      <bool>true</bool>
+     </property>
      <layout class="QVBoxLayout" name="verticalLayout_7">
       <property name="spacing">
        <number>0</number>
@@ -431,18 +447,18 @@
       </property>
       <item>
        <widget class="QTabWidget" name="tabs_right">
-        <property name="currentIndex">
-         <number>0</number>
-        </property>
-        <property name="documentMode">
-         <bool>true</bool>
-        </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <property name="documentMode">
+         <bool>true</bool>
+        </property>
         <widget class="QWidget" name="tab_2">
          <attribute name="title">
           <string>Output</string>
@@ -463,16 +479,16 @@
           <item>
            <widget class="QScrollArea" name="scrollArea_2">
             <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
+             <enum>QFrame::Shape::NoFrame</enum>
             </property>
             <property name="frameShadow">
-             <enum>QFrame::Plain</enum>
+             <enum>QFrame::Shadow::Plain</enum>
             </property>
             <property name="horizontalScrollBarPolicy">
-             <enum>Qt::ScrollBarAlwaysOff</enum>
+             <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
             </property>
             <property name="sizeAdjustPolicy">
-             <enum>QAbstractScrollArea::AdjustToContents</enum>
+             <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
             </property>
             <property name="widgetResizable">
              <bool>true</bool>
@@ -482,8 +498,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>306</width>
-               <height>753</height>
+               <width>304</width>
+               <height>754</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -525,14 +541,14 @@
                  <string>TextLabel</string>
                 </property>
                 <property name="alignment">
-                 <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                 <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
                 </property>
                </widget>
               </item>
               <item>
                <spacer name="verticalSpacer_2">
                 <property name="orientation">
-                 <enum>Qt::Vertical</enum>
+                 <enum>Qt::Orientation::Vertical</enum>
                 </property>
                 <property name="sizeHint" stdset="0">
                  <size>
@@ -562,13 +578,13 @@
              <item>
               <widget class="QTableWidget" name="nationality_table">
                <property name="editTriggers">
-                <set>QAbstractItemView::NoEditTriggers</set>
+                <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
                </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="showGrid">
                 <bool>false</bool>
@@ -599,29 +615,29 @@
              <item>
               <widget class="QScrollArea" name="scrollArea">
                <property name="frameShape">
-                <enum>QFrame::NoFrame</enum>
+                <enum>QFrame::Shape::NoFrame</enum>
                </property>
                <property name="sizeAdjustPolicy">
-                <enum>QAbstractScrollArea::AdjustToContents</enum>
+                <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
                </property>
                <property name="widgetResizable">
                 <bool>true</bool>
                </property>
                <widget class="QWidget" name="scrollAreaWidgetContents">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
                 <property name="geometry">
                  <rect>
                   <x>0</x>
                   <y>0</y>
-                  <width>278</width>
-                  <height>326</height>
+                  <width>139</width>
+                  <height>150</height>
                  </rect>
                 </property>
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <layout class="QFormLayout" name="formLayout_2">
                  <item row="0" column="0">
                   <widget class="QLabel" name="label1">
@@ -751,11 +767,11 @@
                  <item row="5" column="1">
                   <widget class="city_label" name="lab_table6">
                    <property name="sizePolicy">
-                   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                   </sizepolicy>
-                  </property>
+                    <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
                    <property name="text">
                     <string>TextLabel</string>
                    </property>
@@ -784,13 +800,13 @@
              </sizepolicy>
             </property>
             <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
+             <enum>QFrame::Shape::NoFrame</enum>
             </property>
             <property name="horizontalScrollBarPolicy">
-             <enum>Qt::ScrollBarAlwaysOff</enum>
+             <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
             </property>
             <property name="sizeAdjustPolicy">
-             <enum>QAbstractScrollArea::AdjustToContents</enum>
+             <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
             </property>
             <property name="widgetResizable">
              <bool>true</bool>
@@ -800,8 +816,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>294</width>
-               <height>741</height>
+               <width>118</width>
+               <height>329</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_11">
@@ -822,7 +838,7 @@
                       <string/>
                      </property>
                      <property name="alignment">
-                      <set>Qt::AlignCenter</set>
+                      <set>Qt::AlignmentFlag::AlignCenter</set>
                      </property>
                     </widget>
                    </item>
@@ -849,16 +865,16 @@
                       </sizepolicy>
                      </property>
                      <property name="contextMenuPolicy">
-                      <enum>Qt::CustomContextMenu</enum>
+                      <enum>Qt::ContextMenuPolicy::CustomContextMenu</enum>
                      </property>
                      <property name="editTriggers">
-                      <set>QAbstractItemView::NoEditTriggers</set>
+                      <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
                      </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="showGrid">
                       <bool>false</bool>