diff --git a/app/build.gradle b/app/build.gradle
index 330d860cf..c2e001ae1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         targetSdkVersion 27
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        versionCode 31
-        versionName "1.1.1"
+        versionCode 34
+        versionName "1.2.0"
 
         flavorDimensions "default"
 
diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml
index 385d98069..0c03c5867 100644
--- a/app/src/main/res/drawable/ic_logo.xml
+++ b/app/src/main/res/drawable/ic_logo.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk application
+  ~
+  ~ @author Mario Danic
+  ~ Copyright (C) 2018 Mario Danic
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
     android:height="16dp"
diff --git a/app/src/main/res/drawable/ic_logo_black_24dp.xml b/app/src/main/res/drawable/ic_logo_black_24dp.xml
new file mode 100644
index 000000000..ca261a2c9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_logo_black_24dp.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk application
+  ~
+  ~ @author Mario Danic
+  ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M7.9992,0.999 A6.9994,6.9993,0,0,0,1,7.9986 A6.9994,6.9993,0,0,0,7.9992,14.998
+A6.9994,6.9993,0,0,0,11.63,13.974 C12.4902,14.3158,14.4171,15.33,14.8757,14.8919
+C15.3549,14.4343,14.3131,12.2803,14.0633,11.4799
+A6.9994,6.9993,0,0,0,14.9983,7.9985 A6.9994,6.9993,0,0,0,7.9992,0.9992 Z
+M8,3.6601 A4.3401,4.34,0,0,1,12.34,8.0002 A4.3401,4.34,0,0,1,8,12.34
+A4.3401,4.34,0,0,1,3.66,8.0002 A4.3401,4.34,0,0,1,8,3.6601 Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_navigation.xml b/app/src/main/res/menu/menu_navigation.xml
index d65debe1a..c3788911e 100644
--- a/app/src/main/res/menu/menu_navigation.xml
+++ b/app/src/main/res/menu/menu_navigation.xml
@@ -4,8 +4,8 @@
     <item
         android:id="@+id/navigation_calls"
         android:checked="true"
-        android:icon="@drawable/ic_videocam_black_24dp"
-        android:title="@string/nc_bottom_navigation_title_calls"/>
+        android:icon="@drawable/ic_logo"
+        android:title="@string/nc_bottom_navigation_title_conversations"/>
 
     <item
         android:id="@+id/navigation_contacts"
diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index 76a30898b..ff8aceef8 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Calls</string>
+    <string name="nc_bottom_navigation_title_conversations">Calls</string>
     <string name="nc_bottom_navigation_title_contacts">Contacts</string>
     <string name="nc_bottom_navigation_title_settings">Settings</string>
 
diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-b+es+419/strings.xml
+++ b/app/src/main/res/values-b+es+419/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index e63438df2..66c7e93d0 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Anrufe</string>
+    <string name="nc_bottom_navigation_title_conversations">Anrufe</string>
     <string name="nc_bottom_navigation_title_contacts">Kontakte</string>
     <string name="nc_bottom_navigation_title_settings">Einstellungen</string>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8c06ef436..2ba143935 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Anrufe</string>
+    <string name="nc_bottom_navigation_title_conversations">Anrufe</string>
     <string name="nc_bottom_navigation_title_contacts">Kontakte</string>
     <string name="nc_bottom_navigation_title_settings">Einstellungen</string>
 
diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rCL/strings.xml
+++ b/app/src/main/res/values-es-rCL/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rCO/strings.xml
+++ b/app/src/main/res/values-es-rCO/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rCR/strings.xml b/app/src/main/res/values-es-rCR/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rCR/strings.xml
+++ b/app/src/main/res/values-es-rCR/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rDO/strings.xml
+++ b/app/src/main/res/values-es-rDO/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rGT/strings.xml b/app/src/main/res/values-es-rGT/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rGT/strings.xml
+++ b/app/src/main/res/values-es-rGT/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rHN/strings.xml b/app/src/main/res/values-es-rHN/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rHN/strings.xml
+++ b/app/src/main/res/values-es-rHN/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 7d440275f..372ac3598 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rNI/strings.xml b/app/src/main/res/values-es-rNI/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rNI/strings.xml
+++ b/app/src/main/res/values-es-rNI/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rPA/strings.xml b/app/src/main/res/values-es-rPA/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rPA/strings.xml
+++ b/app/src/main/res/values-es-rPA/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rPE/strings.xml b/app/src/main/res/values-es-rPE/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rPE/strings.xml
+++ b/app/src/main/res/values-es-rPE/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rPR/strings.xml b/app/src/main/res/values-es-rPR/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rPR/strings.xml
+++ b/app/src/main/res/values-es-rPR/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rPY/strings.xml b/app/src/main/res/values-es-rPY/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rPY/strings.xml
+++ b/app/src/main/res/values-es-rPY/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rSV/strings.xml
+++ b/app/src/main/res/values-es-rSV/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es-rUY/strings.xml b/app/src/main/res/values-es-rUY/strings.xml
index 1e1215836..2a5ad436f 100644
--- a/app/src/main/res/values-es-rUY/strings.xml
+++ b/app/src/main/res/values-es-rUY/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuraciones</string>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 4acfdf2db..a4b82c4c1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Llamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Llamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contactos</string>
     <string name="nc_bottom_navigation_title_settings">Configuración</string>
 
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index acba8d276..2bd133bc3 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Puhelut</string>
+    <string name="nc_bottom_navigation_title_conversations">Puhelut</string>
     <string name="nc_bottom_navigation_title_contacts">Yhteystiedot</string>
     <string name="nc_bottom_navigation_title_settings">Asetukset</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 79e600a84..3892f1ead 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Appels</string>
