diff --git a/app/build.gradle b/app/build.gradle
index e43a3826a..7fc8cafaf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,7 +77,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:9c6dda3926'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:f5664f6db4'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
index e9807a077..d3f8aeb26 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
@@ -28,6 +28,7 @@ import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.signature.ObjectKey
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
+import com.simplemobiletools.commons.views.MySquareImageView
 import com.simplemobiletools.gallery.pro.R
 import com.simplemobiletools.gallery.pro.activities.SettingsActivity
 import com.simplemobiletools.gallery.pro.asynctasks.GetMediaAsynctask
@@ -36,7 +37,6 @@ import com.simplemobiletools.gallery.pro.helpers.*
 import com.simplemobiletools.gallery.pro.interfaces.*
 import com.simplemobiletools.gallery.pro.models.*
 import com.simplemobiletools.gallery.pro.svg.SvgSoftwareLayerSetter
-import com.simplemobiletools.gallery.pro.views.MySquareImageView
 import com.squareup.picasso.Picasso
 import pl.droidsonroids.gif.GifDrawable
 import java.io.File
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MySquareImageView.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MySquareImageView.kt
deleted file mode 100644
index 24cde1c2a..000000000
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/MySquareImageView.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.simplemobiletools.gallery.pro.views
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.ImageView
-
-class MySquareImageView : ImageView {
-    var isHorizontalScrolling = false
-
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
-
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        val spec = if (isHorizontalScrolling) heightMeasureSpec else widthMeasureSpec
-        super.onMeasure(spec, spec)
-    }
-}
diff --git a/app/src/main/res/layout/activity_widget_config.xml b/app/src/main/res/layout/activity_widget_config.xml
index f37abb989..559bd14ff 100644
--- a/app/src/main/res/layout/activity_widget_config.xml
+++ b/app/src/main/res/layout/activity_widget_config.xml
@@ -57,7 +57,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/folder_picker_holder">
 
-        <com.simplemobiletools.gallery.pro.views.MySquareImageView
+        <com.simplemobiletools.commons.views.MySquareImageView
             android:id="@+id/config_image"
             android:layout_width="@dimen/widget_initial_size"
             android:layout_height="@dimen/widget_initial_size"
diff --git a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml
index b52104432..cc98eb2f0 100644
--- a/app/src/main/res/layout/directory_item_grid_rounded_corners.xml
+++ b/app/src/main/res/layout/directory_item_grid_rounded_corners.xml
@@ -9,7 +9,7 @@
     android:focusable="true"
     android:paddingTop="@dimen/medium_margin">
 
-    <com.simplemobiletools.gallery.pro.views.MySquareImageView
+    <com.simplemobiletools.commons.views.MySquareImageView
         android:id="@+id/dir_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/directory_item_grid_square.xml b/app/src/main/res/layout/directory_item_grid_square.xml
index fef3c5e2d..37ebc9311 100644
--- a/app/src/main/res/layout/directory_item_grid_square.xml
+++ b/app/src/main/res/layout/directory_item_grid_square.xml
@@ -8,7 +8,7 @@
     android:focusable="true"
     android:padding="1px">
 
-    <com.simplemobiletools.gallery.pro.views.MySquareImageView
+    <com.simplemobiletools.commons.views.MySquareImageView
         android:id="@+id/dir_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/directory_item_list.xml b/app/src/main/res/layout/directory_item_list.xml
index bd29497ec..d038b95bb 100644
--- a/app/src/main/res/layout/directory_item_list.xml
+++ b/app/src/main/res/layout/directory_item_list.xml
@@ -11,7 +11,7 @@
     android:paddingTop="@dimen/small_margin"
     android:paddingBottom="@dimen/small_margin">
 
-    <com.simplemobiletools.gallery.pro.views.MySquareImageView
+    <com.simplemobiletools.commons.views.MySquareImageView
         android:id="@+id/dir_thumbnail"
         android:layout_width="@dimen/list_view_folder_thumbnail_size"
         android:layout_height="@dimen/list_view_folder_thumbnail_size" />
diff --git a/app/src/main/res/layout/photo_item_grid.xml b/app/src/main/res/layout/photo_item_grid.xml
index 5c8e348cb..63a8fd64a 100644
--- a/app/src/main/res/layout/photo_item_grid.xml
+++ b/app/src/main/res/layout/photo_item_grid.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <com.simplemobiletools.gallery.pro.views.MySquareImageView
+    <com.simplemobiletools.commons.views.MySquareImageView
         android:id="@+id/medium_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/photo_item_list.xml b/app/src/main/res/layout/photo_item_list.xml
index dca1dbee2..9a80129a6 100644
--- a/app/src/main/res/layout/photo_item_list.xml
+++ b/app/src/main/res/layout/photo_item_list.xml
@@ -12,7 +12,7 @@
     android:paddingTop="@dimen/small_margin"
     android:paddingBottom="@dimen/small_margin">
 
-    <com.simplemobiletools.gallery.pro.views.MySquareImageView
+    <com.simplemobiletools.commons.views.MySquareImageView
         android:id="@+id/medium_thumbnail"
         android:layout_width="@dimen/list_view_folder_thumbnail_size"
         android:layout_height="@dimen/list_view_folder_thumbnail_size" />
diff --git a/app/src/main/res/layout/video_item_grid.xml b/app/src/main/res/layout/video_item_grid.xml
index 4e56fd2fa..31139865d 100644
--- a/app/src/main/res/layout/video_item_grid.xml
+++ b/app/src/main/res/layout/video_item_grid.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <com.simplemobiletools.gallery.pro.views.MySquareImageView
+    <com.simplemobiletools.commons.views.MySquareImageView
         android:id="@+id/medium_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/video_item_list.xml b/app/src/main/res/layout/video_item_list.xml
index ad4524388..b864b835b 100644
--- a/app/src/main/res/layout/video_item_list.xml
+++ b/app/src/main/res/layout/video_item_list.xml
@@ -12,7 +12,7 @@
     android:paddingTop="@dimen/small_margin"
     android:paddingBottom="@dimen/small_margin">
 
-    <com.simplemobiletools.gallery.pro.views.MySquareImageView
+    <com.simplemobiletools.commons.views.MySquareImageView
         android:id="@+id/medium_thumbnail"
         android:layout_width="@dimen/list_view_folder_thumbnail_size"
         android:layout_height="@dimen/list_view_folder_thumbnail_size" />