diff --git a/build.gradle b/build.gradle
index 15472664..71dfc288 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,12 +12,28 @@ ext {
     hbci4jVersion = '3.1.37'
 
 
+    /*      Android     */
+
     androidUtilsVersion = '1.1.0'
 
     clansFloatingActionButtonVersion = '1.6.4'
 
+    multiDexVersion = "2.0.1"
+
+    appCompatVersion = "1.1.0"
+
+    constraintLayoutVersion = "1.1.3"
+
+    materialComponentsVersion = "1.1.0"
+
+
+    /*      JavaFX      */
+
     javaFxUtilsVersion = '1.0.3'
 
+
+    /*      Test        */
+
     junitVersion = '4.12'
     assertJVersion = '3.12.2'
 
diff --git a/fints4javaAndroidApp/build.gradle b/fints4javaAndroidApp/build.gradle
index 6f1ef512..d4d0a70c 100644
--- a/fints4javaAndroidApp/build.gradle
+++ b/fints4javaAndroidApp/build.gradle
@@ -13,7 +13,9 @@ android {
         versionCode appVersionCode
         versionName appVersionName
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -66,12 +68,19 @@ dependencies {
 
     implementation "org.slf4j:slf4j-android:$slf4JVersion"
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'android.arch.navigation:navigation-fragment:1.0.0'
-    implementation 'android.arch.navigation:navigation-ui:1.0.0'
-    implementation 'android.arch.lifecycle:extensions:1.1.1'
-    implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0'
-    implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0'
+
+    implementation "androidx.multidex:multidex:$multiDexVersion"
+
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
+    implementation "androidx.recyclerview:recyclerview:$appCompatVersion"
+    implementation "androidx.annotation:annotation:$appCompatVersion"
+    implementation "com.google.android.material:material:$materialComponentsVersion"
+    implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
+
+
+    implementation 'androidx.navigation:navigation-fragment:2.0.0-rc02'
+    implementation 'androidx.navigation:navigation-ui:2.0.0-rc02'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.0.0-rc02'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.0.0-rc02'
 }
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/MainActivity.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/MainActivity.kt
index f718902c..e6228d88 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/MainActivity.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/MainActivity.kt
@@ -1,19 +1,18 @@
 package net.dankito.banking.fints4java.android
 
 import android.os.Bundle
-import android.support.design.widget.NavigationView
-import android.support.v4.view.GravityCompat
-import android.support.v4.widget.DrawerLayout
-import android.support.v7.app.ActionBarDrawerToggle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
 import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.SubMenu
 import android.widget.TextView
-import androidx.navigation.findNavController
+import androidx.appcompat.app.ActionBarDrawerToggle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.GravityCompat
+import androidx.drawerlayout.widget.DrawerLayout
 import com.github.clans.fab.FloatingActionMenu
+import com.google.android.material.navigation.NavigationView
 import kotlinx.android.synthetic.main.action_view_account_menu_item.view.*
 import net.dankito.banking.fints4java.android.ui.views.MainActivityFloatingActionMenuButton
 import net.dankito.banking.fints4java.android.util.Base64ServiceAndroid
@@ -62,7 +61,7 @@ class MainActivity : AppCompatActivity() {
 
         val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
         val navigationView: NavigationView = findViewById(R.id.nav_view)
-        val navController = findNavController(R.id.nav_host_fragment)
+//        val navController = findNavController(R.id.nav_host_fragment)
 
 //        // Passing each menu ID as a set of Ids because each
 //        // menu should be considered as top level destinations.
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/RouterAndroid.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/RouterAndroid.kt
index 4d478724..08198985 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/RouterAndroid.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/RouterAndroid.kt
@@ -1,6 +1,6 @@
 package net.dankito.banking.fints4java.android
 
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import net.dankito.banking.fints4java.android.ui.dialogs.AddAccountDialog
 import net.dankito.banking.fints4java.android.ui.dialogs.EnterAtcDialog
 import net.dankito.banking.fints4java.android.ui.dialogs.EnterTanDialog
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/AccountTransactionViewHolder.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/AccountTransactionViewHolder.kt
index 21906726..ea417e5c 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/AccountTransactionViewHolder.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/adapter/viewholder/AccountTransactionViewHolder.kt
@@ -1,8 +1,8 @@
 package net.dankito.banking.fints4java.android.ui.adapter.viewholder
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.list_item_account_transaction.view.*
 
 
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/AddAccountDialog.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/AddAccountDialog.kt
index 45a508b0..58b01944 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/AddAccountDialog.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/AddAccountDialog.kt
@@ -3,15 +3,15 @@ package net.dankito.banking.fints4java.android.ui.dialogs
 import android.content.Context
 import android.content.DialogInterface
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_add_account.*
 import kotlinx.android.synthetic.main.dialog_add_account.view.*
 import net.dankito.banking.fints4java.android.R
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt
index 1e05844e..b48a8146 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterAtcDialog.kt
@@ -1,13 +1,13 @@
 package net.dankito.banking.fints4java.android.ui.dialogs
 
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
 import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_enter_atc.view.*
 import net.dankito.banking.fints4java.android.R
 import net.dankito.banking.ui.model.tan.EnterTanGeneratorAtcResult
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt
index 0b6f7b9a..1b557e28 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/EnterTanDialog.kt
@@ -4,14 +4,14 @@ import android.content.Context
 import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.os.Handler
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
 import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Spinner
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_enter_tan.view.*
 import kotlinx.android.synthetic.main.view_tan_image.view.*
 import net.dankito.banking.fints4java.android.R
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/TransferMoneyDialog.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/TransferMoneyDialog.kt
index 7a986885..fa6667cd 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/TransferMoneyDialog.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/dialogs/TransferMoneyDialog.kt
@@ -1,14 +1,14 @@
 package net.dankito.banking.fints4java.android.ui.dialogs
 
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_transfer_money.*
 import kotlinx.android.synthetic.main.dialog_transfer_money.view.*
 import net.dankito.banking.fints4java.android.R
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeFragment.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeFragment.kt
index a2a7ff65..133085df 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeFragment.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeFragment.kt
@@ -1,17 +1,17 @@
 package net.dankito.banking.fints4java.android.ui.home
 
 import android.app.SearchManager
-import android.arch.lifecycle.ViewModelProviders
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.SearchView
 import android.view.*
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.SearchView
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import net.dankito.banking.fints4java.android.MainActivity
 import net.dankito.banking.fints4java.android.R
 import net.dankito.banking.fints4java.android.ui.adapter.AccountTransactionAdapter
@@ -68,19 +68,17 @@ class HomeFragment : Fragment() {
     }
 
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
 
-        menu?.let {
-            mnitmBalance = menu.findItem(R.id.mnitmBalance)
+        mnitmBalance = menu.findItem(R.id.mnitmBalance)
 
-            mnitmSearchTransactions = menu.findItem(R.id.mnitmSearchTransactions)
-            mnitmUpdateTransactions = menu.findItem(R.id.mnitmUpdateTransactions)
+        mnitmSearchTransactions = menu.findItem(R.id.mnitmSearchTransactions)
+        mnitmUpdateTransactions = menu.findItem(R.id.mnitmUpdateTransactions)
 
-            initSearchView()
+        initSearchView()
 
-            initLogicAfterUiInitialized()
-        }
+        initLogicAfterUiInitialized()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -102,7 +100,7 @@ class HomeFragment : Fragment() {
 
                     // if imeOptions aren't set like this searchView would take whole remaining screen when focused in landscape mode (see https://stackoverflow.com/questions/15296129/searchview-and-keyboard)
                     val searchInput =
-                        searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text) as? EditText
+                        searchView.findViewById(androidx.appcompat.R.id.search_src_text) as? EditText
                     searchInput?.imeOptions = EditorInfo.IME_ACTION_SEARCH or EditorInfo.IME_FLAG_NO_EXTRACT_UI
 
                     searchView.setOnQueryTextListener(searchAccountTransactionsTextListener)
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeViewModel.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeViewModel.kt
index e801d897..63d4eb7d 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeViewModel.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/home/HomeViewModel.kt
@@ -1,8 +1,8 @@
 package net.dankito.banking.fints4java.android.ui.home
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.MutableLiveData
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
 
 class HomeViewModel : ViewModel() {
 
diff --git a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/MainActivityFloatingActionMenuButton.kt b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/MainActivityFloatingActionMenuButton.kt
index d0581acb..7f62f8fe 100644
--- a/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/MainActivityFloatingActionMenuButton.kt
+++ b/fints4javaAndroidApp/src/main/java/net/dankito/banking/fints4java/android/ui/views/MainActivityFloatingActionMenuButton.kt
@@ -1,6 +1,6 @@
 package net.dankito.banking.fints4java.android.ui.views
 
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.github.clans.fab.FloatingActionButton
 import com.github.clans.fab.FloatingActionMenu
 import kotlinx.android.synthetic.main.view_floating_action_button_main.view.*
diff --git a/fints4javaAndroidApp/src/main/res/layout/activity_main.xml b/fints4javaAndroidApp/src/main/res/layout/activity_main.xml
index bc641837..d57ff59a 100644
--- a/fints4javaAndroidApp/src/main/res/layout/activity_main.xml
+++ b/fints4javaAndroidApp/src/main/res/layout/activity_main.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true"
-        tools:openDrawer="start">
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start"
+    >
 
     <include
             layout="@layout/app_bar_main"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
             android:id="@+id/nav_view"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -25,4 +27,4 @@
             android:background="@color/backgroundColor_Dark"
     />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/fints4javaAndroidApp/src/main/res/layout/app_bar_main.xml b/fints4javaAndroidApp/src/main/res/layout/app_bar_main.xml
index 3cdbaa5c..e1db80d5 100644
--- a/fints4javaAndroidApp/src/main/res/layout/app_bar_main.xml
+++ b/fints4javaAndroidApp/src/main/res/layout/app_bar_main.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".MainActivity">
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity"
+    >
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 android:background="?attr/colorPrimary"
                 app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main" />
 
@@ -33,4 +35,4 @@
             app:layout_behavior="@string/move_upward_behaviour"
     />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/fints4javaAndroidApp/src/main/res/layout/content_main.xml b/fints4javaAndroidApp/src/main/res/layout/content_main.xml
index b7cf46c2..e85b60ef 100644
--- a/fints4javaAndroidApp/src/main/res/layout/content_main.xml
+++ b/fints4javaAndroidApp/src/main/res/layout/content_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
@@ -17,4 +17,4 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:navGraph="@navigation/mobile_navigation" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/fints4javaAndroidApp/src/main/res/layout/dialog_add_account.xml b/fints4javaAndroidApp/src/main/res/layout/dialog_add_account.xml
index 50097d83..bbc37674 100644
--- a/fints4javaAndroidApp/src/main/res/layout/dialog_add_account.xml
+++ b/fints4javaAndroidApp/src/main/res/layout/dialog_add_account.xml
@@ -6,7 +6,7 @@
         android:padding="@dimen/dialog_add_account_padding"
         >
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dialog_add_account_field_bottom_margin"
@@ -20,17 +20,17 @@
                 android:inputType="text"
                 />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dialog_add_account_field_bottom_margin"
             android:hint="@string/dialog_add_account_enter_fints_server_address"
             >
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edtxtFinTsServerAddress"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dialog_add_account_edit_text_height"
@@ -38,41 +38,41 @@
                 android:enabled="false"
                 />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dialog_add_account_field_bottom_margin"
             android:hint="@string/dialog_add_account_enter_customer_id"
             >
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edtxtCustomerId"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dialog_add_account_edit_text_height"
                 android:inputType="text"
                 />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dialog_add_account_field_bottom_margin"
             android:hint="@string/dialog_add_account_enter_pin"
             >
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edtxtPin"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dialog_add_account_edit_text_height"
                 android:inputType="textPassword"
                 />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 
     <RelativeLayout
diff --git a/fints4javaAndroidApp/src/main/res/layout/dialog_transfer_money.xml b/fints4javaAndroidApp/src/main/res/layout/dialog_transfer_money.xml
index a88325c5..c5cd163d 100644
--- a/fints4javaAndroidApp/src/main/res/layout/dialog_transfer_money.xml
+++ b/fints4javaAndroidApp/src/main/res/layout/dialog_transfer_money.xml
@@ -41,13 +41,13 @@
 
         </LinearLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/dialog_transfer_money_remittee_name"
         >
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtxtRemitteeName"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
@@ -55,34 +55,34 @@
             >
 
                 <requestFocus />
-            </android.support.design.widget.TextInputEditText>
+            </com.google.android.material.textfield.TextInputEditText>
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/dialog_transfer_money_remittee_iban"
         >
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtxtRemitteeIban"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dialog_transfer_money_autocomplete_fields_height"
                     android:inputType="text"
             />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/dialog_transfer_money_remittee_bank"
         >
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtxtRemitteeBank"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
@@ -90,16 +90,16 @@
                     android:enabled="false"
             />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/dialog_transfer_money_remittee_bic"
         >
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtxtRemitteeBic"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
@@ -107,39 +107,39 @@
                     android:enabled="false"
             />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/dialog_transfer_money_amount"
         >
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtxtAmount"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
                     android:inputType="numberDecimal"
             />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/dialog_transfer_money_usage"
         >
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edtxtUsage"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/dialog_transfer_money_input_fields_height"
                     android:inputType="text"
             />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
 
         <RelativeLayout
diff --git a/fints4javaAndroidApp/src/main/res/layout/fragment_home.xml b/fints4javaAndroidApp/src/main/res/layout/fragment_home.xml
index 2e6cd81b..9427e89f 100644
--- a/fints4javaAndroidApp/src/main/res/layout/fragment_home.xml
+++ b/fints4javaAndroidApp/src/main/res/layout/fragment_home.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rcyvwAccountTransactions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -16,4 +16,4 @@
             app:layout_constraintTop_toTopOf="parent"
             />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/fints4javaAndroidApp/src/main/res/layout/list_item_bank_info.xml b/fints4javaAndroidApp/src/main/res/layout/list_item_bank_info.xml
index 64cc38f3..d623eab0 100644
--- a/fints4javaAndroidApp/src/main/res/layout/list_item_bank_info.xml
+++ b/fints4javaAndroidApp/src/main/res/layout/list_item_bank_info.xml
@@ -7,7 +7,7 @@
         android:layout_gravity="center_vertical"
         >
 
-    <android.support.v7.widget.AppCompatImageView
+    <ImageView
             android:id="@+id/imgSupportsFints30"
             android:layout_width="@dimen/list_item_bank_info_icon_supports_fints_30_width"
             android:layout_height="@dimen/list_item_bank_info_icon_supports_fints_30_height"
diff --git a/fints4javaAndroidApp/src/main/res/menu/menu_main.xml b/fints4javaAndroidApp/src/main/res/menu/menu_main.xml
index b7bf5140..a2bd054d 100644
--- a/fints4javaAndroidApp/src/main/res/menu/menu_main.xml
+++ b/fints4javaAndroidApp/src/main/res/menu/menu_main.xml
@@ -7,7 +7,7 @@
           android:icon="@drawable/ic_search_white_24dp"
           android:title="@string/search"
           app:showAsAction="always|collapseActionView"
-          app:actionViewClass="android.support.v7.widget.SearchView"
+          app:actionViewClass="androidx.appcompat.widget.SearchView"
           android:orderInCategory="10"
           android:visible="false"
     />
diff --git a/fints4javaAndroidApp/src/main/res/values/strings.xml b/fints4javaAndroidApp/src/main/res/values/strings.xml
index 8c53d653..8f786b10 100644
--- a/fints4javaAndroidApp/src/main/res/values/strings.xml
+++ b/fints4javaAndroidApp/src/main/res/values/strings.xml
@@ -70,7 +70,7 @@
     <string name="dialog_enter_tan_enter_tan">Enter TAN:</string>
     <string name="dialog_enter_tan_error_could_not_decode_tan_image">Could not decode flicker code or QR code / PhotoTan. Most likely an internal error:\n%s.</string>
     <string name="dialog_enter_tan_tan_medium_successfully_changed">TAN medium successfully changed to \'%s\'.</string>
-    <string name="dialog_enter_tan_error_changing_tan_medium">Could not change TAN medium to \'%s\':\n%s.</string>
+    <string formatted="false" name="dialog_enter_tan_error_changing_tan_medium">Could not change TAN medium to \'%s\':\n%s.</string>
 
     <!-- Removed <p></p> from last paragraph as otherwise TextView has some padding at the end -->
     <string name="dialog_enter_atc_explanation"><![CDATA[
diff --git a/gradle.properties b/gradle.properties
index 29e08e8c..eeed7cd8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,3 @@
+android.enableJetifier=true
+android.useAndroidX=true
 kotlin.code.style=official
\ No newline at end of file