+    <string name="nc_bottom_navigation_title_conversations">Appels</string>
     <string name="nc_bottom_navigation_title_contacts">Contacts</string>
     <string name="nc_bottom_navigation_title_settings">Paramètres</string>
 
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 64eb9bf62..c85d45563 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Hívások</string>
+    <string name="nc_bottom_navigation_title_conversations">Hívások</string>
     <string name="nc_bottom_navigation_title_contacts">Kapcsolatok</string>
     <string name="nc_bottom_navigation_title_settings">Beállítások</string>
 
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 5be7577c6..28efd69e0 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Samtöl</string>
+    <string name="nc_bottom_navigation_title_conversations">Samtöl</string>
     <string name="nc_bottom_navigation_title_contacts">Tengiliðir</string>
     <string name="nc_bottom_navigation_title_settings">Stillingar</string>
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a21280555..bdbe05b1b 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Chiamate</string>
+    <string name="nc_bottom_navigation_title_conversations">Chiamate</string>
     <string name="nc_bottom_navigation_title_contacts">Contatti</string>
     <string name="nc_bottom_navigation_title_settings">Impostazioni</string>
 
diff --git a/app/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml
index f5b289b1d..982bf9c41 100644
--- a/app/src/main/res/values-ka-rGE/strings.xml
+++ b/app/src/main/res/values-ka-rGE/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">ზარები</string>
+    <string name="nc_bottom_navigation_title_conversations">ზარები</string>
     <string name="nc_bottom_navigation_title_contacts">კონტაქტები</string>
     <string name="nc_bottom_navigation_title_settings">პარამეტრები</string>
 
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 06c8164cb..bac1b22e7 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">통화</string>
+    <string name="nc_bottom_navigation_title_conversations">통화</string>
     <string name="nc_bottom_navigation_title_contacts">연락처</string>
     <string name="nc_bottom_navigation_title_settings">설정</string>
 
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 358031078..d77c7e2a4 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Samtaler</string>
+    <string name="nc_bottom_navigation_title_conversations">Samtaler</string>
     <string name="nc_bottom_navigation_title_contacts">Kontakter</string>
     <string name="nc_bottom_navigation_title_settings">Innstillinger</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 79a7a6922..01ccdef71 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Oproepen</string>
+    <string name="nc_bottom_navigation_title_conversations">Oproepen</string>
     <string name="nc_bottom_navigation_title_contacts">Contactpersonen</string>
     <string name="nc_bottom_navigation_title_settings">Instellingen</string>
 
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a98639230..6fe471fb2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Połączenia</string>
+    <string name="nc_bottom_navigation_title_conversations">Połączenia</string>
     <string name="nc_bottom_navigation_title_contacts">Kontakty</string>
     <string name="nc_bottom_navigation_title_settings">Ustawienia</string>
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5fb6dfd72..017f6e534 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Chamadas</string>
+    <string name="nc_bottom_navigation_title_conversations">Chamadas</string>
     <string name="nc_bottom_navigation_title_contacts">Contatos</string>
     <string name="nc_bottom_navigation_title_settings">Configurações</string>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 79b62298f..a0f6f79bb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Вызовы</string>
