diff --git a/app/build.gradle b/app/build.gradle
index 54a67a86..40a5c152 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,7 +56,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:540c8c39ba'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:d4b6547969'
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.klinkerapps:android-smsmms:5.2.6'
     implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a'
diff --git a/app/src/main/res/drawable-hdpi/ic_pin.png b/app/src/main/res/drawable-hdpi/ic_pin.png
deleted file mode 100644
index 0f32c2eb..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_pin.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_pin.png b/app/src/main/res/drawable-mdpi/ic_pin.png
deleted file mode 100644
index eb56bb8a..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_pin.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pin.png b/app/src/main/res/drawable-xhdpi/ic_pin.png
deleted file mode 100644
index b97d8ac9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_pin.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pin.png b/app/src/main/res/drawable-xxhdpi/ic_pin.png
deleted file mode 100644
index 4a1a3dd2..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_pin.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pin.png b/app/src/main/res/drawable-xxxhdpi/ic_pin.png
deleted file mode 100644
index c516e08f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_pin.png and /dev/null differ
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index cb1694b1..6ec9a1ae 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Odesílatel nepodporuje odpovědi</string>
     <string name="draft">Návrh</string>
     <string name="sending">Odesílá se…</string>
-    <string name="export_messages">Export zpráv</string>
-    <string name="import_messages">Import zpráv</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 19068d08..96447342 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Afsender understøtter ikke svar</string>
     <string name="draft">Udkast</string>
     <string name="sending">Sender…</string>
-    <string name="export_messages">Eksporter beskeder</string>
-    <string name="import_messages">Importer beskeder</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b6d45b31..c8f3d972 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Der Absender unterstützt keine Antworten.</string>
     <string name="draft">Entwurf</string>
     <string name="sending">Sende…</string>
-    <string name="export_messages">Export messages</string>
-    <string name="import_messages">Import messages</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 8472aaa7..df039501 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Ο αποστολέας δεν υποστηρίζει απαντήσεις</string>
     <string name="draft">Πρόχειρο</string>
     <string name="sending">Γίνεται αποστολή…</string>
-    <string name="export_messages">Εξαγωγή μηνυμάτων</string>
-    <string name="import_messages">Εισαγωγή μηνυμάτων</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5f135e98..afda46f8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Sender doesn\'t support replies</string>
     <string name="draft">Draft</string>
     <string name="sending">Sending…</string>
-    <string name="export_messages">Export messages</string>
-    <string name="import_messages">Import messages</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 7d6203f8..b80ba899 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Lähettäjä ei tue vastauksia</string>
     <string name="draft">Luonnos</string>
     <string name="sending">Lähetetään…</string>
-    <string name="export_messages">Export messages</string>
-    <string name="import_messages">Import messages</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index bc36ed18..6ce5983b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">L\'expéditeur n\'accepte pas les réponses</string>
     <string name="draft">Brouillon</string>
     <string name="sending">Envoi en cours…</string>
-    <string name="export_messages">Export de messages</string>
-    <string name="import_messages">Import de messages</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index a0c42e28..781dcd6c 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Sender doesn\'t support replies</string>
     <string name="draft">Draft</string>
     <string name="sending">Sending…</string>
-    <string name="export_messages">Export messages</string>
-    <string name="import_messages">Import messages</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 84e21e67..8d75032c 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Sender doesn\'t support replies</string>
     <string name="draft">Draft</string>
     <string name="sending">Sending…</string>
-    <string name="export_messages">Export messages</string>
-    <string name="import_messages">Import messages</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index aea63fd7..04aae0e3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Il mittente non accetta risposte</string>
     <string name="draft">Bozza</string>
     <string name="sending">Invio…</string>
-    <string name="export_messages">Export messages</string>
-    <string name="import_messages">Import messages</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b890ce8e..9f43a65d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -15,8 +15,6 @@
     <string name="no_reply_support">Sender doesn\'t support replies</string>
     <string name="draft">Draft</string>
     <string name="sending">Sending…</string>
-    <string name="export_messages">Export messages</string>
-    <string name="import_messages">Import messages</string>
     <string name="pin_conversation">Pin to the top</string>
     <string name="unpin_conversation">Unpin</string>
 
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 924233db..312241e0 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -15,8 +15,8 @@
     <string name="no_reply_support">Odosielateľ nepodporuje odpovede</string>
     <string name="draft">Koncept</string>
     <string name="sending">Odosiela sa…</string>
-    <string name="pin_conversation">Pin to the top</string>
-    <string name="unpin_conversation">Unpin</string>
+    <string name="pin_conversation">Pripnúť na vrch</string>
+    <string name="unpin_conversation">Odopnúť</string>
 
     <!-- New conversation -->
     <string name="new_conversation">Nová konverzácia</string>