diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
diff --git a/i18n/qgis_ja.ts b/i18n/qgis_ja.ts
diff --git a/i18n/qgis_ka_GE.ts b/i18n/qgis_ka_GE.ts
diff --git a/i18n/qgis_km.ts b/i18n/qgis_km.ts
diff --git a/i18n/qgis_ko_KR.ts b/i18n/qgis_ko_KR.ts
diff --git a/i18n/qgis_lo.ts b/i18n/qgis_lo.ts
diff --git a/i18n/qgis_lt.ts b/i18n/qgis_lt.ts
diff --git a/i18n/qgis_lv.ts b/i18n/qgis_lv.ts
diff --git a/i18n/qgis_ml_IN.ts b/i18n/qgis_ml_IN.ts
diff --git a/i18n/qgis_mn.ts b/i18n/qgis_mn.ts
diff --git a/i18n/qgis_nl.ts b/i18n/qgis_nl.ts
diff --git a/i18n/qgis_no.ts b/i18n/qgis_no.ts
diff --git a/i18n/qgis_pl_PL.ts b/i18n/qgis_pl_PL.ts
diff --git a/i18n/qgis_pt_BR.ts b/i18n/qgis_pt_BR.ts
diff --git a/i18n/qgis_pt_PT.ts b/i18n/qgis_pt_PT.ts
diff --git a/i18n/qgis_ro.ts b/i18n/qgis_ro.ts
diff --git a/i18n/qgis_ru.ts b/i18n/qgis_ru.ts
diff --git a/i18n/qgis_sk.ts b/i18n/qgis_sk.ts
diff --git a/i18n/qgis_sl_SI.ts b/i18n/qgis_sl_SI.ts
diff --git a/i18n/qgis_sq_AL.ts b/i18n/qgis_sq_AL.ts
diff --git a/i18n/qgis_sr_Cyrl.ts b/i18n/qgis_sr_Cyrl.ts
diff --git a/i18n/qgis_sr_Latn.ts b/i18n/qgis_sr_Latn.ts
diff --git a/i18n/qgis_sv.ts b/i18n/qgis_sv.ts
diff --git a/i18n/qgis_sw.ts b/i18n/qgis_sw.ts
diff --git a/i18n/qgis_ta.ts b/i18n/qgis_ta.ts
diff --git a/i18n/qgis_th.ts b/i18n/qgis_th.ts
diff --git a/i18n/qgis_tr.ts b/i18n/qgis_tr.ts
diff --git a/i18n/qgis_uk.ts b/i18n/qgis_uk.ts
diff --git a/i18n/qgis_vi.ts b/i18n/qgis_vi.ts
diff --git a/i18n/qgis_xh.ts b/i18n/qgis_xh.ts
diff --git a/i18n/qgis_zh_CN.ts b/i18n/qgis_zh_CN.ts
diff --git a/i18n/qgis_zh_TW.ts b/i18n/qgis_zh_TW.ts
diff --git a/images/images.qrc b/images/images.qrc
@@ -198,6 +198,7 @@
         <file>themes/default/mActionHelpSponsors.png</file>
         <file>themes/default/mActionHideAllLayers.png</file>
         <file>themes/default/mActionIdentify.png</file>
+        <file>themes/default/mActionIdentify.svg</file>
         <file>themes/default/mActionIncreaseBrightness.svg</file>
         <file>themes/default/mActionIncreaseContrast.svg</file>
         <file>themes/default/mActionInOverview.png</file>

diff --git a/images/themes/default/mActionIdentify.png b/images/themes/default/mActionIdentify.png
diff --git a/images/themes/default/mActionIdentify.svg b/images/themes/default/mActionIdentify.svg
diff --git a/python/plugins/sextante/algs/ftools/Dissolve.py b/python/plugins/sextante/algs/ftools/Dissolve.py
@@ -92,7 +92,7 @@ def processAlgorithm(self, progress):
                     progress.setPercentage(int(nElement/nFeat * 100))
                     atMap = inFeat.attributes()
                     tempItem = atMap[ field ]
