diff --git a/ImportPhotos.py b/ImportPhotos.py
index aadbaff..b3c3184 100644
--- a/ImportPhotos.py
+++ b/ImportPhotos.py
@@ -292,6 +292,7 @@ def run(self):
         self.dlg.out.setText('')
         self.dlg.imp.setText('')
         self.dlg.load_style_path.setText('')
+        self.dlg.canvas_extent.setChecked(False)
         self.dlg.show()
 
     def close(self):
@@ -442,6 +443,7 @@ def import_photos(self, directoryPhotos, outputPath, load_style, showMessageHide
         self.canvas.setMapTool(self.toolMouseClick)
 
         self.truePhotosCount = 0
+        self.out_of_extent_photos = 0
 
         self.Qpr_inst = QgsProject.instance()
         if platform.system()=='Darwin':
@@ -548,18 +550,19 @@ def completed(self, exception, result=None):
         self.dlg.input_load_style.setEnabled(True)
         self.clickPhotos.setChecked(True)
 
-        noLocationPhotosCounter = self.initphotos - self.truePhotosCount
+        noLocationPhotosCounter = self.initphotos - self.truePhotosCount - self.out_of_extent_photos
         if (self.truePhotosCount == noLocationPhotosCounter == 0 or self.truePhotosCount == 0 ) and self.showMessageHide:
             title = 'Import Photos'
             msg = 'Import Completed.\n\nDetails:\n  No new photos were added.'
             self.showMessage(title, msg, 'Information')
             self.taskPhotos.destroyed()
             return
-        elif ((self.truePhotosCount == self.initphotos) or ((noLocationPhotosCounter + self.truePhotosCount) == self.initphotos) )and self.showMessageHide:
+        elif ((self.truePhotosCount == self.initphotos) or ((noLocationPhotosCounter + self.truePhotosCount + self.out_of_extent_photos) == self.initphotos) )and self.showMessageHide:
             title = 'Import Photos'
             msg = 'Import Completed.\n\nDetails:\n  ' + str(
                 int(self.truePhotosCount)) + ' photo(s) added without error.\n  ' + str(
-                int(noLocationPhotosCounter)) + ' photo(s) skipped (because of missing location).'
+                int(noLocationPhotosCounter)) + ' photo(s) skipped (because of missing location).\n  ' + str(
+                int(self.out_of_extent_photos)) + ' photo(s) skipped (because not in canvas extent).'
             self.showMessage(title, msg, 'Information')
 
         g = self.Qpr_inst.layerTreeRoot().insertGroup(0, self.lphoto)
@@ -590,10 +593,13 @@ def import_photos_task(self, task, wait_time):
                         continue
 
                     lat, lon = self.get_exif_location(tags, "lonlat")
-                    if 'GPS GPSAltitude' in tags:
-                        altitude = float(tags["GPS GPSAltitude"].values[0].num) / float(
-                            tags["GPS GPSAltitude"].values[0].den)
-                    else:
+                    try:
+                        if 'GPS GPSAltitude' in tags:
+                            altitude = float(tags["GPS GPSAltitude"].values[0].num) / float(
+                                tags["GPS GPSAltitude"].values[0].den)
+                        else:
+                            altitude = ''
+                    except:
                         altitude = ''
                     uuid_ = str(uuid.uuid4())
 
@@ -613,35 +619,53 @@ def import_photos_task(self, task, wait_time):
                             time_ = ''
                             timestamp = ''
 
-                    if 'GPS GPSImgDirection' in tags:
-                        azimuth = float(tags["GPS GPSImgDirection"].values[0].num) / float(
-                            tags["GPS GPSImgDirection"].values[0].den)
-                    else:
+                    try:
+                        if 'GPS GPSImgDirection' in tags:
+                            azimuth = float(tags["GPS GPSImgDirection"].values[0].num) / float(
+                                tags["GPS GPSImgDirection"].values[0].den)
+                        else:
+                            azimuth = ''
+                    except:
                         azimuth = ''
 
-                    if 'GPS GPSImgDirectionRef' in tags:
-                        north = str(tags["GPS GPSImgDirectionRef"].values)
-                    else:
+                    try:
+                        if 'GPS GPSImgDirectionRef' in tags:
+                            north = str(tags["GPS GPSImgDirectionRef"].values)
+                        else:
+                            north = ''
+                    except:
                         north = ''
 
-                    if 'Image Make' in tags:
-                        maker = tags['Image Make']
-                    else:
+                    try:
+                        if 'Image Make' in tags:
+                           maker = tags['Image Make']
+                        else:
+                            maker = ''
+                    except:
                         maker = ''
 
