diff --git a/python/plugins/db_manager/dlg_add_geometry_column.py b/python/plugins/db_manager/dlg_add_geometry_column.py
index a5a8af398b0..f8f327fe01f 100644
--- a/python/plugins/db_manager/dlg_add_geometry_column.py
+++ b/python/plugins/db_manager/dlg_add_geometry_column.py
@@ -29,9 +29,9 @@ from .db_plugins.plugin import DbError
 from .dlg_db_error import DlgDbError
 from .db_plugins.plugin import TableField
 
-from .ui.ui_DlgAddGeometryColumn import Ui_DlgAddGeometryColumn
+from .ui.ui_DlgAddGeometryColumn import Ui_DbManagerDlgAddGeometryColumn as Ui_Dialog
 
-class DlgAddGeometryColumn(QDialog, Ui_DlgAddGeometryColumn):
+class DlgAddGeometryColumn(QDialog, Ui_Dialog):
 
 	GEOM_TYPES = ["POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"]
 
diff --git a/python/plugins/db_manager/dlg_create_constraint.py b/python/plugins/db_manager/dlg_create_constraint.py
index a67529356a3..8829f9d9af8 100644
--- a/python/plugins/db_manager/dlg_create_constraint.py
+++ b/python/plugins/db_manager/dlg_create_constraint.py
@@ -29,10 +29,9 @@ from .db_plugins.plugin import DbError
 from .dlg_db_error import DlgDbError
 from .db_plugins.plugin import TableConstraint
 
-from .ui.ui_DlgCreateConstraint import Ui_DlgCreateConstraint
-
-class DlgCreateConstraint(QDialog, Ui_DlgCreateConstraint):
+from .ui.ui_DlgCreateConstraint import Ui_DbManagerDlgCreateConstraint as Ui_Dialog
 
+class DlgCreateConstraint(QDialog, Ui_Dialog):
 	def __init__(self, parent=None, table=None, db=None):
 		QDialog.__init__(self, parent)
 		self.table = table
diff --git a/python/plugins/db_manager/dlg_create_index.py b/python/plugins/db_manager/dlg_create_index.py
index 0b5f90a54e5..0e0ca7c1ec9 100644
--- a/python/plugins/db_manager/dlg_create_index.py
+++ b/python/plugins/db_manager/dlg_create_index.py
@@ -29,11 +29,9 @@ from .db_plugins.plugin import DbError
 from .dlg_db_error import DlgDbError
 from .db_plugins.plugin import TableIndex
 
-from .ui.ui_DlgCreateIndex import Ui_DlgCreateIndex
-
-
-class DlgCreateIndex(QDialog, Ui_DlgCreateIndex):
+from .ui.ui_DlgCreateIndex import Ui_DbManagerDlgCreateIndex as Ui_Dialog
 
+class DlgCreateIndex(QDialog, Ui_Dialog):
 	def __init__(self, parent=None, table=None, db=None):
 		QDialog.__init__(self, parent)
 		self.table = table
diff --git a/python/plugins/db_manager/dlg_create_table.py b/python/plugins/db_manager/dlg_create_table.py
index 22a21c508cc..09a36685ff6 100644
--- a/python/plugins/db_manager/dlg_create_table.py
+++ b/python/plugins/db_manager/dlg_create_table.py
@@ -29,7 +29,7 @@ from .db_plugins.data_model import TableFieldsModel
 from .db_plugins.plugin import DbError, ConnectionError
 from .dlg_db_error import DlgDbError
 
-from .ui.ui_DlgCreateTable import Ui_DlgCreateTable
+from .ui.ui_DlgCreateTable import Ui_DbManagerDlgCreateTable as Ui_Dialog
 
 
 class TableFieldsDelegate(QItemDelegate):
@@ -79,8 +79,7 @@ class TableFieldsDelegate(QItemDelegate):
 				self.emit(SIGNAL("columnNameChanged()"))
 
 
-class DlgCreateTable(QDialog, Ui_DlgCreateTable):
-
+class DlgCreateTable(QDialog, Ui_Dialog):
 	GEOM_TYPES = ["POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"]
 
 	def __init__(self, item, parent=None):