-                    if tempItem.strip() == item.strip():
+                    if unicode(tempItem).strip() == unicode(item).strip():
                         if first:
                             QgsGeometry( inFeat.geometry() )
                             tmpInGeom = QgsGeometry( inFeat.geometry() )

diff --git a/python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py b/python/plugins/sextante/algs/ftools/SinglePartsToMultiparts.py
@@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
                 for inFeat in features:
                     atMap = inFeat.attributes()
                     idVar = atMap[index]
-                    if idVar.strip() == i.strip():
+                    if unicode(idVar).strip() == unicode(i).strip():
                         if first:
                             attrs = atMap
                             print attrs

diff --git a/python/plugins/sextante/gui/FileSelectionPanel.py b/python/plugins/sextante/gui/FileSelectionPanel.py
@@ -75,4 +75,4 @@ def getValue(self):
         return s
 
     def setText(self, text):
-        self.text.setText(text)
+        self.text.setText(text)
diff --git a/python/plugins/sextante/modeler/ModelerParametersDialog.py b/python/plugins/sextante/modeler/ModelerParametersDialog.py
@@ -735,7 +735,7 @@ def setParamNumberValue(self, param, widget):
             except:
                 return False
         else:
-            value = widget.itemData(widget.currentIndex()).toPyObject()
+            value = widget.itemData(widget.currentIndex())
             self.params[param.name] = value
         return True
 
@@ -756,7 +756,7 @@ def setParamExtentValue(self, param, widget):
                 return False
             self.values[name] = s
         else:
-            value = widget.itemData(widget.currentIndex()).toPyObject()
+            value = widget.itemData(widget.currentIndex())
             self.params[param.name] = value
         return True
 

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1753,7 +1753,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionZoomNext->setIcon( QgsApplication::getThemeIcon( "/mActionZoomNext.png" ) );
   mActionZoomToLayer->setIcon( QgsApplication::getThemeIcon( "/mActionZoomToLayer.png" ) );
   mActionZoomActualSize->setIcon( QgsApplication::getThemeIcon( "/mActionZoomActual.png" ) );
-  mActionIdentify->setIcon( QgsApplication::getThemeIcon( "/mActionIdentify.png" ) );
+  mActionIdentify->setIcon( QgsApplication::getThemeIcon( "/mActionIdentify.svg" ) );
   mActionFeatureAction->setIcon( QgsApplication::getThemeIcon( "/mAction.png" ) );
   mActionSelect->setIcon( QgsApplication::getThemeIcon( "/mActionSelect.png" ) );
   mActionSelectRectangle->setIcon( QgsApplication::getThemeIcon( "/mActionSelectRectangle.png" ) );

diff --git a/src/plugins/heatmap/heatmapgui.cpp b/src/plugins/heatmap/heatmapgui.cpp
@@ -285,7 +285,7 @@ void HeatmapGui::on_rowsSpinBox_valueChanged()
   mRows = rowsSpinBox->value();
   mYcellsize = mBBox.height() / mRows;
   mXcellsize = mYcellsize;
-  mColumns = max( round( mBBox.width() / mXcellsize ), 1 );
+  mColumns = max( qRound( mBBox.width() / mXcellsize ), 1 );
 
   updateSize();
 }
@@ -295,7 +295,7 @@ void HeatmapGui::on_columnsSpinBox_valueChanged()
   mColumns = columnsSpinBox->value();
   mXcellsize = mBBox.width() / mColumns;
   mYcellsize = mXcellsize;
-  mRows = max( round( mBBox.height() / mYcellsize ), 1 );
+  mRows = max( qRound( mBBox.height() / mYcellsize ), 1 );
 
   updateSize();
 }