-                    if 'Image Model' in tags:
-                        model = tags['Image Model']
-                    else:
+                    try:
+                        if 'Image Model' in tags:
+                            model = tags['Image Model']
+                        else:
+                            model = ''
+                    except:
                         model = ''
 
-                    if 'Image ImageDescription' in tags:
-                        title = tags['Image ImageDescription']
-                    else:
+                    try:
+                        if 'Image ImageDescription' in tags:
+                            title = tags['Image ImageDescription']
+                        else:
+                            title = ''
+                    except:
                         title = ''
 
-                    if 'EXIF UserComment' in tags:
-                        user_comm = tags['EXIF UserComment'].printable
-                    else:
+                    try:
+                        if 'EXIF UserComment' in tags:
+                            user_comm = tags['EXIF UserComment'].printable
+                        else:
+                            user_comm = ''
+                    except:
                         user_comm = ''
 
                 if CHECK_MODULE == 'PIL' and not self.exifread_module:
@@ -688,18 +712,25 @@ def import_photos_task(self, task, wait_time):
                             time_ = dt2
                             timestamp = dt1.replace(':', '-') + 'T' + time_
 
-                        if 6 in a['GPSInfo']:
-                            if len(a['GPSInfo'][6]) > 1:
-                                mAltitude = float(a['GPSInfo'][6][0])
-                                mAltitudeDec = float(a['GPSInfo'][6][1])
-                                altitude = mAltitude / mAltitudeDec
-                        else:
+                        try:
+                            if 6 in a['GPSInfo']:
+                                if len(a['GPSInfo'][6]) > 1:
+                                    mAltitude = float(a['GPSInfo'][6][0])
+                                    mAltitudeDec = float(a['GPSInfo'][6][1])
+                                    altitude = mAltitude / mAltitudeDec
+                            else:
+                                altitude = ''
+                        except:
                             altitude = ''
 
-                        if 16 and 17 in a['GPSInfo']:
-                            north = str(a['GPSInfo'][16])
-                            azimuth = float(a['GPSInfo'][17][0]) / float(a['GPSInfo'][17][1])
-                        else:
+                        try:
+                            if 16 and 17 in a['GPSInfo']:
+                                north = str(a['GPSInfo'][16])
+                                azimuth = float(a['GPSInfo'][17][0]) / float(a['GPSInfo'][17][1])
+                            else:
+                                north = ''
+                                azimuth = ''
+                        except:
                             north = ''
                             azimuth = ''
 
@@ -707,8 +738,16 @@ def import_photos_task(self, task, wait_time):
                         model = ''
                         user_comm = ''
                         title = ''
+
+                if self.dlg.canvas_extent.isChecked():
+                    if not (self.canvas.extent().xMaximum() > lon > self.canvas.extent().xMinimum() \
+                            and self.canvas.extent().yMaximum() > lat > self.canvas.extent().yMinimum()):
+                        self.out_of_extent_photos = self.out_of_extent_photos + 1
+                        continue
+
                 self.lon.append(lon)
                 self.lat.append(lat)