diff --git a/python/plugins/db_manager/dlg_db_error.py b/python/plugins/db_manager/dlg_db_error.py
index 4beeee04575..408d472934e 100644
--- a/python/plugins/db_manager/dlg_db_error.py
+++ b/python/plugins/db_manager/dlg_db_error.py
@@ -25,10 +25,10 @@ The content of this file is based on
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from .ui.ui_DlgDbError import Ui_DlgDbError
+from .ui.ui_DlgDbError import Ui_DbManagerDlgDbError as Ui_Dialog
 from .db_plugins.plugin import DbError
 
-class DlgDbError(QDialog, Ui_DlgDbError):
+class DlgDbError(QDialog, Ui_Dialog):
 	def __init__(self, e, parent=None):
 		QDialog.__init__(self, parent)
 		self.setupUi(self)
diff --git a/python/plugins/db_manager/dlg_export_vector.py b/python/plugins/db_manager/dlg_export_vector.py
index e895ed7c9ba..2815d510d6b 100644
--- a/python/plugins/db_manager/dlg_export_vector.py
+++ b/python/plugins/db_manager/dlg_export_vector.py
@@ -28,9 +28,9 @@ from PyQt4.QtGui import *
 import qgis.core
 from qgis.utils import iface
 
-from .ui.ui_DlgExportVector import Ui_DlgExportVector
+from .ui.ui_DlgExportVector import Ui_DbManagerDlgExportVector as Ui_Dialog
 
-class DlgExportVector(QDialog, Ui_DlgExportVector):
+class DlgExportVector(QDialog, Ui_Dialog):
 
 	def __init__(self, inLayer, inDb, parent=None):
 		QDialog.__init__(self, parent)
diff --git a/python/plugins/db_manager/dlg_field_properties.py b/python/plugins/db_manager/dlg_field_properties.py
index f174e9987e7..956bd532716 100644
--- a/python/plugins/db_manager/dlg_field_properties.py
+++ b/python/plugins/db_manager/dlg_field_properties.py
@@ -29,10 +29,9 @@ from PyQt4.QtGui import *
 
 from .db_plugins.plugin import TableField
 
-from .ui.ui_DlgFieldProperties import Ui_DlgFieldProperties
-
-class DlgFieldProperties(QDialog, Ui_DlgFieldProperties):
+from .ui.ui_DlgFieldProperties import Ui_DbManagerDlgFieldProperties as Ui_Dialog
 
+class DlgFieldProperties(QDialog, Ui_Dialog):
 	def __init__(self, parent=None, fld=None, table=None, db=None):
 		QDialog.__init__(self, parent)
 		self.fld = fld
diff --git a/python/plugins/db_manager/dlg_import_vector.py b/python/plugins/db_manager/dlg_import_vector.py
index 71697c34405..e23c3960626 100644
--- a/python/plugins/db_manager/dlg_import_vector.py
+++ b/python/plugins/db_manager/dlg_import_vector.py
@@ -28,9 +28,9 @@ from PyQt4.QtGui import *
 import qgis.core
 from qgis.utils import iface
 
-from .ui.ui_DlgImportVector import Ui_DlgImportVector
+from .ui.ui_DlgImportVector import Ui_DbManagerDlgImportVector as Ui_Dialog
 
-class DlgImportVector(QDialog, Ui_DlgImportVector):
+class DlgImportVector(QDialog, ):
 
 	HAS_INPUT_MODE, ASK_FOR_INPUT_MODE = range(2)
 
diff --git a/python/plugins/db_manager/dlg_sql_window.py b/python/plugins/db_manager/dlg_sql_window.py
index 8b6d06de61b..43c56e5be90 100644
--- a/python/plugins/db_manager/dlg_sql_window.py
+++ b/python/plugins/db_manager/dlg_sql_window.py
@@ -28,12 +28,12 @@ from PyQt4.QtGui import *
 from .db_plugins.plugin import BaseError
 from .dlg_db_error import DlgDbError
 
-from .ui.ui_DlgSqlWindow import Ui_DlgSqlWindow
+from .ui.ui_DlgSqlWindow import Ui_DbManagerDlgSqlWindow as Ui_Dialog
 
 from .highlighter import SqlHighlighter
 from .completer import SqlCompleter
 
-class DlgSqlWindow(QDialog, Ui_DlgSqlWindow):
+class DlgSqlWindow(QDialog, Ui_Dialog):
 
 	def __init__(self, iface, db, parent=None):
 		QDialog.__init__(self, parent)