@@ -304,8 +304,8 @@ void HeatmapGui::on_cellXLineEdit_editingFinished()
 {
   mXcellsize = cellXLineEdit->text().toDouble();
   mYcellsize = mXcellsize;
-  mRows = max( round( mBBox.height() / mYcellsize ), 1 );
-  mColumns = max( round( mBBox.width() / mXcellsize ), 1 );
+  mRows = max( qRound( mBBox.height() / mYcellsize ), 1 );
+  mColumns = max( qRound( mBBox.width() / mXcellsize ), 1 );
 
   updateSize();
 }
@@ -314,8 +314,8 @@ void HeatmapGui::on_cellYLineEdit_editingFinished()
 {
   mYcellsize = cellYLineEdit->text().toDouble();
   mXcellsize = mYcellsize;
-  mRows = max( round( mBBox.height() / mYcellsize ), 1 );
-  mColumns = max( round( mBBox.width() / mXcellsize ), 1 );
+  mRows = max( qRound( mBBox.height() / mYcellsize ), 1 );
+  mColumns = max( qRound( mBBox.width() / mXcellsize ), 1 );
 
   updateSize();
 }

diff --git a/src/plugins/topology/checkDock.cpp b/src/plugins/topology/checkDock.cpp
@@ -150,14 +150,8 @@ void checkDock::deleteErrors()
   mErrorList.clear();
   mErrorListModel->resetModel();
 
-  QList<QgsRubberBand*>::const_iterator rit;
-
-  for ( rit = mRbErrorMarkers.begin(); rit != mRbErrorMarkers.end(); ++rit )
-  {
-    QgsRubberBand* rb = *rit;
-    rb->reset();
-    delete rb;
-  }
+  qDeleteAll( mRbErrorMarkers );
+  mRbErrorMarkers.clear();
 }
 
 void checkDock::parseErrorListByLayer( QString layerId )