+
                 self.truePhotosCount = self.truePhotosCount + 1
 
                 geo_info = {"type": "Feature",
diff --git a/code/PhotosViewer.py b/code/PhotosViewer.py
index 84b265b..3e6d75e 100644
--- a/code/PhotosViewer.py
+++ b/code/PhotosViewer.py
@@ -59,7 +59,7 @@ def __init__(self, selfwindow):
             self.leftClick.setIcon(QIcon(':/plugins/ImportPhotos/icons/arrowLeft.png'))
             self.leftClick.clicked.connect(self.selfwindow.leftClickButton)
             self.leftClick.setToolTip('Show previous photo')
-            self.leftClick.setStyleSheet("QPushButton{border: 0px;}")
+            self.leftClick.setStyleSheet("QPushButton{border: 0px; background: transparent;}")
             self.leftClick.setIconSize(QSize(size, size))
             self.leftClick.setFocusPolicy(Qt.NoFocus)
 
@@ -67,7 +67,7 @@ def __init__(self, selfwindow):
             self.rightClick.setIcon(QIcon(':/plugins/ImportPhotos/icons/arrowRight.png'))
             self.rightClick.clicked.connect(self.selfwindow.rightClickButton)
             self.rightClick.setToolTip('Show next photo')
-            self.rightClick.setStyleSheet("QPushButton{border: 0px;}")
+            self.rightClick.setStyleSheet("QPushButton{border: 0px; background: transparent;}")
             self.rightClick.setIconSize(QSize(size, size))
             self.rightClick.setFocusPolicy(Qt.NoFocus)
 
diff --git a/icons/photos.qml b/icons/photos.qml
index 61597b1..1155cc0 100644
--- a/icons/photos.qml
+++ b/icons/photos.qml
@@ -1,185 +1,185 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis minScale="1e+08" readOnly="0" simplifyLocal="1" labelsEnabled="0" styleCategories="AllStyleCategories" simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" maxScale="0" simplifyAlgorithm="0" simplifyDrawingHints="0" simplifyDrawingTol="1" version="3.4.2-Madeira">
+<qgis minScale="1e+08" version="3.8.0-Zanzibar" simplifyDrawingHints="0" simplifyDrawingTol="1" simplifyMaxScale="1" styleCategories="AllStyleCategories" readOnly="0" labelsEnabled="0" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" maxScale="0">
   <flags>
     <Identifiable>1</Identifiable>
     <Removable>1</Removable>
     <Searchable>1</Searchable>
   </flags>
-  <renderer-v2 forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+  <renderer-v2 type="singleSymbol" symbollevels="0" enableorderby="0" forceraster="0">
     <symbols>
-      <symbol clip_to_extent="1" name="0" alpha="1" type="marker">
+      <symbol type="marker" force_rhr="0" alpha="1" clip_to_extent="1" name="0">
         <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
-          <prop v="0" k="angle"/>
-          <prop v="97,97,97,255" k="color"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="square" k="name"/>
-          <prop v="0.00000000000000006,-10" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="0,0,0,0" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="Pixel" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="5.4" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="Pixel" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+          <prop k="angle" v="0"/>
+          <prop k="color" v="97,97,97,255"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="name" v="square"/>
+          <prop k="offset" v="0.00000000000000006,-10"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="0,0,0,0"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="Pixel"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="5.4"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="Pixel"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="angle" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" value="" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="angle">
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
-                <Option name="size" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="if( &quot;AZIMUTH&quot; !=0,5.4,0)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="size">
+                  <Option type="bool" value="true" name="active"/>
+                  <Option type="QString" value="if( &quot;AZIMUTH&quot; !=0,5.4,0)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
-          <prop v="0" k="angle"/>
-          <prop v="255,255,255,255" k="color"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="square" k="name"/>
-          <prop v="0,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="97,97,97,255" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="Pixel" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="14" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="Pixel" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+          <prop k="angle" v="0"/>
+          <prop k="color" v="255,255,255,255"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="name" v="square"/>
+          <prop k="offset" v="0,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="97,97,97,255"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="Pixel"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="14"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="Pixel"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="angle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" value="" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="angle">
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
-          <prop v="0" k="angle"/>
-          <prop v="97,97,97,255" k="color"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="triangle" k="name"/>
-          <prop v="-2,1" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="0,0,0,0" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="Pixel" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="5" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="Pixel" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+          <prop k="angle" v="0"/>
+          <prop k="color" v="97,97,97,255"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="name" v="triangle"/>
+          <prop k="offset" v="-2,1"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="0,0,0,0"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="Pixel"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="5"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="Pixel"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="angle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" value="" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="angle">
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
-          <prop v="0" k="angle"/>
-          <prop v="97,97,97,255" k="color"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="triangle" k="name"/>
-          <prop v="2,0" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="0,0,0,0" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="Pixel" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="7" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="Pixel" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+          <prop k="angle" v="0"/>
+          <prop k="color" v="97,97,97,255"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="name" v="triangle"/>
+          <prop k="offset" v="2,0"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="0,0,0,0"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="Pixel"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="7"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="Pixel"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="angle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" value="" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="angle">
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
         <layer class="SimpleMarker" pass="0" locked="0" enabled="1">
-          <prop v="0" k="angle"/>
-          <prop v="97,97,97,255" k="color"/>
-          <prop v="1" k="horizontal_anchor_point"/>
-          <prop v="bevel" k="joinstyle"/>
-          <prop v="square" k="name"/>
-          <prop v="-1,-3" k="offset"/>
-          <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-          <prop v="Pixel" k="offset_unit"/>
-          <prop v="0,0,0,0" k="outline_color"/>
-          <prop v="solid" k="outline_style"/>
-          <prop v="0" k="outline_width"/>
-          <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
-          <prop v="Pixel" k="outline_width_unit"/>
-          <prop v="diameter" k="scale_method"/>
-          <prop v="2" k="size"/>
-          <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-          <prop v="Pixel" k="size_unit"/>
-          <prop v="1" k="vertical_anchor_point"/>
+          <prop k="angle" v="0"/>
+          <prop k="color" v="97,97,97,255"/>
+          <prop k="horizontal_anchor_point" v="1"/>
+          <prop k="joinstyle" v="bevel"/>
+          <prop k="name" v="square"/>
+          <prop k="offset" v="-1,-3"/>
+          <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="offset_unit" v="Pixel"/>
+          <prop k="outline_color" v="0,0,0,0"/>
+          <prop k="outline_style" v="solid"/>
+          <prop k="outline_width" v="0"/>
+          <prop k="outline_width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="outline_width_unit" v="Pixel"/>
+          <prop k="scale_method" v="diameter"/>
+          <prop k="size" v="2"/>
+          <prop k="size_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+          <prop k="size_unit" v="Pixel"/>
+          <prop k="vertical_anchor_point" v="1"/>
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
-              <Option name="properties" type="Map">
-                <Option name="angle" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+              <Option type="QString" value="" name="name"/>
+              <Option type="Map" name="properties">
+                <Option type="Map" name="angle">
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="if(TO_REAL( &quot;Azimuth&quot; )=0,'',TO_REAL( &quot;Azimuth&quot; ))" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
-                <Option name="size" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="if( &quot;AZIMUTH&quot; !=0,2,0)" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option type="Map" name="size">
+                  <Option type="bool" value="false" name="active"/>
+                  <Option type="QString" value="if( &quot;AZIMUTH&quot; !=0,2,0)" name="expression"/>
+                  <Option type="int" value="3" name="type"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option type="QString" value="collection" name="type"/>
             </Option>
           </data_defined_properties>
         </layer>
@@ -197,22 +197,22 @@
   <blendMode>0</blendMode>
   <featureBlendMode>0</featureBlendMode>
   <layerOpacity>1</layerOpacity>
-  <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-    <DiagramCategory penAlpha="255" labelPlacementMethod="XHeight" penWidth="0" minimumSize="0" minScaleDenominator="0" barWidth="5" diagramOrientation="Up" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" sizeType="MM" height="15" scaleBasedVisibility="0" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" backgroundAlpha="255" rotationOffset="270" lineSizeType="MM" backgroundColor="#ffffff" maxScaleDenominator="1e+08" opacity="1" width="15" scaleDependency="Area">
-      <fontProperties description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0" style=""/>
-      <attribute label="" field="" color="#000000"/>
+  <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+    <DiagramCategory scaleBasedVisibility="0" backgroundColor="#ffffff" height="15" maxScaleDenominator="1e+08" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" scaleDependency="Area" diagramOrientation="Up" labelPlacementMethod="XHeight" sizeType="MM" width="15" minScaleDenominator="0" barWidth="5" backgroundAlpha="255" opacity="1" minimumSize="0" penAlpha="255" penColor="#000000" sizeScale="3x:0,0,0,0,0,0" penWidth="0" rotationOffset="270">
+      <fontProperties style="" description="MS Shell Dlg 2,8.25,-1,5,50,0,0,0,0,0"/>
+      <attribute field="" color="#000000" label=""/>
     </DiagramCategory>
   </SingleCategoryDiagramRenderer>
-  <DiagramLayerSettings dist="0" obstacle="0" zIndex="0" showAll="1" placement="0" priority="0" linePlacementFlags="18">
+  <DiagramLayerSettings linePlacementFlags="18" priority="0" zIndex="0" obstacle="0" showAll="1" placement="0" dist="0">
     <properties>
       <Option type="Map">
-        <Option value="" name="name" type="QString"/>
+        <Option type="QString" value="" name="name"/>
         <Option name="properties"/>
-        <Option value="collection" name="type" type="QString"/>
+        <Option type="QString" value="collection" name="type"/>
       </Option>
     </properties>
   </DiagramLayerSettings>
-  <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+  <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
     <activeChecks/>
     <checkConfiguration/>
   </geometryOptions>
@@ -280,14 +280,28 @@
         </config>
       </editWidget>
     </field>
-    <field name="Camera Maker">
+    <field name="Camera Mak">
       <editWidget type="TextEdit">
         <config>
           <Option/>
         </config>
       </editWidget>
     </field>
-    <field name="Camera Model">
+    <field name="Camera Mod">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="Title">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="Comment">
       <editWidget type="TextEdit">
         <config>
           <Option/>
@@ -301,84 +315,118 @@
         </config>
       </editWidget>
     </field>
+    <field name="RelPath">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
+    <field name="Timestamp">
+      <editWidget type="TextEdit">
+        <config>
+          <Option/>
+        </config>
+      </editWidget>
+    </field>
   </fieldConfiguration>
   <aliases>
-    <alias field="ID" index="0" name=""/>
-    <alias field="Name" index="1" name=""/>
-    <alias field="Date" index="2" name=""/>
-    <alias field="Time" index="3" name=""/>
-    <alias field="Lon" index="4" name=""/>
-    <alias field="Lat" index="5" name=""/>
-    <alias field="Altitude" index="6" name=""/>
-    <alias field="North" index="7" name=""/>
-    <alias field="Azimuth" index="8" name=""/>
-    <alias field="Camera Maker" index="9" name=""/>
-    <alias field="Camera Model" index="10" name=""/>
-    <alias field="Path" index="11" name=""/>
+    <alias field="ID" name="" index="0"/>
+    <alias field="Name" name="" index="1"/>
+    <alias field="Date" name="" index="2"/>
+    <alias field="Time" name="" index="3"/>
+    <alias field="Lon" name="" index="4"/>
+    <alias field="Lat" name="" index="5"/>
+    <alias field="Altitude" name="" index="6"/>
+    <alias field="North" name="" index="7"/>
+    <alias field="Azimuth" name="" index="8"/>
+    <alias field="Camera Mak" name="" index="9"/>
+    <alias field="Camera Mod" name="" index="10"/>
+    <alias field="Title" name="" index="11"/>
+    <alias field="Comment" name="" index="12"/>
+    <alias field="Path" name="" index="13"/>
+    <alias field="RelPath" name="" index="14"/>
+    <alias field="Timestamp" name="" index="15"/>
   </aliases>
   <excludeAttributesWMS/>
   <excludeAttributesWFS/>
   <defaults>
-    <default field="ID" expression="" applyOnUpdate="0"/>
-    <default field="Name" expression="" applyOnUpdate="0"/>
-    <default field="Date" expression="" applyOnUpdate="0"/>
-    <default field="Time" expression="" applyOnUpdate="0"/>
-    <default field="Lon" expression="" applyOnUpdate="0"/>
-    <default field="Lat" expression="" applyOnUpdate="0"/>
-    <default field="Altitude" expression="" applyOnUpdate="0"/>
-    <default field="North" expression="" applyOnUpdate="0"/>
-    <default field="Azimuth" expression="" applyOnUpdate="0"/>
-    <default field="Camera Maker" expression="" applyOnUpdate="0"/>
-    <default field="Camera Model" expression="" applyOnUpdate="0"/>
-    <default field="Path" expression="" applyOnUpdate="0"/>
+    <default field="ID" applyOnUpdate="0" expression=""/>
+    <default field="Name" applyOnUpdate="0" expression=""/>
+    <default field="Date" applyOnUpdate="0" expression=""/>
+    <default field="Time" applyOnUpdate="0" expression=""/>
+    <default field="Lon" applyOnUpdate="0" expression=""/>
+    <default field="Lat" applyOnUpdate="0" expression=""/>
+    <default field="Altitude" applyOnUpdate="0" expression=""/>
+    <default field="North" applyOnUpdate="0" expression=""/>
+    <default field="Azimuth" applyOnUpdate="0" expression=""/>
+    <default field="Camera Mak" applyOnUpdate="0" expression=""/>
+    <default field="Camera Mod" applyOnUpdate="0" expression=""/>
+    <default field="Title" applyOnUpdate="0" expression=""/>
+    <default field="Comment" applyOnUpdate="0" expression=""/>
+    <default field="Path" applyOnUpdate="0" expression=""/>
+    <default field="RelPath" applyOnUpdate="0" expression=""/>
+    <default field="Timestamp" applyOnUpdate="0" expression=""/>
   </defaults>
   <constraints>
-    <constraint constraints="0" notnull_strength="0" field="ID" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Name" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Date" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Time" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Lon" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Lat" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Altitude" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="North" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Azimuth" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Camera Maker" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Camera Model" unique_strength="0" exp_strength="0"/>
-    <constraint constraints="0" notnull_strength="0" field="Path" unique_strength="0" exp_strength="0"/>
+    <constraint field="ID" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Name" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Date" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Time" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Lon" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Lat" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Altitude" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="North" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Azimuth" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Camera Mak" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Camera Mod" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Title" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Comment" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Path" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="RelPath" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
+    <constraint field="Timestamp" notnull_strength="0" unique_strength="0" exp_strength="0" constraints="0"/>
   </constraints>
   <constraintExpressions>
-    <constraint field="ID" exp="" desc=""/>
-    <constraint field="Name" exp="" desc=""/>
-    <constraint field="Date" exp="" desc=""/>
-    <constraint field="Time" exp="" desc=""/>
-    <constraint field="Lon" exp="" desc=""/>
-    <constraint field="Lat" exp="" desc=""/>
-    <constraint field="Altitude" exp="" desc=""/>
-    <constraint field="North" exp="" desc=""/>
-    <constraint field="Azimuth" exp="" desc=""/>
-    <constraint field="Camera Maker" exp="" desc=""/>
-    <constraint field="Camera Model" exp="" desc=""/>
-    <constraint field="Path" exp="" desc=""/>
+    <constraint field="ID" desc="" exp=""/>
+    <constraint field="Name" desc="" exp=""/>
+    <constraint field="Date" desc="" exp=""/>
+    <constraint field="Time" desc="" exp=""/>
+    <constraint field="Lon" desc="" exp=""/>
+    <constraint field="Lat" desc="" exp=""/>
+    <constraint field="Altitude" desc="" exp=""/>
+    <constraint field="North" desc="" exp=""/>
+    <constraint field="Azimuth" desc="" exp=""/>
+    <constraint field="Camera Mak" desc="" exp=""/>
+    <constraint field="Camera Mod" desc="" exp=""/>
+    <constraint field="Title" desc="" exp=""/>
+    <constraint field="Comment" desc="" exp=""/>
+    <constraint field="Path" desc="" exp=""/>
+    <constraint field="RelPath" desc="" exp=""/>
+    <constraint field="Timestamp" desc="" exp=""/>
   </constraintExpressions>
   <expressionfields/>
   <attributeactions>
     <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
   </attributeactions>
-  <attributetableconfig sortOrder="1" sortExpression="&quot;Camera Model&quot;" actionWidgetStyle="dropDown">
+  <attributetableconfig sortOrder="1" actionWidgetStyle="dropDown" sortExpression="&quot;Camera Model&quot;">
     <columns>
-      <column hidden="0" width="-1" name="ID" type="field"/>
-      <column hidden="1" width="-1" type="actions"/>
-      <column hidden="0" width="-1" name="Name" type="field"/>
-      <column hidden="0" width="-1" name="Date" type="field"/>
-      <column hidden="0" width="-1" name="Time" type="field"/>
-      <column hidden="0" width="-1" name="Lon" type="field"/>
-      <column hidden="0" width="-1" name="Lat" type="field"/>
-      <column hidden="0" width="-1" name="Altitude" type="field"/>
-      <column hidden="0" width="-1" name="North" type="field"/>
-      <column hidden="0" width="-1" name="Azimuth" type="field"/>
-      <column hidden="0" width="-1" name="Camera Maker" type="field"/>
-      <column hidden="0" width="-1" name="Camera Model" type="field"/>
-      <column hidden="0" width="-1" name="Path" type="field"/>
+      <column type="field" name="ID" width="-1" hidden="0"/>
+      <column type="actions" width="-1" hidden="1"/>
+      <column type="field" name="Name" width="-1" hidden="0"/>
+      <column type="field" name="Date" width="-1" hidden="0"/>
+      <column type="field" name="Time" width="-1" hidden="0"/>
+      <column type="field" name="Lon" width="-1" hidden="0"/>
+      <column type="field" name="Lat" width="-1" hidden="0"/>
+      <column type="field" name="Altitude" width="-1" hidden="0"/>
+      <column type="field" name="North" width="-1" hidden="0"/>
+      <column type="field" name="Azimuth" width="-1" hidden="0"/>
+      <column type="field" name="Path" width="-1" hidden="0"/>
+      <column type="field" name="Camera Mak" width="-1" hidden="0"/>
+      <column type="field" name="Camera Mod" width="-1" hidden="0"/>
+      <column type="field" name="Title" width="-1" hidden="0"/>
+      <column type="field" name="Comment" width="-1" hidden="0"/>
+      <column type="field" name="RelPath" width="-1" hidden="0"/>
+      <column type="field" name="Timestamp" width="-1" hidden="0"/>
     </columns>
   </attributetableconfig>
   <conditionalstyles>
@@ -409,57 +457,69 @@ def my_form_open(dialog, layer, feature):
   <featformsuppress>0</featformsuppress>
   <editorlayout>generatedlayout</editorlayout>
   <editable>
-    <field editable="1" name="ALTITUDE"/>
-    <field editable="1" name="AZIMUTH"/>
-    <field editable="1" name="Altitude"/>
-    <field editable="1" name="Azimuth"/>
-    <field editable="1" name="CAMERA MAK"/>
-    <field editable="1" name="CAMERA MOD"/>
-    <field editable="1" name="Camera Maker"/>
-    <field editable="1" name="Camera Model"/>
-    <field editable="1" name="DATE"/>
-    <field editable="1" name="Date"/>
-    <field editable="1" name="ID"/>
-    <field editable="1" name="LAT"/>
-    <field editable="1" name="LON"/>
-    <field editable="1" name="Lat"/>
-    <field editable="1" name="Lon"/>
-    <field editable="1" name="NAME"/>
-    <field editable="1" name="NORTH"/>
-    <field editable="1" name="Name"/>
-    <field editable="1" name="North"/>
-    <field editable="1" name="PATH"/>
-    <field editable="1" name="Path"/>
-    <field editable="1" name="TIME"/>
-    <field editable="1" name="Time"/>
+    <field name="ALTITUDE" editable="1"/>
+    <field name="AZIMUTH" editable="1"/>
+    <field name="Altitude" editable="1"/>
+    <field name="Azimuth" editable="1"/>
+    <field name="CAMERA MAK" editable="1"/>
+    <field name="CAMERA MOD" editable="1"/>
+    <field name="Camera Mak" editable="1"/>
+    <field name="Camera Maker" editable="1"/>
+    <field name="Camera Mod" editable="1"/>
+    <field name="Camera Model" editable="1"/>
+    <field name="Comment" editable="1"/>
+    <field name="DATE" editable="1"/>
+    <field name="Date" editable="1"/>
+    <field name="ID" editable="1"/>
+    <field name="LAT" editable="1"/>
+    <field name="LON" editable="1"/>
+    <field name="Lat" editable="1"/>
+    <field name="Lon" editable="1"/>
+    <field name="NAME" editable="1"/>
+    <field name="NORTH" editable="1"/>
+    <field name="Name" editable="1"/>
+    <field name="North" editable="1"/>
+    <field name="PATH" editable="1"/>
+    <field name="Path" editable="1"/>
+    <field name="RelPath" editable="1"/>
+    <field name="TIME" editable="1"/>
+    <field name="Time" editable="1"/>
+    <field name="Timestamp" editable="1"/>
+    <field name="Title" editable="1"/>
   </editable>
   <labelOnTop>
-    <field name="ALTITUDE" labelOnTop="0"/>
-    <field name="AZIMUTH" labelOnTop="0"/>
-    <field name="Altitude" labelOnTop="0"/>
-    <field name="Azimuth" labelOnTop="0"/>
-    <field name="CAMERA MAK" labelOnTop="0"/>
-    <field name="CAMERA MOD" labelOnTop="0"/>
-    <field name="Camera Maker" labelOnTop="0"/>
-    <field name="Camera Model" labelOnTop="0"/>
-    <field name="DATE" labelOnTop="0"/>
-    <field name="Date" labelOnTop="0"/>
-    <field name="ID" labelOnTop="0"/>
-    <field name="LAT" labelOnTop="0"/>
-    <field name="LON" labelOnTop="0"/>
-    <field name="Lat" labelOnTop="0"/>
-    <field name="Lon" labelOnTop="0"/>
-    <field name="NAME" labelOnTop="0"/>
-    <field name="NORTH" labelOnTop="0"/>
-    <field name="Name" labelOnTop="0"/>
-    <field name="North" labelOnTop="0"/>
-    <field name="PATH" labelOnTop="0"/>
-    <field name="Path" labelOnTop="0"/>
-    <field name="TIME" labelOnTop="0"/>
-    <field name="Time" labelOnTop="0"/>
+    <field labelOnTop="0" name="ALTITUDE"/>
+    <field labelOnTop="0" name="AZIMUTH"/>
+    <field labelOnTop="0" name="Altitude"/>
+    <field labelOnTop="0" name="Azimuth"/>
+    <field labelOnTop="0" name="CAMERA MAK"/>
+    <field labelOnTop="0" name="CAMERA MOD"/>
+    <field labelOnTop="0" name="Camera Mak"/>
+    <field labelOnTop="0" name="Camera Maker"/>
+    <field labelOnTop="0" name="Camera Mod"/>
+    <field labelOnTop="0" name="Camera Model"/>
+    <field labelOnTop="0" name="Comment"/>
+    <field labelOnTop="0" name="DATE"/>
+    <field labelOnTop="0" name="Date"/>
+    <field labelOnTop="0" name="ID"/>
+    <field labelOnTop="0" name="LAT"/>
+    <field labelOnTop="0" name="LON"/>
+    <field labelOnTop="0" name="Lat"/>
+    <field labelOnTop="0" name="Lon"/>
+    <field labelOnTop="0" name="NAME"/>
+    <field labelOnTop="0" name="NORTH"/>
+    <field labelOnTop="0" name="Name"/>
+    <field labelOnTop="0" name="North"/>
+    <field labelOnTop="0" name="PATH"/>
+    <field labelOnTop="0" name="Path"/>
+    <field labelOnTop="0" name="RelPath"/>
+    <field labelOnTop="0" name="TIME"/>
+    <field labelOnTop="0" name="Time"/>
+    <field labelOnTop="0" name="Timestamp"/>
+    <field labelOnTop="0" name="Title"/>
   </labelOnTop>
   <widgets/>
-  <previewExpression>ID</previewExpression>
+  <previewExpression>Name</previewExpression>
   <mapTip></mapTip>
   <layerGeometryType>0</layerGeometryType>
 </qgis>
diff --git a/metadata.txt b/metadata.txt
index f2ac2d7..bedaa94 100644
--- a/metadata.txt
+++ b/metadata.txt
@@ -11,7 +11,7 @@ name=ImportPhotos
 qgisMinimumVersion=2.99
 qgisMaximumVersion=3.99
 description=Import Photos
-version=2.2.1
+version=2.2.2
 author=Marios S. Kyriakou, George A. Christou, Panayiotis S. Kolios, KIOS Research and Innovation Center of Excellence (KIOS CoE)
 email=mariosmsk@gmail.com, george.a.christou@gmail.com, panayiotis.kolios@gmail.com
 
@@ -23,7 +23,11 @@ repository=https://github.com/KIOS-Research/ImportPhotos/
 
 # Recommended items:
 # Uncomment the following line and add your changelog:
-changelog=2019-07-16  ImportPhotos 2.2.1:
+changelog=2019-07-18  ImportPhotos 2.2.2:
+			Fix transparent left,right buttons for all themes
+			Fix bug with null parameters
+			Add option to import photos in canvas extent
+	  2019-07-16  ImportPhotos 2.2.1:
 			Fix tab Filters works without Opencv
       2019-07-15  ImportPhotos 2.2:
 			Add tabs options File, Filters, Opencv, Bands
diff --git a/ui/impphotos.ui b/ui/impphotos.ui
index 9c81509..382d13b 100644
--- a/ui/impphotos.ui
+++ b/ui/impphotos.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>423</width>
-    <height>227</height>
+    <width>449</width>
+    <height>258</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -31,8 +31,8 @@
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout">
-     <item row="1" column="2">
-      <spacer name="horizontalSpacer_2">
+     <item row="3" column="2">
+      <spacer name="horizontalSpacer_10">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -47,8 +47,8 @@
        </property>
       </spacer>
      </item>
-     <item row="1" column="0">
-      <spacer name="horizontalSpacer">
+     <item row="5" column="4">
+      <spacer name="horizontalSpacer_6">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -63,8 +63,8 @@
        </property>
       </spacer>
      </item>
-     <item row="3" column="2">
-      <spacer name="horizontalSpacer_5">
+     <item row="1" column="4">
+      <spacer name="horizontalSpacer_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -79,8 +79,8 @@
        </property>
       </spacer>
      </item>
-     <item row="1" column="4">
-      <spacer name="horizontalSpacer_3">
+     <item row="5" column="2">
+      <spacer name="horizontalSpacer_5">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -95,7 +95,37 @@
        </property>
       </spacer>
      </item>
-     <item row="5" column="2">
+     <item row="8" column="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <spacer name="horizontalSpacer_8">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="ok">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>OK</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="7" column="2">
       <spacer name="horizontalSpacer_7">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -108,6 +138,29 @@
        </property>
       </spacer>
      </item>
+     <item row="5" column="0">
+      <spacer name="horizontalSpacer_9">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Preferred</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Load style (optional)</string>
+       </property>
+      </widget>
+     </item>
      <item row="2" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
@@ -115,8 +168,8 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <spacer name="horizontalSpacer_4">
+     <item row="1" column="0">
+      <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -131,15 +184,40 @@
        </property>
       </spacer>
      </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Load style (optional)</string>
+     <item row="3" column="4">
+      <spacer name="horizontalSpacer_11">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-      </widget>
+       <property name="sizeType">
+        <enum>QSizePolicy::Preferred</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
      </item>
-     <item row="3" column="4">
-      <spacer name="horizontalSpacer_6">
+     <item row="1" column="2">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Preferred</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="3" column="0">
+      <spacer name="horizontalSpacer_4">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
@@ -161,36 +239,6 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="2">
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <spacer name="horizontalSpacer_8">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="ok">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>OK</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
      <item row="0" column="2">
       <widget class="QLineEdit" name="imp">
        <property name="sizePolicy">
@@ -263,7 +311,17 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="4">
+     <item row="6" column="2">
+      <widget class="QCheckBox" name="canvas_extent">
+       <property name="layoutDirection">
+        <enum>Qt::LeftToRight</enum>
+       </property>
+       <property name="text">
+        <string>Only import photos in canvas extent</string>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="4">
       <widget class="QPushButton" name="closebutton">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Expanding">