diff --git a/python/plugins/db_manager/dlg_table_properties.py b/python/plugins/db_manager/dlg_table_properties.py
index 6bce711667a..01ec01c6a31 100644
--- a/python/plugins/db_manager/dlg_table_properties.py
+++ b/python/plugins/db_manager/dlg_table_properties.py
@@ -34,10 +34,9 @@ from .dlg_add_geometry_column import DlgAddGeometryColumn
 from .dlg_create_constraint import DlgCreateConstraint
 from .dlg_create_index import DlgCreateIndex
 
-from .ui.ui_DlgTableProperties import Ui_DlgTableProperties
-
-class DlgTableProperties(QDialog, Ui_DlgTableProperties):
+from .ui.ui_DlgTableProperties import Ui_DbManagerDlgTableProperties as Ui_Dialog
 
+class DlgTableProperties(QDialog, Ui_Dialog):
 	def __init__(self, table, parent=None):
 		QDialog.__init__(self, parent)
 		self.table = table
diff --git a/python/plugins/db_manager/ui/DlgAddGeometryColumn.ui b/python/plugins/db_manager/ui/DlgAddGeometryColumn.ui
index 7a66a8284a7..2830cac1a5f 100644
--- a/python/plugins/db_manager/ui/DlgAddGeometryColumn.ui
+++ b/python/plugins/db_manager/ui/DlgAddGeometryColumn.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgAddGeometryColumn</class>
- <widget class="QDialog" name="DlgAddGeometryColumn">
+ <class>DbManagerDlgAddGeometryColumn</class>
+ <widget class="QDialog" name="DbManagerDlgAddGeometryColumn">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string>Add geometry column</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
@@ -27,7 +27,7 @@
    <item row="0" column="1" colspan="2">
     <widget class="QLineEdit" name="editName">
      <property name="text">
-      <string>geom</string>
+      <string notr="true">geom</string>
      </property>
     </widget>
    </item>
@@ -45,37 +45,37 @@
     <widget class="QComboBox" name="cboType">
      <item>
       <property name="text">
-       <string>POINT</string>
+       <string notr="true">POINT</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>LINESTRING</string>
+       <string notr="true">LINESTRING</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>POLYGON</string>
+       <string notr="true">POLYGON</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>MULTIPOINT</string>
+       <string notr="true">MULTIPOINT</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>MULTILINESTRING</string>
+       <string notr="true">MULTILINESTRING</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>MULTIPOLYGON</string>
+       <string notr="true">MULTIPOLYGON</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>GEOMETRYCOLLECTION</string>
+       <string notr="true">GEOMETRYCOLLECTION</string>
       </property>
      </item>
     </widget>
@@ -126,7 +126,7 @@
    <item row="3" column="1">
     <widget class="QLineEdit" name="editSrid">
      <property name="text">
-      <string>-1</string>
+      <string notr="true">-1</string>
      </property>
     </widget>
    </item>
@@ -154,7 +154,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>DlgAddGeometryColumn</receiver>
+   <receiver>DbManagerDlgAddGeometryColumn</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/python/plugins/db_manager/ui/DlgCreateConstraint.ui b/python/plugins/db_manager/ui/DlgCreateConstraint.ui
index bf35365f687..d2f62639fff 100644
--- a/python/plugins/db_manager/ui/DlgCreateConstraint.ui
+++ b/python/plugins/db_manager/ui/DlgCreateConstraint.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgCreateConstraint</class>
- <widget class="QDialog" name="DlgCreateConstraint">
+ <class>DbManagerDlgCreateConstraint</class>
+ <widget class="QDialog" name="DbManagerDlgCreateConstraint">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -65,7 +65,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>DlgCreateConstraint</receiver>
+   <receiver>DbManagerDlgCreateConstraint</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/python/plugins/db_manager/ui/DlgCreateIndex.ui b/python/plugins/db_manager/ui/DlgCreateIndex.ui
index 724b684b3cf..523f07821b4 100644
--- a/python/plugins/db_manager/ui/DlgCreateIndex.ui
+++ b/python/plugins/db_manager/ui/DlgCreateIndex.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgCreateIndex</class>
- <widget class="QDialog" name="DlgCreateIndex">
+ <class>DbManagerDlgCreateIndex</class>
+ <widget class="QDialog" name="DbManagerDlgCreateIndex">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -32,7 +32,11 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QLineEdit" name="editName"/>
+    <widget class="QLineEdit" name="editName">
+     <property name="text">
+      <string notr="true"/>
+     </property>
+    </widget>
    </item>
    <item row="2" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
