diff --git a/src/ui/qgsnewvectortabledialogbase.ui b/src/ui/qgsnewvectortabledialogbase.ui
index 7cf4a812d26..5bc4d13d8a9 100644
--- a/src/ui/qgsnewvectortabledialogbase.ui
+++ b/src/ui/qgsnewvectortabledialogbase.ui
@@ -374,7 +374,11 @@
   <tabstop>mDeleteFieldBtn</tabstop>
   <tabstop>mFieldUpBtn</tabstop>
   <tabstop>mFieldDownBtn</tabstop>
-  <tabstop>mButtonBox</tabstop>
+  <tabstop>mGeomTypeCbo</tabstop>
+  <tabstop>mGeomColumn</tabstop>
+  <tabstop>mHasZChk</tabstop>
+  <tabstop>mHasMChk</tabstop>
+  <tabstop>mSpatialIndexChk</tabstop>
  </tabstops>
  <resources>
   <include location="../../images/images.qrc"/>
diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
index 3ff82ce829f..b24b619f0df 100644
--- a/src/ui/qgsoptionsbase.ui
+++ b/src/ui/qgsoptionsbase.ui
@@ -5818,27 +5818,11 @@ p, li { white-space: pre-wrap; }
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
-   <class>QgsColorButton</class>
-   <extends>QToolButton</extends>
-   <header>qgscolorbutton.h</header>
+   <class>QgsCollapsibleGroupBox</class>
+   <extends>QGroupBox</extends>
+   <header>qgscollapsiblegroupbox.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QgsScrollArea</class>
-   <extends>QScrollArea</extends>
-   <header>qgsscrollarea.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>QgsDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>qgsdoublespinbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>QgsFilterLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>qgsfilterlineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>QgsSpinBox</class>
    <extends>QSpinBox</extends>
@@ -5851,11 +5835,22 @@ p, li { white-space: pre-wrap; }
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>QgsCollapsibleGroupBox</class>
-   <extends>QGroupBox</extends>
-   <header>qgscollapsiblegroupbox.h</header>
+   <class>QgsColorButton</class>
+   <extends>QToolButton</extends>
+   <header>qgscolorbutton.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsScrollArea</class>
+   <extends>QScrollArea</extends>
+   <header>qgsscrollarea.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>QgsFilterLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>qgsfilterlineedit.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsColorSchemeList</class>
    <extends>QWidget</extends>
@@ -5897,6 +5892,11 @@ p, li { white-space: pre-wrap; }
    <header>qgsdatumtransformtablewidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>mSearchLineEdit</tabstop>
@@ -5932,6 +5932,8 @@ p, li { white-space: pre-wrap; }
   <tabstop>mLayerDeleteConfirmationChkBx</tabstop>
   <tabstop>chbWarnOldProjectVersion</tabstop>
   <tabstop>mEnableMacrosComboBox</tabstop>
+  <tabstop>mFileFormatQgzButton</tabstop>
+  <tabstop>mFileFormatQgsButton</tabstop>
   <tabstop>mOptionsScrollArea_03</tabstop>
   <tabstop>mBtnAddSVGPath</tabstop>
   <tabstop>mBtnRemoveSVGPath</tabstop>
@@ -5961,6 +5963,8 @@ p, li { white-space: pre-wrap; }
   <tabstop>radUseProjectProjection</tabstop>
   <tabstop>radUseGlobalProjection</tabstop>
   <tabstop>mPlanimetricMeasurementsComboBox</tabstop>
+  <tabstop>scrollArea_2</tabstop>
+  <tabstop>mShowDatumTransformDialogCheckBox</tabstop>
   <tabstop>mOptionsScrollArea_11</tabstop>
   <tabstop>cbxAttributeTableDocked</tabstop>
   <tabstop>mComboCopyFeatureFormat</tabstop>
@@ -5973,6 +5977,11 @@ p, li { white-space: pre-wrap; }
   <tabstop>cmbPromptSublayers</tabstop>
   <tabstop>cbxCompileExpressions</tabstop>
   <tabstop>cbxEvaluateDefaultValues</tabstop>
+  <tabstop>mLocalizedDataPathAddButton</tabstop>
+  <tabstop>mLocalizedDataPathRemoveButton</tabstop>
+  <tabstop>mLocalizedDataPathUpButton</tabstop>
+  <tabstop>mLocalizedDataPathDownButton</tabstop>
+  <tabstop>mLocalizedDataPathListWidget</tabstop>
   <tabstop>mBtnRemoveHiddenPath</tabstop>
   <tabstop>mListHiddenBrowserPaths</tabstop>
   <tabstop>mOptionsScrollArea_04</tabstop>
@@ -6081,10 +6090,12 @@ p, li { white-space: pre-wrap; }
   <tabstop>mBtnRemoveTemplatePath</tabstop>
   <tabstop>mListComposerTemplatePaths</tabstop>
   <tabstop>mOptionsScrollArea_02</tabstop>
+  <tabstop>tabWidget</tabstop>
   <tabstop>cmbEditCreateOptions</tabstop>
   <tabstop>pbnEditCreateOptions</tabstop>
   <tabstop>pbnEditPyramidsOptions</tabstop>
   <tabstop>lstRasterDrivers</tabstop>