@@ -397,14 +391,7 @@ void checkDock::validate( ValidateType type )
 {
   mErrorList.clear();
 
-  QList<QgsRubberBand*>::const_iterator it;
-  for ( it = mRbErrorMarkers.begin(); it != mRbErrorMarkers.end(); ++it )
-  {
-    QgsRubberBand* rb = *it;
-    rb->reset();
-    delete rb;
-  }
-
+  qDeleteAll( mRbErrorMarkers );
   mRbErrorMarkers.clear();
 
   runTests( type );

diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -568,52 +568,55 @@ void QgsMssqlProvider::uniqueValues( int index, QList<QVariant> &uniqueValues, i
 }
 
 
-// update the extent, feature count, wkb type and srid for this layer
+// update the extent, wkb type and srid for this layer
 void QgsMssqlProvider::UpdateStatistics( bool estimate )
 {
-  mNumberFeatures = 0;
   // get features to calculate the statistics
   QString statement;
 
   QSqlQuery query = QSqlQuery( mDatabase );
   query.setForwardOnly( true );
 
-  // Get the extents from the geometry_columns table to speed up load times.
-  statement = QString( "SELECT min_x, min_y, max_x, max_y from geometry_columns where f_table_schema = '%1' and f_table_name = '%2'" ).arg( mSchemaName ).arg( mTableName );
+  // Get the extents from the spatial index table to speed up load times.
+  // We have to use max() and min() because you can have more then one index but the biggest area is what we want to use.
+  QString sql = "SELECT min(bounding_box_xmin), min(bounding_box_ymin), max(bounding_box_xmax), max(bounding_box_ymax)"
+                " FROM sys.spatial_index_tessellations WHERE object_id =  OBJECT_ID('[%1].[%2]')";
+
+  statement = QString (sql).arg( mSchemaName )
+                           .arg( mTableName );
 
   if ( query.exec( statement ) )
   {
+    QgsDebugMsg("Found extents in spatial index");
     if ( query.next() )
     {
-      if ( !query.value( 0 ).isNull() || !query.value( 1 ).isNull() ||
-           !query.value( 2 ).isNull() || !query.value( 3 ).isNull() )
-      {
         mExtent.setXMinimum( query.value( 0 ).toDouble() );
         mExtent.setYMinimum( query.value( 1 ).toDouble() );
         mExtent.setXMaximum( query.value( 2 ).toDouble() );
         mExtent.setYMaximum( query.value( 3 ).toDouble() );
         return;
-      }
     }
   }
 
-  // If we can't find the extents in the geometry_columns table just do what we normally do.
-  bool readAll = false;
+  QgsDebugMsg(query.lastError().text());
+
+  // If we can't find the extents in the spatial index table just do what we normally do.
+  bool readAllGeography = false;
   if ( estimate )
   {
     if ( mGeometryColType == "geometry" )
-      statement = QString( "select min([%1].STPointN(1).STX), min([%1].STPointN(1).STY), max([%1].STPointN(1).STX), max([%1].STPointN(1).STY), COUNT([%1])" ).arg( mGeometryColName );
+      statement = QString( "select min([%1].STPointN(1).STX), min([%1].STPointN(1).STY), max([%1].STPointN(1).STX), max([%1].STPointN(1).STY)" ).arg( mGeometryColName );
     else
-      statement = QString( "select min([%1].STPointN(1).Long), min([%1].STPointN(1).Lat), max([%1].STPointN(1).Long), max([%1].STPointN(1).Lat), COUNT([%1])" ).arg( mGeometryColName );
+      statement = QString( "select min([%1].STPointN(1).Long), min([%1].STPointN(1).Lat), max([%1].STPointN(1).Long), max([%1].STPointN(1).Lat)" ).arg( mGeometryColName );
   }
   else
   {
     if ( mGeometryColType == "geometry" )
-      statement = QString( "select min([%1].STEnvelope().STPointN(1).STX), min([%1].STEnvelope().STPointN(1).STY), max([%1].STEnvelope().STPointN(3).STX), max([%1].STEnvelope().STPointN(3).STY), count([%1])" ).arg( mGeometryColName );
+      statement = QString( "select min([%1].STEnvelope().STPointN(1).STX), min([%1].STEnvelope().STPointN(1).STY), max([%1].STEnvelope().STPointN(3).STX), max([%1].STEnvelope().STPointN(3).STY)" ).arg( mGeometryColName );
     else
     {
       statement = QString( "select [%1]" ).arg( mGeometryColName );
-      readAll = true;
+      readAllGeography = true;
     }
   }
 
@@ -633,52 +636,45 @@ void QgsMssqlProvider::UpdateStatistics( bool estimate )
     QgsDebugMsg( msg );
   }
 
-  if ( query.isActive() )
+  if ( !query.isActive() )
+  {
+      return;
+  }
+
+  QgsGeometry geom;
+  if ( !readAllGeography )
   {
-    QgsGeometry geom;
-    if ( !readAll )
+    if ( query.next() )
     {
-      if ( query.next() )
-      {
-        mExtent.setXMinimum( query.value( 0 ).toDouble() );
-        mExtent.setYMinimum( query.value( 1 ).toDouble() );
-        mExtent.setXMaximum( query.value( 2 ).toDouble() );
-        mExtent.setYMaximum( query.value( 3 ).toDouble() );
-        mNumberFeatures = query.value( 4 ).toInt();
-      }
+      mExtent.setXMinimum( query.value( 0 ).toDouble() );
+      mExtent.setYMinimum( query.value( 1 ).toDouble() );
+      mExtent.setXMaximum( query.value( 2 ).toDouble() );
+      mExtent.setYMaximum( query.value( 3 ).toDouble() );
+      return;
     }
-    else
-    {
-      // read all features
-      while ( query.next() )
-      {
-        QByteArray ar = query.value( 0 ).toByteArray();
-        unsigned char* wkb = parser.ParseSqlGeometry(( unsigned char* )ar.data(), ar.size() );
-        if ( wkb )
-        {
-          geom.fromWkb( wkb, parser.GetWkbLen() );
-          QgsRectangle rect = geom.boundingBox();
+  }
 
-          if ( mNumberFeatures > 0 )
-          {
-            if ( rect.xMinimum() < mExtent.xMinimum() )
-              mExtent.setXMinimum( rect.xMinimum() );
-            if ( rect.yMinimum() < mExtent.yMinimum() )
-              mExtent.setYMinimum( rect.yMinimum() );
-            if ( rect.xMaximum() > mExtent.xMaximum() )
-              mExtent.setXMaximum( rect.xMaximum() );
-            if ( rect.yMaximum() > mExtent.yMaximum() )
-              mExtent.setYMaximum( rect.yMaximum() );
-          }
-          else
-          {
-            mExtent = rect;
-            mWkbType = geom.wkbType();
-            mSRId = parser.GetSRSId();
-          }
-          ++mNumberFeatures;
-        }
-      }
+  // We have to read all the geometry if readAllGeography is true.
+  while ( query.next() )
+  {
+    QByteArray ar = query.value( 0 ).toByteArray();
+    unsigned char* wkb = parser.ParseSqlGeometry(( unsigned char* )ar.data(), ar.size() );
+    if ( wkb )
+    {
+      geom.fromWkb( wkb, parser.GetWkbLen() );
+      QgsRectangle rect = geom.boundingBox();
+
+      if ( rect.xMinimum() < mExtent.xMinimum() )
+        mExtent.setXMinimum( rect.xMinimum() );
+      if ( rect.yMinimum() < mExtent.yMinimum() )
+        mExtent.setYMinimum( rect.yMinimum() );
+      if ( rect.xMaximum() > mExtent.xMaximum() )
+        mExtent.setXMaximum( rect.xMaximum() );
+      if ( rect.yMaximum() > mExtent.yMaximum() )
+        mExtent.setYMaximum( rect.yMaximum() );
+
+      mWkbType = geom.wkbType();
+      mSRId = parser.GetSRSId();
     }
   }
 }
@@ -704,7 +700,36 @@ QGis::WkbType QgsMssqlProvider::geometryType() const
  */
 long QgsMssqlProvider::featureCount() const
 {
-  return mNumberFeatures;
+  // Return the count that we get from the subset.
+  if ( !mSqlWhereClause.isEmpty() )
+    return mNumberFeatures;
+
+  // If there is no subset set we can get the count from the system tables.
+  // Which is faster then doing select count(*)
+  QSqlQuery query = QSqlQuery( mDatabase );
+  query.setForwardOnly( true );
+
+  QString sql = "SELECT rows"
+                " FROM sys.tables t"
+                " JOIN sys.partitions p ON t.object_id = p.object_id AND p.index_id IN (0,1)"
+                " WHERE SCHEMA_NAME(t.schema_id) = '%1' AND OBJECT_NAME(t.OBJECT_ID) = '%2'";
+
+  QString statement = QString (sql).arg( mSchemaName )
+                                   .arg( mTableName );
+
+  if ( query.exec( statement ) )
+  {
+      if ( query.next() )
+      {
+        return query.value(0).toInt();
+      }
+  }
+  else
+  {
+    // We couldn't get the rows from the sys tables. Can that ever happen?
+    // Should just do a select count(*) here.
+    return -1;
+  }
 }
 
 const QgsFields & QgsMssqlProvider::fields() const

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -910,7 +910,7 @@
    </property>
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionIdentify.png</normaloff>:/images/themes/default/mActionIdentify.png</iconset>
+     <normaloff>:/images/themes/default/mActionIdentify.svg</normaloff>:/images/themes/default/mActionIdentify.svg</iconset>
    </property>
    <property name="text">
     <string>Identify Features</string>