@@ -56,7 +60,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>DlgCreateIndex</receiver>
+   <receiver>DbManagerDlgCreateIndex</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/python/plugins/db_manager/ui/DlgCreateTable.ui b/python/plugins/db_manager/ui/DlgCreateTable.ui
index 266d9759b65..8bf3690bc91 100644
--- a/python/plugins/db_manager/ui/DlgCreateTable.ui
+++ b/python/plugins/db_manager/ui/DlgCreateTable.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgCreateTable</class>
- <widget class="QDialog" name="DlgCreateTable">
+ <class>DbManagerDlgCreateTable</class>
+ <widget class="QDialog" name="DbManagerDlgCreateTable">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -40,7 +40,11 @@
       </widget>
      </item>
      <item row="1" column="2">
-      <widget class="QLineEdit" name="editName"/>
+      <widget class="QLineEdit" name="editName">
+       <property name="text">
+        <string notr="true"/>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -126,37 +130,37 @@
       <widget class="QComboBox" name="cboGeomType">
        <item>
         <property name="text">
-         <string>POINT</string>
+         <string notr="true">POINT</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>LINESTRING</string>
+         <string notr="true">LINESTRING</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>POLYGON</string>
+         <string notr="true">POLYGON</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>MULTIPOINT</string>
+         <string notr="true">MULTIPOINT</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>MULTILINESTRING</string>
+         <string notr="true">MULTILINESTRING</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>MULTIPOLYGON</string>
+         <string notr="true">MULTIPOLYGON</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>GEOMETRYCOLLECTION</string>
+         <string notr="true">GEOMETRYCOLLECTION</string>
         </property>
        </item>
       </widget>
@@ -174,7 +178,7 @@
      <item row="1" column="1">
       <widget class="QLineEdit" name="editGeomColumn">
        <property name="text">
-        <string>geom</string>
+        <string notr="true">geom</string>
        </property>
       </widget>
      </item>
@@ -224,7 +228,7 @@
      <item row="3" column="1">
       <widget class="QLineEdit" name="editGeomSrid">
        <property name="text">
-        <string>-1</string>
+        <string notr="true">-1</string>
        </property>
       </widget>
      </item>
@@ -278,7 +282,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>DlgCreateTable</receiver>
+   <receiver>DbManagerDlgCreateTable</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/python/plugins/db_manager/ui/DlgExportVector.ui b/python/plugins/db_manager/ui/DlgExportVector.ui
index b89cf8f6717..4e8d2cb7230 100644
--- a/python/plugins/db_manager/ui/DlgExportVector.ui
+++ b/python/plugins/db_manager/ui/DlgExportVector.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgExportVector</class>
- <widget class="QDialog" name="DlgExportVector">
+ <class>DbManagerDlgExportVector</class>
+ <widget class="QDialog" name="DbManagerDlgExportVector">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -28,7 +28,11 @@
     </widget>
    </item>
    <item row="0" column="1">
-    <widget class="QLineEdit" name="editOutputFile"/>
+    <widget class="QLineEdit" name="editOutputFile">
+     <property name="text">
+      <string notr="true"/>
+     </property>
+    </widget>
    </item>
    <item row="0" column="2">
     <widget class="QToolButton" name="btnChooseOutputFile">
@@ -113,6 +117,9 @@
           <property name="enabled">
            <bool>false</bool>
           </property>
+          <property name="text">
+           <string notr="true"/>
+          </property>
          </widget>
         </item>
         <item>
@@ -143,6 +150,9 @@
           <property name="enabled">
            <bool>false</bool>
           </property>
+          <property name="text">
+           <string notr="true"/>
+          </property>
          </widget>
         </item>
        </layout>
@@ -203,7 +213,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>DlgExportVector</receiver>
+   <receiver>DbManagerDlgExportVector</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -283,7 +293,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>DlgExportVector</receiver>
+   <receiver>DbManagerDlgExportVector</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/python/plugins/db_manager/ui/DlgFieldProperties.ui b/python/plugins/db_manager/ui/DlgFieldProperties.ui
index b8a71a950f9..bf3ad16c5d5 100644
--- a/python/plugins/db_manager/ui/DlgFieldProperties.ui
+++ b/python/plugins/db_manager/ui/DlgFieldProperties.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgFieldProperties</class>
- <widget class="QDialog" name="DlgFieldProperties">
+ <class>DbManagerDlgFieldProperties</class>
+ <widget class="QDialog" name="DbManagerDlgFieldProperties">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -24,7 +24,11 @@
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="editName"/>
+      <widget class="QLineEdit" name="editName">
+       <property name="text">
+        <string notr="true"/>
+       </property>
+      </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_2">
@@ -38,6 +42,9 @@
        <property name="editable">
         <bool>true</bool>
        </property>