+  <tabstop>lstVectorDrivers</tabstop>
   <tabstop>mAuthConfigsGrpBx</tabstop>
   <tabstop>mOptionsScrollArea_10</tabstop>
   <tabstop>mNetworkTimeoutSpinBox</tabstop>
@@ -6110,6 +6121,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>mGPUEnableCheckBox</tabstop>
   <tabstop>mOpenClDevicesCombo</tabstop>
   <tabstop>mGPUInfoTextBrowser</tabstop>
+  <tabstop>mCbEarlyResampling</tabstop>
  </tabstops>
  <resources>
   <include location="../../images/images.qrc"/>
diff --git a/src/ui/qgsrendererrasterpropswidgetbase.ui b/src/ui/qgsrendererrasterpropswidgetbase.ui
index 2fd30f3b2f3..f35e0e3fb40 100644
--- a/src/ui/qgsrendererrasterpropswidgetbase.ui
+++ b/src/ui/qgsrendererrasterpropswidgetbase.ui
@@ -490,6 +490,7 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>cboRenderers</tabstop>
   <tabstop>mBlendModeComboBox</tabstop>
   <tabstop>mSliderBrightness</tabstop>
   <tabstop>mBrightnessSpinBox</tabstop>
@@ -497,14 +498,18 @@
   <tabstop>spinBoxSaturation</tabstop>
   <tabstop>mSliderContrast</tabstop>
   <tabstop>mContrastSpinBox</tabstop>
+  <tabstop>mSliderGamma</tabstop>
+  <tabstop>mGammaSpinBox</tabstop>
   <tabstop>comboGrayscale</tabstop>
   <tabstop>mColorizeCheck</tabstop>
   <tabstop>btnColorizeColor</tabstop>
   <tabstop>sliderColorizeStrength</tabstop>
   <tabstop>spinColorizeStrength</tabstop>
+  <tabstop>mResetColorRenderingBtn</tabstop>
   <tabstop>mZoomedInResamplingComboBox</tabstop>
   <tabstop>mZoomedOutResamplingComboBox</tabstop>
   <tabstop>mMaximumOversamplingSpinBox</tabstop>
+  <tabstop>mCbEarlyResampling</tabstop>
  </tabstops>
  <resources>
   <include location="../../images/images.qrc"/>
diff --git a/src/ui/qgsrendererrulepropsdialogbase.ui b/src/ui/qgsrendererrulepropsdialogbase.ui
index 3909fde848a..d327620f873 100644
--- a/src/ui/qgsrendererrulepropsdialogbase.ui
+++ b/src/ui/qgsrendererrulepropsdialogbase.ui
@@ -159,9 +159,11 @@
  </customwidgets>
  <tabstops>
   <tabstop>editLabel</tabstop>
+  <tabstop>mFilterRadio</tabstop>
   <tabstop>editFilter</tabstop>
   <tabstop>btnExpressionBuilder</tabstop>
   <tabstop>btnTestFilter</tabstop>
+  <tabstop>mElseRadio</tabstop>
   <tabstop>editDescription</tabstop>
   <tabstop>groupScale</tabstop>
   <tabstop>groupSymbol</tabstop>
diff --git a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
index 7cc077e9f43..40ff432625d 100644
--- a/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
+++ b/src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
@@ -93,6 +93,11 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>mBandComboBox</tabstop>
+  <tabstop>mMinLineEdit</tabstop>
+  <tabstop>mMaxLineEdit</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/ui/qgsvectorlayerloadstyledialog.ui b/src/ui/qgsvectorlayerloadstyledialog.ui
index e6f1f11bd01..b8624b11e0c 100644
--- a/src/ui/qgsvectorlayerloadstyledialog.ui
+++ b/src/ui/qgsvectorlayerloadstyledialog.ui
@@ -124,6 +124,12 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>mStyleTypeComboBox</tabstop>
+  <tabstop>mRelatedTable</tabstop>
+  <tabstop>mOthersTable</tabstop>
+  <tabstop>mStyleCategoriesListView</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/ui/qgsvectorlayerpropertiesbase.ui b/src/ui/qgsvectorlayerpropertiesbase.ui
index 9891a9968d8..3ad1dc44ccd 100644
--- a/src/ui/qgsvectorlayerpropertiesbase.ui
+++ b/src/ui/qgsvectorlayerpropertiesbase.ui
@@ -363,7 +363,7 @@
           </sizepolicy>
          </property>
          <property name="currentIndex">
-          <number>18</number>
+          <number>0</number>
          </property>
          <widget class="QWidget" name="mOptsPage_Information">
           <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -2537,17 +2537,17 @@ border-radius: 2px;</string>
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsScrollArea</class>
    <extends>QScrollArea</extends>
    <header>qgsscrollarea.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>QgsDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>qgsdoublespinbox.h</header>
-  </customwidget>
   <customwidget>
    <class>QgsCollapsibleGroupBox</class>
    <extends>QGroupBox</extends>