+    <string name="nc_bottom_navigation_title_conversations">Вызовы</string>
     <string name="nc_bottom_navigation_title_contacts">Контакты</string>
     <string name="nc_bottom_navigation_title_settings">Параметры</string>
 
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index c5f7fdb82..a6f2c71e8 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Hovory</string>
+    <string name="nc_bottom_navigation_title_conversations">Hovory</string>
     <string name="nc_bottom_navigation_title_contacts">Kontakty</string>
     <string name="nc_bottom_navigation_title_settings">Nastavenia</string>
 
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 38094c151..96dcc6c5a 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Thirrjet</string>
+    <string name="nc_bottom_navigation_title_conversations">Thirrjet</string>
     <string name="nc_bottom_navigation_title_contacts">Kontaktet</string>
     <string name="nc_bottom_navigation_title_settings">Rregullimet</string>
 
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 9e10ef5fe..2c0cb8419 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Позиви</string>
+    <string name="nc_bottom_navigation_title_conversations">Позиви</string>
     <string name="nc_bottom_navigation_title_contacts">Контакти</string>
     <string name="nc_bottom_navigation_title_settings">Поставке</string>
 
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a075b2ffe..f2ae5c253 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Samtal</string>
+    <string name="nc_bottom_navigation_title_conversations">Samtal</string>
     <string name="nc_bottom_navigation_title_contacts">Kontakter</string>
     <string name="nc_bottom_navigation_title_settings">Inställningar</string>
 
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 44a3bde61..48a15fbd8 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Çağrılar</string>
+    <string name="nc_bottom_navigation_title_conversations">Çağrılar</string>
     <string name="nc_bottom_navigation_title_contacts">Kişiler</string>
     <string name="nc_bottom_navigation_title_settings">Ayarlar</string>
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 98382c82d..f27c1df69 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">呼叫</string>
+    <string name="nc_bottom_navigation_title_conversations">呼叫</string>
     <string name="nc_bottom_navigation_title_contacts">联系人</string>
     <string name="nc_bottom_navigation_title_settings">设置</string>
 
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 65f3742f7..e917d5d14 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">通話</string>
+    <string name="nc_bottom_navigation_title_conversations">通話</string>
     <string name="nc_bottom_navigation_title_contacts">聯絡人</string>
     <string name="nc_bottom_navigation_title_settings">設定</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 32fd153d3..58fd28da9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Bottom Navigation -->
-    <string name="nc_bottom_navigation_title_calls">Calls</string>
+    <string name="nc_bottom_navigation_title_conversations">Conversations</string>
     <string name="nc_bottom_navigation_title_contacts">Contacts</string>
     <string name="nc_bottom_navigation_title_settings">Settings</string>
 
@@ -75,16 +75,16 @@
 
     <!-- Room menu -->
     <string name="nc_what">What would you like to do today?</string>
-    <string name="nc_leave">Leave call</string>
-    <string name="nc_rename">Rename call</string>
+    <string name="nc_leave">Leave conversation</string>
+    <string name="nc_rename">Rename conversation</string>
     <string name="nc_set_password">Set a password</string>
     <string name="nc_change_password">Change a password</string>
     <string name="nc_clear_password">Clear password</string>
     <string name="nc_share_link">Share link</string>
     <string name="nc_share_link_via">Share link via</string>
-    <string name="nc_make_call_public">Make call public</string>
-    <string name="nc_make_call_private">Make call private</string>
-    <string name="nc_delete_call">Delete call</string>
+    <string name="nc_make_call_public">Make conversation public</string>
+    <string name="nc_make_call_private">Make conversation private</string>
+    <string name="nc_delete_call">Delete conversation</string>
     <string name="nc_new_conversation">Start a new conversation</string>
     <string name="nc_join_via_link">Join via link</string>
     <string name="nc_join_via_web">Join via web</string>
@@ -107,9 +107,9 @@
     <!-- Call -->
     <string name="nc_incoming_call">Incoming call</string>
     <string name="nc_nick_guest">Guest</string>
-    <string name="nc_public_call">NEW PUBLIC CALL</string>
-    <string name="nc_public_call_explanation">Public calls let you invite people from outside through a specially
-        crafted link.</string>
+    <string name="nc_public_call">New public conversation</string>
+    <string name="nc_public_call_explanation">Public conversations let you invite people from outside through a
+        specially crafted link.</string>
 
     <!-- Notification channels -->
     <string name="nc_notification_channel">%1$s on %2$s notification channel</string>
@@ -120,8 +120,8 @@
 
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">Sorry, something went wrong!</string>
-    <string name="nc_failed_signaling_settings">Target server does not support joining public rooms via mobile phones.
-        You may attempt to join the call via web browser.</string>
+    <string name="nc_failed_signaling_settings">Target server does not support joining public conversations via mobile
+        phones. You may attempt to join the conversation via web browser.</string>
     <string name="nc_all_ok_operation">OK, all done!</string>
     <string name="nc_ok">OK</string>
     <string name="nc_call_name">Conversation name</string>