+       <property name="insertPolicy">
+        <enum>QComboBox::NoInsert</enum>
+       </property>
       </widget>
      </item>
      <item row="3" column="0">
@@ -50,7 +57,7 @@
      <item row="3" column="1">
       <widget class="QCheckBox" name="chkNull">
        <property name="text">
-        <string/>
+        <string notr="true"/>
        </property>
        <property name="checked">
         <bool>true</bool>
@@ -65,7 +72,11 @@
       </widget>
      </item>
      <item row="4" column="1">
-      <widget class="QLineEdit" name="editDefault"/>
+      <widget class="QLineEdit" name="editDefault">
+       <property name="text">
+        <string notr="true"/>
+       </property>
+      </widget>
      </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_5">
@@ -75,7 +86,11 @@
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QLineEdit" name="editLength"/>
+      <widget class="QLineEdit" name="editLength">
+       <property name="text">
+        <string notr="true"/>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -104,7 +119,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>DlgFieldProperties</receiver>
+   <receiver>DbManagerDlgFieldProperties</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/python/plugins/db_manager/ui/DlgSqlWindow.ui b/python/plugins/db_manager/ui/DlgSqlWindow.ui
index 24890fab2f8..81a4798f831 100644
--- a/python/plugins/db_manager/ui/DlgSqlWindow.ui
+++ b/python/plugins/db_manager/ui/DlgSqlWindow.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgSqlWindow</class>
- <widget class="QDialog" name="DlgSqlWindow">
+ <class>DbManagerDlgSqlWindow</class>
+ <widget class="QDialog" name="DbManagerDlgSqlWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -36,6 +36,13 @@
            <verstretch>1</verstretch>
           </sizepolicy>
          </property>
+         <property name="html">
+          <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
         </widget>
        </item>
        <item>
@@ -162,6 +169,9 @@ integer values</string>
              <property name="editable">
               <bool>true</bool>
              </property>
+             <property name="insertPolicy">
+              <enum>QComboBox::NoInsert</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -185,6 +195,9 @@ integer values</string>
              <property name="editable">
               <bool>true</bool>
              </property>
+             <property name="insertPolicy">
+              <enum>QComboBox::NoInsert</enum>
+             </property>
             </widget>
            </item>
            <item>
@@ -228,7 +241,7 @@ columns</string>
               <bool>true</bool>
              </property>
              <property name="text">
-              <string/>
+              <string notr="true"/>
              </property>
             </widget>
            </item>
diff --git a/python/plugins/db_manager/ui/DlgTableProperties.ui b/python/plugins/db_manager/ui/DlgTableProperties.ui
index 36dcde07160..3b23e2ccbcc 100644
--- a/python/plugins/db_manager/ui/DlgTableProperties.ui
+++ b/python/plugins/db_manager/ui/DlgTableProperties.ui
@@ -1,71 +1,72 @@
-<ui version="4.0" >
- <class>DlgTableProperties</class>
- <widget class="QDialog" name="DlgTableProperties" >
-  <property name="geometry" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DbManagerDlgTableProperties</class>
+ <widget class="QDialog" name="DbManagerDlgTableProperties">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>531</width>
+    <width>547</width>
     <height>435</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Table properties</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QTabWidget" name="tabs" >
-     <property name="currentIndex" >
-      <number>0</number>
+    <widget class="QTabWidget" name="tabs">
+     <property name="currentIndex">
+      <number>2</number>
      </property>
-     <widget class="QWidget" name="tabColumns" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tabColumns">
+      <attribute name="title">
        <string>Columns</string>
       </attribute>
-      <layout class="QVBoxLayout" >
+      <layout class="QVBoxLayout">
        <item>
-        <widget class="QLabel" name="label" >
-         <property name="text" >
+        <widget class="QLabel" name="label">
+         <property name="text">
           <string>Table columns:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QTreeView" name="viewFields" >