diff --git a/src/ui/qgsvectorlayersaveasdialogbase.ui b/src/ui/qgsvectorlayersaveasdialogbase.ui
index 8c0bf218f32..970ab720032 100644
--- a/src/ui/qgsvectorlayersaveasdialogbase.ui
+++ b/src/ui/qgsvectorlayersaveasdialogbase.ui
@@ -474,6 +474,12 @@
    <header>qgsprojectionselectionwidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsFileWidget</class>
+   <extends>QWidget</extends>
+   <header>qgsfilewidget.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>QgsExtentGroupBox</class>
    <extends>QgsCollapsibleGroupBox</extends>
@@ -485,33 +491,27 @@
    <extends>QWidget</extends>
    <header>qgsscalewidget.h</header>
   </customwidget>
-  <customwidget>
-   <class>QgsFileWidget</class>
-   <extends>QWidget</extends>
-   <header>qgsfilewidget.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>mFormatComboBox</tabstop>
-  <tabstop>mFilename</tabstop>
   <tabstop>leLayername</tabstop>
   <tabstop>mCrsSelector</tabstop>
   <tabstop>scrollArea</tabstop>
   <tabstop>mEncodingComboBox</tabstop>
   <tabstop>mSelectedOnly</tabstop>
+  <tabstop>mAttributeTable</tabstop>
   <tabstop>mSelectAllAttributes</tabstop>
   <tabstop>mDeselectAllAttributes</tabstop>
+  <tabstop>mReplaceRawFieldValues</tabstop>
   <tabstop>mSymbologyExportComboBox</tabstop>
   <tabstop>mScaleWidget</tabstop>
   <tabstop>mGeometryTypeComboBox</tabstop>
   <tabstop>mForceMultiCheckBox</tabstop>
   <tabstop>mIncludeZCheckBox</tabstop>
-  <tabstop>mAttributeTable</tabstop>
-  <tabstop>mReplaceRawFieldValues</tabstop>
   <tabstop>mOgrDatasourceOptions</tabstop>
   <tabstop>mOgrLayerOptions</tabstop>
   <tabstop>mAddToCanvas</tabstop>
  </tabstops>
  <resources/>
+ <connections/>
 </ui>
diff --git a/src/ui/qgsvectorlayersavestyledialog.ui b/src/ui/qgsvectorlayersavestyledialog.ui
index 2801f54df7a..743c87ec57a 100644
--- a/src/ui/qgsvectorlayersavestyledialog.ui
+++ b/src/ui/qgsvectorlayersavestyledialog.ui
@@ -179,6 +179,7 @@
  </customwidgets>
  <tabstops>
   <tabstop>mStyleTypeComboBox</tabstop>
+  <tabstop>mStylesWidget</tabstop>
   <tabstop>mStyleCategoriesListView</tabstop>
   <tabstop>mDbStyleNameEdit</tabstop>
   <tabstop>mDbStyleDescriptionEdit</tabstop>
diff --git a/src/ui/qgsvectorlayertemporalpropertieswidgetbase.ui b/src/ui/qgsvectorlayertemporalpropertieswidgetbase.ui
index ad1e625c5ad..d9634df4ba9 100644
--- a/src/ui/qgsvectorlayertemporalpropertieswidgetbase.ui
+++ b/src/ui/qgsvectorlayertemporalpropertieswidgetbase.ui
@@ -458,6 +458,11 @@ background: white;QgsCollapsibleGroupBoxBasic::title, QgsCollapsibleGroupBox::ti
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
   <customwidget>
    <class>QgsScrollArea</class>
    <extends>QScrollArea</extends>
@@ -474,11 +479,6 @@ background: white;QgsCollapsibleGroupBoxBasic::title, QgsCollapsibleGroupBox::ti
    <extends>QComboBox</extends>
    <header>qgsfieldcombobox.h</header>
   </customwidget>
-  <customwidget>
-   <class>QgsDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>qgsdoublespinbox.h</header>
-  </customwidget>
   <customwidget>
    <class>QgsFieldExpressionWidget</class>
    <extends>QWidget</extends>
@@ -489,6 +489,18 @@ background: white;QgsCollapsibleGroupBoxBasic::title, QgsCollapsibleGroupBox::ti
  <tabstops>
   <tabstop>scrollArea</tabstop>
   <tabstop>mTemporalGroupBox</tabstop>
+  <tabstop>mModeComboBox</tabstop>
+  <tabstop>mStartTemporalDateTimeEdit</tabstop>
+  <tabstop>mEndTemporalDateTimeEdit</tabstop>
+  <tabstop>mSingleFieldComboBox</tabstop>
+  <tabstop>mFixedDurationSpinBox</tabstop>
+  <tabstop>mFixedDurationUnitsComboBox</tabstop>
+  <tabstop>mAccumulateCheckBox</tabstop>
+  <tabstop>mStartFieldComboBox</tabstop>
+  <tabstop>mEndFieldComboBox</tabstop>
+  <tabstop>mDurationStartFieldComboBox</tabstop>
+  <tabstop>mDurationFieldComboBox</tabstop>
+  <tabstop>mDurationUnitsComboBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>