-         <property name="rootIsDecorated" >
+        <widget class="QTreeView" name="viewFields">
+         <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" >
+        <layout class="QHBoxLayout">
          <item>
-          <widget class="QPushButton" name="btnAddColumn" >
-           <property name="text" >
+          <widget class="QPushButton" name="btnAddColumn">
+           <property name="text">
             <string>Add column</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="btnAddGeometryColumn" >
-           <property name="text" >
+          <widget class="QPushButton" name="btnAddGeometryColumn">
+           <property name="text">
             <string>Add geometry column</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="btnEditColumn" >
-           <property name="text" >
+          <widget class="QPushButton" name="btnEditColumn">
+           <property name="text">
             <string>Edit column</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
@@ -74,8 +75,8 @@
           </spacer>
          </item>
          <item>
-          <widget class="QPushButton" name="btnDeleteColumn" >
-           <property name="text" >
+          <widget class="QPushButton" name="btnDeleteColumn">
+           <property name="text">
             <string>Delete column</string>
            </property>
           </widget>
@@ -84,40 +85,40 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabConstraints" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tabConstraints">
+      <attribute name="title">
        <string>Constraints</string>
       </attribute>
-      <layout class="QVBoxLayout" >
+      <layout class="QVBoxLayout">
        <item>
-        <widget class="QLabel" name="label_3" >
-         <property name="text" >
+        <widget class="QLabel" name="label_3">
+         <property name="text">
           <string>Primary, foreign keys, unique and check constraints:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QTreeView" name="viewConstraints" >
-         <property name="rootIsDecorated" >
+        <widget class="QTreeView" name="viewConstraints">
+         <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" >
+        <layout class="QHBoxLayout">
          <item>
-          <widget class="QPushButton" name="btnAddConstraint" >
-           <property name="text" >
+          <widget class="QPushButton" name="btnAddConstraint">
+           <property name="text">
             <string>Add primary key / unique</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
@@ -126,8 +127,8 @@
           </spacer>
          </item>
          <item>
-          <widget class="QPushButton" name="btnDeleteConstraint" >
-           <property name="text" >
+          <widget class="QPushButton" name="btnDeleteConstraint">
+           <property name="text">
             <string>Delete constraint</string>
            </property>
           </widget>
@@ -136,47 +137,47 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tabIndexes" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tabIndexes">
+      <attribute name="title">
        <string>Indexes</string>
       </attribute>
-      <layout class="QVBoxLayout" >
+      <layout class="QVBoxLayout">
        <item>
-        <widget class="QLabel" name="label_2" >
-         <property name="text" >
+        <widget class="QLabel" name="label_2">
+         <property name="text">
           <string>Indexes defined for this table:</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QTreeView" name="viewIndexes" >
-         <property name="rootIsDecorated" >
+        <widget class="QTreeView" name="viewIndexes">
+         <property name="rootIsDecorated">
           <bool>false</bool>
          </property>
         </widget>
        </item>
        <item>
-        <layout class="QHBoxLayout" >
+        <layout class="QHBoxLayout">
          <item>
-          <widget class="QPushButton" name="btnAddIndex" >
-           <property name="text" >
+          <widget class="QPushButton" name="btnAddIndex">
+           <property name="text">
             <string>Add index</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QPushButton" name="btnAddSpatialIndex" >
-           <property name="text" >
+          <widget class="QPushButton" name="btnAddSpatialIndex">
+           <property name="text">
             <string>Add spatial index</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer>
-           <property name="orientation" >
+           <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
-           <property name="sizeHint" >
+           <property name="sizeHint" stdset="0">
             <size>
              <width>40</width>
              <height>20</height>
@@ -185,8 +186,8 @@
           </spacer>
          </item>
          <item>
-          <widget class="QPushButton" name="btnDeleteIndex" >
-           <property name="text" >
+          <widget class="QPushButton" name="btnDeleteIndex">
+           <property name="text">
             <string>Delete index</string>
            </property>
           </widget>
@@ -198,11 +199,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Close</set>
      </property>
     </widget>
@@ -230,14 +231,14 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>DlgTableProperties</receiver>
+   <receiver>DbManagerDlgTableProperties</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>248</x>
      <y>254</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>157</x>
      <y>274</y>
     </hint>
@@ -246,14 +247,14 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>DlgTableProperties</receiver>
+   <receiver>DbManagerDlgTableProperties</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>316</x>
      <y>260</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>286</x>
      <y>274</y>
     </hint>