initial work on new bigscreen remote ui

GIT_SILENT made messages (after extraction)
2025-09-01 06:35:09 +00:00 · 2022-09-15 08:00:18 +00:00 · 2022-09-11 00:44:55 +00:00 · 2022-09-05 00:43:56 +00:00 · 2022-09-01 00:44:31 +00:00 · 2022-08-27 00:46:29 +00:00
250 changed files with 11555 additions and 2521 deletions
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,3 +0,0 @@
-{
-  "phabricator.uri" : "https://phabricator.kde.org/project/profile/159/"
-}
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="org.kde.kdeconnect_tp"
-    android:versionCode="11510"
-    android:versionName="1.15.1">
+    android:versionCode="11910"
+    android:versionName="1.19.1">

    <supports-screens
        android:anyDensity="true"
@@ -42,16 +42,21 @@
    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.READ_LOGS" tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />



    <application
-        android:icon="@drawable/icon"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
        android:label="KDE Connect"
        android:supportsRtl="true"
        android:allowBackup="false"
        android:networkSecurityConfig="@xml/network_security_config"
-        android:theme="@style/KdeConnectTheme"
+        android:theme="@style/KdeConnectTheme.NoActionBar"
        android:name="org.kde.kdeconnect.MyApplication">

        <receiver
@@ -72,6 +77,8 @@

        <service
            android:name="org.kde.kdeconnect.BackgroundService"
+            android:foregroundServiceType="connectedDevice"
+            android:icon="@drawable/icon"
            android:enabled="true" />
        <service
            android:name="org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardService"
@@ -95,12 +102,6 @@

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="image/*" />
-            </intent-filter>
        </activity>
        <activity
            android:name="org.kde.kdeconnect.UserInterface.PluginSettingsActivity"
@@ -174,6 +175,7 @@
            android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
            android:label="@string/open_mpris_controls"
            android:launchMode="singleTop"
+            android:theme="@style/KdeConnectTheme.NoActionBar"
            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
@@ -249,11 +251,34 @@
        <activity
            android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity"
            android:label="@string/pref_plugin_mousepad"
+            android:launchMode="singleTop"
            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
        </activity>
+        <activity
+            android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.ComposeSendActivity"
+            android:label="Compose send"
+            android:parentActivityName="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity" />
+        </activity>
+        <activity
+            android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.SendKeystrokesToHostActivity"
+            android:label="@string/pref_plugin_mousepad_send_keystrokes"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+            <!-- Accept data with "text/x-keystrokes" to send the text to the connected host and emulate keystrokes -->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:mimeType="text/x-keystrokes"/>
+            </intent-filter>
+        </activity>
        <activity
            android:name="org.kde.kdeconnect.Plugins.PresenterPlugin.PresenterActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
@@ -266,7 +291,7 @@
        </activity>
        <activity
            android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareActivity"
-            android:label="KDE Connect">
+            android:label="@string/manifest_label_share">
            <intent-filter>
                <action android:name="android.intent.action.SEND" />

@@ -317,6 +342,16 @@
                <action android:name="android.service.chooser.ChooserTargetService" />
            </intent-filter>
        </service>
+        <service
+            android:name="org.kde.kdeconnect.Plugins.MouseReceiverPlugin.MouseReceiverService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService" />
+            </intent-filter>
+            <meta-data
+                android:name="android.accessibilityservice"
+                android:resource="@xml/mouse_receiver_service" />
+        </service>

        <activity
            android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity"
@@ -338,7 +373,49 @@
                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
        </activity>

+        <activity
+            android:name="org.kde.kdeconnect.UserInterface.About.EasterEggActivity"
+            android:label="@string/easter_egg"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+        </activity>

+        <activity
+            android:name="org.kde.kdeconnect.UserInterface.About.AboutKDEActivity"
+            android:label="@string/about_kde"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+        </activity>
+
+        <activity
+            android:name="org.kde.kdeconnect.UserInterface.About.LicensesActivity"
+            android:label="@string/licenses"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+        </activity>
+
+        <service
+            android:name="org.kde.kdeconnect.Plugins.ClibpoardPlugin.ClipboardTileService"
+            android:icon="@drawable/ic_baseline_content_paste_24"
+            android:label="@string/send_clipboard"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+
+        <service android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandControlsProviderService" android:label="@string/kde_connect"
+            android:permission="android.permission.BIND_CONTROLS">
+            <intent-filter>
+                <action android:name="android.service.controls.ControlsProviderService" />
+            </intent-filter>
+        </service>
    </application>

 </manifest>
--- a/README.md
+++ b/README.md
@@ -13,11 +13,11 @@ All this without wires, over the already existing WiFi network, and using TLS en

 ## About this app

-This is a native Android port of the KDE Connect Qt app. You will find a more complete readme about KDE Connect [here](https://github.com/KDE/kdeconnect-kde).
+This is a native Android port of the KDE Connect Qt app. You will find a more complete readme about KDE Connect [here](https://invent.kde.org/network/kdeconnect-kde/).

 ## How to install this app

-You can install this app from the [Play Store](https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp) as well as [F-Droid](https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp). Note you will also need to install the [desktop app](https://github.com/KDE/kdeconnect-kde) for it to work.
+You can install this app from the [Play Store](https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp) as well as [F-Droid](https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp). Note you will also need to install the [desktop app](https://invent.kde.org/network/kdeconnect-kde) for it to work.

 ## Contributing

@@ -34,4 +34,4 @@ Please know that all translations for all KDE apps are handled by the [localizat
 ## License
 [GNU GPL v2](https://www.gnu.org/licenses/gpl-2.0.html) and [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html)

-If you are reading this from Github, you should know that this is just a mirror of the [KDE Project repo](https://projects.kde.org/projects/extragear/network/kdeconnect-android/repository/).
+If you are reading this from Github, you should know that this is just a mirror of the [KDE Project repo](https://invent.kde.org/network/kdeconnect-android/).
--- a/adaptive_icon.svg
+++ b/adaptive_icon.svg
--- a/build.gradle
+++ b/build.gradle
@@ -1,29 +1,29 @@
 import com.android.build.gradle.AppExtension
 import com.android.build.gradle.api.ApkVariantOutput
 import com.android.build.gradle.api.ApplicationVariant
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+import com.github.jk1.license.render.TextReportRenderer

 buildscript {
-    ext.kotlin_version = '1.4.10'
-    repositories {
-        jcenter()
-        google()
-    }
+    ext.kotlin_version = '1.6.10'
    dependencies {
-        // Pinned 4.0.2 due to this bug on 4.1: https://issuetracker.google.com/issues/172096891
-        //noinspection GradleDependency
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:7.2.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
 }

+plugins {
+    id 'com.github.jk1.dependency-license-report' version '1.16'
+}
+def licenseResDir = new File("$projectDir/build/dependency-license-res")
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
    defaultConfig {
        minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'

        multiDexEnabled true
@@ -31,9 +31,6 @@ android {
    buildFeatures {
        viewBinding true
    }
-    dexOptions {
-        javaMaxHeapSize "2g"
-    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
@@ -49,7 +46,7 @@ android {
            manifest.srcFile 'AndroidManifest.xml'
            java.srcDirs = ['src']
            resources.srcDirs = ['resources']
-            res.srcDirs = ['res']
+            res.srcDirs = [licenseResDir, 'res']
            assets.srcDirs = ['assets']
        }
        test {
@@ -57,13 +54,9 @@ android {
        }
    }
    packagingOptions {
-        merge "META-INF/DEPENDENCIES"
-        merge "META-INF/LICENSE"
-        merge "META-INF/NOTICE"
-    }
-    lintOptions {
-        abortOnError false
-        checkReleaseBuilds false
+        resources {
+            merges += ['META-INF/DEPENDENCIES', 'META-INF/LICENSE', 'META-INF/NOTICE']
+        }
    }
    signingConfigs {
        debug {
@@ -86,6 +79,10 @@ android {
            shrinkResources true
        }
    }
+    lint {
+        abortOnError false
+        checkReleaseBuilds false
+    }
 }

 /**
@@ -137,36 +134,25 @@ Provider<String> gitHashProvider = project.provider {
 }

 ext {
-    coroutines_version = '1.3.8'
+    coroutines_version = '1.6.0'
 }

 dependencies {
-
-    repositories {
-        jcenter()
-        google()
-        /* Needed for org.apache.sshd debugging
-        maven {
-            url "https://jitpack.io"
-        }
-        */
-    }
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
    implementation 'androidx.multidex:multidex:2.0.1'

-    implementation 'androidx.media:media:1.2.0'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.media:media:1.4.3'
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'androidx.core:core-ktx:1.7.0'
    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-runtime:2.4.0'
    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.0'
    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.5.0'
    implementation 'com.jakewharton:disklrucache:2.0.2' //For caching album art bitmaps
    implementation 'com.jaredrummler:android-device-names:1.1.9' //To get a human-friendly device name

@@ -176,10 +162,6 @@ dependencies {
    //implementation('com.github.bright:slf4android:0.1.6') { transitive = true } // For org.apache.sshd debugging
    implementation 'com.madgag.spongycastle:bcpkix-jdk15on:1.58.0.0' //For SSL certificate generation

-    //noinspection AnnotationProcessorOnCompilePath - c.f. https://issuetracker.google.com/issues/140881211
-    implementation 'com.jakewharton:butterknife:10.2.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'
-
    implementation 'org.atteo.classindex:classindex:3.6'
    annotationProcessor 'org.atteo.classindex:classindex:3.6'

@@ -187,7 +169,7 @@ dependencies {

    implementation 'commons-io:commons-io:2.7'
    implementation 'org.apache.commons:commons-collections4:4.4'
-    implementation 'org.apache.commons:commons-lang3:3.10'
+    implementation 'org.apache.commons:commons-lang3:3.11'

    // Kotlin
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
@@ -195,15 +177,27 @@ dependencies {
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"

    // Testing
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.1'
    testImplementation 'org.powermock:powermock-core:2.0.0'
    testImplementation 'org.powermock:powermock-module-junit4:2.0.0'
    testImplementation 'org.powermock:powermock-api-mockito2:2.0.0'
    testImplementation 'org.mockito:mockito-core:2.23.0'
    testImplementation 'org.skyscreamer:jsonassert:1.3.0'
+
+    // For device controls
+    implementation 'org.reactivestreams:reactive-streams:1.0.3'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.0'
 }

-repositories {
-    google()
-    mavenCentral()
+licenseReport {
+    configurations = ALL
+    renderers = [new TextReportRenderer()]
 }
+generateLicenseReport.doLast {
+    def target = new File(licenseResDir, "raw/license")
+    target.parentFile.mkdirs()
+    target.text =
+            files("COPYING", "$projectDir/build/reports/dependency-license/THIRD-PARTY-NOTICES.txt")
+                    .collect { it.getText() }.join('\n')
+}
+preBuild.dependsOn(generateLicenseReport)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
--- a/res/anim/slide_in_left.xml
+++ b/res/anim/slide_in_left.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/slide_in_left.xml
+**
+** SPDX-FileCopyrightText: 2007 The Android Open Source Project
+**
+** SPDX-License-Identifier: Apache-2.0
+*/
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="-50%p" android:toXDelta="0"
+        android:duration="@android:integer/config_shortAnimTime"/>
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+        android:duration="@android:integer/config_shortAnimTime" />
+</set>
--- a/res/anim/slide_in_right.xml
+++ b/res/anim/slide_in_right.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/slide_in_right.xml
+**
+** SPDX-FileCopyrightText: 2007 The Android Open Source Project
+**
+** SPDX-License-Identifier: Apache-2.0
+*/
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="50%p" android:toXDelta="0"
+        android:duration="@android:integer/config_shortAnimTime"/>
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+        android:duration="@android:integer/config_shortAnimTime" />
+</set>
--- a/res/anim/slide_out_left.xml
+++ b/res/anim/slide_out_left.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/slide_out_left.xml
+**
+** SPDX-FileCopyrightText: 2007 The Android Open Source Project
+**
+** SPDX-License-Identifier: Apache-2.0
+*/
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="0" android:toXDelta="-50%p"
+        android:duration="@android:integer/config_shortAnimTime"/>
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+        android:duration="@android:integer/config_shortAnimTime" />
+</set>
--- a/res/anim/slide_out_right.xml
+++ b/res/anim/slide_out_right.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/slide_out_right.xml
+**
+** SPDX-FileCopyrightText: 2007 The Android Open Source Project
+**
+** SPDX-License-Identifier: Apache-2.0
+*/
+-->
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="0" android:toXDelta="50%p"
+        android:duration="@android:integer/config_shortAnimTime"/>
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+        android:duration="@android:integer/config_shortAnimTime" />
+</set>
--- a/res/drawable-v24/ic_launcher_background.xml
+++ b/res/drawable-v24/ic_launcher_background.xml
@@ -0,0 +1,26 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="m0,0h108v108h-108z"
+      android:fillColor="@color/accent"/>
+  <path
+      android:pathData="m0,0h108v108h-108z"
+      android:strokeAlpha="0.2"
+      android:fillAlpha="0.2">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="0"
+          android:endY="108"
+          android:startX="0"
+          android:endX="0"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#00FFFFFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
--- a/res/drawable-v24/ic_launcher_foreground.xml
+++ b/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,66 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.8"
+      android:scaleY="0.8"
+      android:translateX="10.8"
+      android:translateY="10.8">
+    <path
+        android:pathData="M40,27L68,27A2,2 0,0 1,70 29L70,79A2,2 0,0 1,68 81L40,81A2,2 0,0 1,38 79L38,29A2,2 0,0 1,40 27z"
+        android:strokeWidth="1.73436">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startY="27"
+            android:startX="38"
+            android:endY="81"
+            android:endX="38"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFF5F5F5"/>
+          <item android:offset="1" android:color="#FFF0F0F0"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="m41,30h26v48h-26z"
+        android:strokeWidth="1.00241"
+        android:fillColor="#2d2d2d"/>
+    <path
+        android:pathData="M50.25,28.25L57.75,28.25A0.25,0.25 0,0 1,58 28.5L58,28.5A0.25,0.25 0,0 1,57.75 28.75L50.25,28.75A0.25,0.25 0,0 1,50 28.5L50,28.5A0.25,0.25 0,0 1,50.25 28.25z"
+        android:strokeWidth=".632455"
+        android:fillColor="#2d2d2d"/>
+    <path
+        android:pathData="m47.694,47.379c-0.04,0.004 -0.083,0.015 -0.113,0.045 0,0 -1.381,1.381 -1.381,1.381 -0.058,0.058 -0.065,0.147 -0.023,0.218 0,0 1.614,2.665 1.614,2.665 -0.287,0.482 -0.519,0.999 -0.683,1.547 0,0 -2.965,0.616 -2.965,0.616 -0.083,0.017 -0.143,0.096 -0.143,0.18v1.952c0,0.083 0.063,0.153 0.143,0.173 0,0 2.875,0.698 2.875,0.698 0.154,0.634 0.391,1.241 0.706,1.794 0,0 -1.667,2.538 -1.667,2.538 -0.046,0.071 -0.037,0.165 0.023,0.225 0,0 1.381,1.381 1.381,1.381 0.058,0.058 0.147,0.065 0.218,0.023 0,0 2.613,-1.584 2.613,-1.584 0.512,0.296 1.067,0.533 1.652,0.691 0,0 0.608,2.928 0.608,2.928 0.017,0.083 0.088,0.143 0.173,0.143h1.952c0.082,0 0.153,-0.055 0.173,-0.135 0,0 0.721,-2.943 0.721,-2.943 0.603,-0.163 1.171,-0.404 1.697,-0.713 0,0 2.575,1.689 2.575,1.689 0.071,0.046 0.165,0.037 0.225,-0.023 0,0 1.374,-1.381 1.374,-1.381 0.058,-0.058 0.073,-0.147 0.03,-0.218 0,0 -0.938,-1.547 -0.938,-1.547s-0.308,0.098 -0.308,0.098c-0.044,0.014 -0.094,-0.006 -0.12,-0.045 0,0 -0.593,-0.872 -1.366,-2.005 -0.925,1.81 -2.812,3.048 -4.985,3.048 -3.088,0 -5.593,-2.505 -5.593,-5.593 0,-2.271 1.358,-4.222 3.303,-5.098v-1.441c-0.354,0.124 -0.696,0.273 -1.021,0.45 -0.001,-0 0.001,-0.007 0,-0.007 0,0 -2.635,-1.727 -2.635,-1.727 -0.035,-0.023 -0.073,-0.027 -0.113,-0.023 0,0 0,0 0,-0zM55.659,43.85s-3.514,0.338 -3.514,0.338v14.475s3.476,-0.526 3.476,-0.526v-6.171s4.677,6.847 4.677,6.847 3.664,-1.164 3.664,-1.164 -4.79,-6.584 -4.79,-6.584 4.827,-6.209 4.827,-6.209 -3.739,-0.856 -3.739,-0.856 -4.64,6.209 -4.64,6.209 0.038,-6.359 0.038,-6.359z"
+        android:fillColor="#f2f2f2"/>
+    <path
+        android:pathData="m41,30h22l-18,45h-4z"
+        android:strokeAlpha="0.1"
+        android:fillAlpha="0.1">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startY="30"
+            android:startX="41"
+            android:endY="70"
+            android:endX="60"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFFFFD"/>
+          <item android:offset="1" android:color="#00FFFFFD"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="m38,78v1c0,1.108 0.892,2 2,2h28c1.108,0 2,-0.892 2,-2v-1c0,1.108 -0.892,2 -2,2h-28c-1.108,0 -2,-0.892 -2,-2z"
+        android:strokeAlpha="0.1"
+        android:strokeWidth="1.73436"
+        android:fillAlpha="0.1"/>
+    <path
+        android:pathData="m70,30v-1c0,-1.108 -0.892,-2 -2,-2h-28c-1.108,0 -2,0.892 -2,2v1c0,-1.108 0.892,-2 2,-2h28c1.108,0 2,0.892 2,2z"
+        android:strokeAlpha="0.5"
+        android:strokeWidth="1.73436"
+        android:fillColor="#fffff8"
+        android:fillAlpha="0.5"/>
+  </group>
+</vector>
--- a/res/drawable/drawer_header.jpeg
+++ b/res/drawable/drawer_header.jpeg
--- a/res/drawable/ic_arrow_black.xml
+++ b/res/drawable/ic_arrow_black.xml
@@ -1,4 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:viewportWidth="32"
    android:viewportHeight="32"
    android:width="32dp"
--- a/res/drawable/ic_baseline_attach_money_24.xml
+++ b/res/drawable/ic_baseline_attach_money_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.8,10.9c-2.27,-0.59 -3,-1.2 -3,-2.15 0,-1.09 1.01,-1.85 2.7,-1.85 1.78,0 2.44,0.85 2.5,2.1h2.21c-0.07,-1.72 -1.12,-3.3 -3.21,-3.81V3h-3v2.16c-1.94,0.42 -3.5,1.68 -3.5,3.61 0,2.31 1.91,3.46 4.7,4.13 2.5,0.6 3,1.48 3,2.41 0,0.69 -0.49,1.79 -2.7,1.79 -2.06,0 -2.87,-0.92 -2.98,-2.1h-2.2c0.12,2.19 1.76,3.42 3.68,3.83V21h3v-2.15c1.95,-0.37 3.5,-1.5 3.5,-3.55 0,-2.84 -2.43,-3.81 -4.7,-4.4z"/>
+</vector>
--- a/res/drawable/ic_baseline_bug_report_24.xml
+++ b/res/drawable/ic_baseline_bug_report_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>
--- a/res/drawable/ic_baseline_code_24.xml
+++ b/res/drawable/ic_baseline_code_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"/>
+</vector>
--- a/res/drawable/ic_baseline_content_paste_24.xml
+++ b/res/drawable/ic_baseline_content_paste_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
+</vector>
--- a/res/drawable/ic_baseline_gavel_24.xml
+++ b/res/drawable/ic_baseline_gavel_24.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M5.2496,8.0688l2.83,-2.8268l14.134,14.15l-2.83,2.8268z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9.4857,3.8272l2.828,-2.8288l5.6576,5.656l-2.828,2.8288z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M0.9989,12.3147l2.8284,-2.8284l5.6568,5.6568l-2.8284,2.8284z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M1,21h12v2h-12z"/>
+</vector>
--- a/res/drawable/ic_baseline_info_24.xml
+++ b/res/drawable/ic_baseline_info_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
--- a/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
+++ b/res/drawable/ic_baseline_keyboard_arrow_down_24.xml
@@ -0,0 +1,12 @@
+<vector
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z" />
+</vector>
--- a/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
+++ b/res/drawable/ic_baseline_keyboard_arrow_left_24.xml
@@ -0,0 +1,12 @@
+<vector
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.41,16.59L10.83,12l4.58,-4.59L14,6l-6,6 6,6 1.41,-1.41z" />
+</vector>
--- a/res/drawable/ic_baseline_keyboard_arrow_right_24.xml
+++ b/res/drawable/ic_baseline_keyboard_arrow_right_24.xml
@@ -0,0 +1,12 @@
+<vector
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M8.59,16.59L13.17,12 8.59,7.41 10,6l6,6 -6,6 -1.41,-1.41z" />
+</vector>
--- a/res/drawable/ic_baseline_keyboard_arrow_up_24.xml
+++ b/res/drawable/ic_baseline_keyboard_arrow_up_24.xml
@@ -0,0 +1,12 @@
+<vector
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" />
+</vector>
--- a/res/drawable/ic_baseline_send_24.xml
+++ b/res/drawable/ic_baseline_send_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+</vector>
--- a/res/drawable/ic_baseline_web_24.xml
+++ b/res/drawable/ic_baseline_web_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
+</vector>
--- a/res/drawable/ic_delete.xml
+++ b/res/drawable/ic_delete.xml
@@ -1,7 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:height="24dp"
    android:width="24dp"
    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#FFF" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+
+    <path
+        android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"
+        android:fillColor="@android:color/white" />
 </vector>
--- a/res/drawable/ic_edit_note_24dp.xml
+++ b/res/drawable/ic_edit_note_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M3,10h11v2H3V10zM3,8h11V6H3V8zM3,16h7v-2H3V16zM18.01,12.87l0.71,-0.71c0.39,-0.39 1.02,-0.39 1.41,0l0.71,0.71c0.39,0.39 0.39,1.02 0,1.41l-0.71,0.71L18.01,12.87zM17.3,13.58l-5.3,5.3V21h2.12l5.3,-5.3L17.3,13.58z"/>
+</vector>
--- a/res/drawable/ic_home_black_24dp.xml
+++ b/res/drawable/ic_home_black_24dp.xml
@@ -1,9 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+<vector
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
    <path
        android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
 </vector>
--- a/res/drawable/ic_kde_24dp.xml
+++ b/res/drawable/ic_kde_24dp.xml
@@ -0,0 +1,4 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#fcfcfc" android:pathData="m26.8172,6.058 l-5.9774,0.5722v24.6133l5.9142,-0.8904v-10.494l7.9499,11.6392 6.2324,-1.972 -8.1405,-11.1935 8.2042,-10.5576 -6.3594,-1.4621 -7.8865,10.5572zM13.2678,12.0558c-0.0675,0.0071 -0.1327,0.0369 -0.1834,0.0877l-2.346,2.3456c-0.0986,0.0989 -0.1172,0.2523 -0.0445,0.3721l2.7467,4.5238c-0.4872,0.819 -0.8776,1.7021 -1.1567,2.6336l-5.0426,1.0489c-0.1403,0.0291 -0.2414,0.1534 -0.2414,0.2973v3.3173c0,0.1403 0.096,0.2618 0.2312,0.2945l4.8943,1.1963c0.261,1.0789 0.6654,2.1016 1.2,3.0416l-2.833,4.32c-0.079,0.1208 -0.0625,0.2798 0.0396,0.3815l2.3452,2.3456c0.0986,0.0984 0.2526,0.1176 0.3729,0.0454l4.4393,-2.6961c0.872,0.5032 1.8124,0.8992 2.8063,1.1677l1.0358,4.98c0.0291,0.1412 0.1539,0.2414 0.2969,0.2414h3.3177c0.1395,0 0.2612,-0.0952 0.2945,-0.232l1.22,-4.9903c1.0246,-0.2765 1.9935,-0.6886 2.8869,-1.2147l4.3747,2.8684c0.1203,0.0792 0.2794,0.0633 0.3815,-0.0387l2.346,-2.3456c0.0992,-0.0992 0.117,-0.2526 0.0441,-0.3721l-1.597,-2.632 -0.5167,0.1634c-0.0753,0.0238 -0.1575,-0.0043 -0.2018,-0.0699 0,0 -1.0186,-1.4912 -2.3342,-3.4167 -1.5727,3.0779 -4.7723,5.1864 -8.4672,5.1864 -5.2496,0 -9.5055,-4.2561 -9.5055,-9.5059 0,-3.8619 2.3035,-7.1832 5.6102,-8.6711v-2.4523c-0.6018,0.2105 -1.1836,0.4644 -1.7362,0.7654 -0.0004,-0.0004 -0.0008,-0.0014 -0.0024,-0.0028l-4.4777,-2.9368c-0.0603,-0.0394 -0.1302,-0.0551 -0.1977,-0.0482z"/>
+</vector>
--- a/res/drawable/ic_kde_48dp.xml
+++ b/res/drawable/ic_kde_48dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="m26.8172,6.058 l-5.9774,0.5722v24.6133l5.9142,-0.8904v-10.494l7.9499,11.6392 6.2324,-1.972 -8.1405,-11.1935 8.2042,-10.5576 -6.3594,-1.4621 -7.8865,10.5572zM13.2678,12.0558c-0.0675,0.0071 -0.1327,0.0369 -0.1834,0.0877l-2.346,2.3456c-0.0986,0.0989 -0.1172,0.2523 -0.0445,0.3721l2.7467,4.5238c-0.4872,0.819 -0.8776,1.7021 -1.1567,2.6336l-5.0426,1.0489c-0.1403,0.0291 -0.2414,0.1534 -0.2414,0.2973v3.3173c0,0.1403 0.096,0.2618 0.2312,0.2945l4.8943,1.1963c0.261,1.0789 0.6654,2.1016 1.2,3.0416l-2.833,4.32c-0.079,0.1208 -0.0625,0.2798 0.0396,0.3815l2.3452,2.3456c0.0986,0.0984 0.2526,0.1176 0.3729,0.0454l4.4393,-2.6961c0.872,0.5032 1.8124,0.8992 2.8063,1.1677l1.0358,4.98c0.0291,0.1412 0.1539,0.2414 0.2969,0.2414h3.3177c0.1395,0 0.2612,-0.0952 0.2945,-0.232l1.22,-4.9903c1.0246,-0.2765 1.9935,-0.6886 2.8869,-1.2147l4.3747,2.8684c0.1203,0.0792 0.2794,0.0633 0.3815,-0.0387l2.346,-2.3456c0.0992,-0.0992 0.117,-0.2526 0.0441,-0.3721l-1.597,-2.632 -0.5167,0.1634c-0.0753,0.0238 -0.1575,-0.0043 -0.2018,-0.0699 0,0 -1.0186,-1.4912 -2.3342,-3.4167 -1.5727,3.0779 -4.7723,5.1864 -8.4672,5.1864 -5.2496,0 -9.5055,-4.2561 -9.5055,-9.5059 0,-3.8619 2.3035,-7.1832 5.6102,-8.6711v-2.4523c-0.6018,0.2105 -1.1836,0.4644 -1.7362,0.7654 -0.0004,-0.0004 -0.0008,-0.0014 -0.0024,-0.0028l-4.4777,-2.9368c-0.0603,-0.0394 -0.1302,-0.0551 -0.1977,-0.0482z"
+      android:fillColor="#fcfcfc"/>
+</vector>
--- a/res/drawable/ic_key.xml
+++ b/res/drawable/ic_key.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
--- a/res/drawable/ic_loop_none_black.xml
+++ b/res/drawable/ic_loop_none_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
+</vector>
--- a/res/drawable/ic_loop_playlist_black.xml
+++ b/res/drawable/ic_loop_playlist_black.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:fillType="evenOdd"
+        android:pathData="M21,1L3,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" />
+</vector>
--- a/res/drawable/ic_loop_track_black.xml
+++ b/res/drawable/ic_loop_track_black.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:fillType="evenOdd"
+        android:pathData="M21,1L3,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4zM13,15L13,9h-1l-2,1v1h1.5v4L13,15z" />
+</vector>
--- a/res/drawable/ic_mic_black.xml
+++ b/res/drawable/ic_mic_black.xml
@@ -1,9 +1,12 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+<vector
    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
    <path
        android:fillColor="#FF000000"
-        android:pathData="M 16.766667,8.7612589 v 2.5197071 c 0,2.182796 -2.138935,3.959544 -4.766667,3.959544 -2.6277329,0 -4.7666673,-1.776748 -4.7666673,-3.959544 V 8.7612589 H 5.4999999 v 2.5197071 c 0,2.732804 2.4587328,4.991913 5.6333321,5.345392 v 2.933663 H 8.0999999 v 1.439831 H 15.9 V 19.560021 H 12.866667 V 16.626358 C 16.041267,16.272879 18.5,14.01377 18.5,11.280966 V 8.7612589 Z M 12,13.800679 A 3.0333332,2.5197106 0 0 1 8.9666671,11.280966 V 5.5216304 a 3.0333332,2.5197106 0 1 1 6.0666649,0 V 11.280966 A 3.0333332,2.5197106 0 0 1 12,13.800679 Z"/>
+        android:pathData="M 16.766667,8.7612589 v 2.5197071 c 0,2.182796 -2.138935,3.959544 -4.766667,3.959544 -2.6277329,0 -4.7666673,-1.776748 -4.7666673,-3.959544 V 8.7612589 H 5.4999999 v 2.5197071 c 0,2.732804 2.4587328,4.991913 5.6333321,5.345392 v 2.933663 H 8.0999999 v 1.439831 H 15.9 V 19.560021 H 12.866667 V 16.626358 C 16.041267,16.272879 18.5,14.01377 18.5,11.280966 V 8.7612589 Z M 12,13.800679 A 3.0333332,2.5197106 0 0 1 8.9666671,11.280966 V 5.5216304 a 3.0333332,2.5197106 0 1 1 6.0666649,0 V 11.280966 A 3.0333332,2.5197106 0 0 1 12,13.800679 Z" />
 </vector>
--- a/res/drawable/ic_shuffle_off_black.xml
+++ b/res/drawable/ic_shuffle_off_black.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
+</vector>
--- a/res/drawable/ic_shuffle_on_black.xml
+++ b/res/drawable/ic_shuffle_on_black.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:fillType="evenOdd"
+        android:pathData="M21,1L3,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,3c0,-1.1 -0.9,-2 -2,-2zM10.59,9.17L5.41,4 4,5.41l5.17,5.17 1.42,-1.41zM14.5,4l2.04,2.04L4,18.59 5.41,20 17.96,7.46 20,9.5L20,4h-5.5zM14.83,13.41l-1.41,1.41 3.13,3.13L14.5,20L20,20v-5.5l-2.04,2.04 -3.13,-3.13z" />
+</vector>
--- a/res/drawable/konqi.png
+++ b/res/drawable/konqi.png
--- a/res/drawable/mouse_pointer.xml
+++ b/res/drawable/mouse_pointer.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape
+xmlns:android="http://schemas.android.com/apk/res/android"
+android:shape="oval">
+    <solid
+        android:color="#000000"/>
+
+    <size
+        android:width="12dp"
+        android:height="12dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#ffffff"/>
+</shape>
--- a/res/drawable/mouse_pointer_clicked.xml
+++ b/res/drawable/mouse_pointer_clicked.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<item>
+    <shape
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="oval">
+        <solid
+            android:color="#000000"/>
+
+        <size
+            android:width="12dp"
+            android:height="12dp"/>
+        <stroke
+            android:width="1dp"
+            android:color="#ffffff"/>
+    </shape>
+</item>
+<item
+    android:top="4dp"
+    android:right="4dp"
+    android:bottom="4dp"
+    android:left="4dp">
+    <shape
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="oval">
+        <solid
+            android:color="#ffffff"/>
+    </shape>
+</item>
+</layer-list>
--- a/res/drawable/sink_item_background.xml
+++ b/res/drawable/sink_item_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp"/>
+    <stroke android:width="3dp" android:color="?colorAccent" />
+</shape>
--- a/res/drawable/text_section_header.xml
+++ b/res/drawable/text_section_header.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:width="1000dp" android:height="2dp" />
-    <solid android:color="#cecbce"/>
-</shape>
--- a/res/layout-land/mpris_now_playing.xml
+++ b/res/layout-land/mpris_now_playing.xml
@@ -3,10 +3,8 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="horizontal"
-    android:paddingBottom="25dp"
-    android:paddingLeft="25dp"
-    android:paddingRight="25dp"
-    android:paddingTop="25dp">
+    android:paddingHorizontal="@dimen/activity_horizontal_margin"
+    android:paddingVertical="@dimen/activity_vertical_margin">

    <ImageView
        android:id="@+id/album_art"
@@ -19,6 +17,7 @@
        android:scaleType="fitCenter" />

    <include
+        android:id="@+id/mpris_control"
        layout="@layout/mpris_control"
        android:layout_width="0dp"
        android:layout_height="match_parent"
--- a/res/layout-v23/pairing_explanation_not_trusted.xml
+++ b/res/layout-v23/pairing_explanation_not_trusted.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView 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="wrap_content"
    android:background="?attr/selectableItemBackground"
    android:clickable="false"
-    android:drawableStart="@drawable/ic_warning"
    android:drawablePadding="8dp"
-    android:drawableTint="?attr/colorControlNormal"
    android:paddingTop="16dp"
    android:paddingBottom="12dp"
-    android:text="@string/on_non_trusted_message">
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:text="@string/on_non_trusted_message"
+    app:drawableTint="?attr/colorControlNormal"
+    app:drawableStartCompat="@drawable/ic_warning">

 </TextView>
--- a/res/layout-v23/pairing_explanation_text_no_wifi.xml
+++ b/res/layout-v23/pairing_explanation_text_no_wifi.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView 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="wrap_content"
    android:background="?attr/selectableItemBackground"
    android:clickable="true"
-    android:drawableStart="@drawable/ic_wifi"
+    android:focusable="true"
    android:drawablePadding="8dp"
-    android:drawableTint="?attr/colorControlNormal"
    android:paddingTop="16dp"
    android:paddingBottom="12dp"
-    android:text="@string/no_wifi">
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:text="@string/no_wifi"
+    app:drawableStartCompat="@drawable/ic_wifi"
+    app:drawableTint="?attr/colorControlNormal">

 </TextView>
--- a/res/layout/about_person_list_item_entry.xml
+++ b/res/layout/about_person_list_item_entry.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout 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="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:paddingStart="4dp"
+    android:paddingLeft="4dp"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingRight="?android:attr/scrollbarSize">
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/about_person_list_item_entry_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textSize="17sp"
+            tools:text="Konqi Konqueror" />
+
+        <TextView
+            android:id="@+id/about_person_list_item_entry_task"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:visibility="gone"
+            tools:text="Developer"
+            tools:visibility="visible" />
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/about_person_list_item_entry_visit_homepage_button"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginEnd="@dimen/default_gap"
+        android:layout_marginRight="@dimen/default_gap"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/visit_contributors_homepage"
+        android:src="@drawable/ic_baseline_web_24"
+        android:visibility="gone"
+        app:tint="@color/text_color"
+        tools:visibility="visible" />
+
+    <ImageButton
+        android:id="@+id/about_person_list_item_entry_email_button"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginRight="4dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/email_contributor"
+        android:src="@drawable/ic_baseline_send_24"
+        android:visibility="gone"
+        app:tint="@color/text_color"
+        tools:visibility="visible" />
+</LinearLayout>
--- a/res/layout/activity_about_kde.xml
+++ b/res/layout/activity_about_kde.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.kde.kdeconnect.UserInterface.About.AboutKDEActivity">
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <LinearLayout
+            android:id="@+id/about_layout"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:drawablePadding="8dp"
+                android:gravity="center_vertical"
+                android:layout_margin="24dp"
+                android:text="@string/kde_be_free"
+                android:textAppearance="?attr/textAppearanceHeadline6"
+                app:drawableLeftCompat="@drawable/ic_kde_48dp"
+                app:drawableStartCompat="@drawable/ic_kde_48dp"
+                app:drawableTint="@color/text_color" />
+
+            <com.google.android.material.card.MaterialCardView
+                xmlns:card_view="https://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginRight="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_marginBottom="12dp"
+                card_view:cardBackgroundColor="@color/card_stroke_color"
+                card_view:cardCornerRadius="12dp"
+                card_view:cardElevation="5dp"
+                card_view:cardUseCompatPadding="true">
+
+                <TextView
+                    android:id="@+id/about_text_view"
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:padding="12dp"
+                    android:textIsSelectable="true"
+                    tools:text="@string/about_kde_about" />
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                xmlns:card_view="https://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginRight="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_marginBottom="12dp"
+                card_view:cardBackgroundColor="@color/card_stroke_color"
+                card_view:cardCornerRadius="12dp"
+                card_view:cardElevation="5dp"
+                card_view:cardUseCompatPadding="true">
+
+                <TextView
+                    android:id="@+id/report_bugs_or_wishes_text_view"
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:padding="12dp"
+                    android:textIsSelectable="true"
+                    tools:text="@string/about_kde_report_bugs_or_wishes" />
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                xmlns:card_view="https://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginRight="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_marginBottom="12dp"
+                card_view:cardBackgroundColor="@color/card_stroke_color"
+                card_view:cardCornerRadius="12dp"
+                card_view:cardElevation="5dp"
+                card_view:cardUseCompatPadding="true">
+
+                <TextView
+                    android:id="@+id/join_kde_text_view"
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:padding="12dp"
+                    android:textIsSelectable="true"
+                    tools:text="@string/about_kde_join_kde" />
+            </com.google.android.material.card.MaterialCardView>
+
+            <com.google.android.material.card.MaterialCardView
+                xmlns:card_view="https://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginRight="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_marginBottom="12dp"
+                card_view:cardBackgroundColor="@color/card_stroke_color"
+                card_view:cardCornerRadius="12dp"
+                card_view:cardElevation="5dp"
+                card_view:cardUseCompatPadding="true">
+
+                <TextView
+                    android:id="@+id/support_kde_text_view"
+                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:padding="12dp"
+                    android:textIsSelectable="true"
+                    tools:text="@string/about_kde_support_kde" />
+            </com.google.android.material.card.MaterialCardView>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="256dp"
+                android:layout_gravity="center"
+                android:contentDescription="@string/konqi"
+                android:paddingBottom="12dp"
+                android:src="@drawable/konqi" />
+        </LinearLayout>
+    </ScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_bigscreen.xml
+++ b/res/layout/activity_bigscreen.xml
@@ -1,77 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.gridlayout.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:grid="http://schemas.android.com/apk/res-auto"
+<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"
    android:layout_height="match_parent"
-    grid:useDefaultMargins="true">
+    tools:context="org.kde.kdeconnect.Plugins.BigscreenPlugin.BigscreenActivity">

-    <ImageButton
-        android:id="@+id/home_button"
-        grid:layout_column="0"
-        grid:layout_row="0"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_home"
-        android:src="@drawable/ic_home_black_24dp"
-        android:theme="@style/DisableableButton" />
+    <include
+        android:id="@+id/toolbar_layout"
+        layout="@layout/toolbar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />

-    <ImageButton
-        android:id="@+id/up_button"
-        grid:layout_column="1"
-        grid:layout_row="0"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_up"
-        android:src="@drawable/ic_arrow_upward_black_24dp"
-        android:theme="@style/DisableableButton" />
+    <org.kde.kdeconnect.UserInterface.Utils.RoundedConstraintLayout
+        android:id="@+id/rConstraintLayout"

-    <ImageButton
-        android:id="@+id/mic_button"
-        grid:layout_column="2"
-        grid:layout_columnWeight="1"
-        grid:layout_row="0"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_mic"
-        android:src="@drawable/ic_mic_black"
-        android:theme="@style/DisableableButton" />
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_margin="24dp"

-    <ImageButton
-        android:id="@+id/left_button"
-        grid:layout_column="0"
-        grid:layout_row="1"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_left"
-        android:src="@drawable/ic_arrow_back_black_24dp"
-        android:theme="@style/DisableableButton" />
+        app:layout_constraintBottom_toTopOf="@+id/rLinearLayout"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_layout">

-    <ImageButton
-        android:id="@+id/select_button"
-        grid:layout_column="1"
-        grid:layout_row="1"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_select"
-        android:src="@drawable/ic_keyboard_return_black_24dp"
-        android:theme="@style/DisableableButton" />
+        <androidx.gridlayout.widget.GridLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/disabled_grey"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">

-    <ImageButton
-        android:id="@+id/right_button"
-        grid:layout_column="2"
-        grid:layout_row="1"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_right"
-        android:src="@drawable/ic_arrow_forward_black_24dp"
-        android:theme="@style/DisableableButton" />
+            <ImageButton
+                android:id="@+id/up_button"
+                android:contentDescription="@string/bigscreen_up"
+                android:src="@drawable/ic_baseline_keyboard_arrow_up_24"
+                android:theme="@style/TransparentButton"
+                app:layout_column="1"
+                app:layout_columnWeight="1"
+                app:layout_row="0"
+                app:layout_rowWeight="1" />

-    <ImageButton
-        android:id="@+id/down_button"
-        grid:layout_column="1"
-        grid:layout_row="2"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_down"
-        android:src="@drawable/ic_arrow_downward_black_24dp"
-        android:theme="@style/DisableableButton"  />
-</androidx.gridlayout.widget.GridLayout>
+            <ImageButton
+                android:id="@+id/left_button"
+                android:contentDescription="@string/bigscreen_left"
+                android:src="@drawable/ic_baseline_keyboard_arrow_left_24"
+                android:theme="@style/TransparentButton"
+                app:layout_column="0"
+                app:layout_columnWeight="1"
+                app:layout_row="1"
+                app:layout_rowWeight="1" />
+
+            <ImageButton
+                android:id="@+id/select_button"
+                style="@style/CircleButton"
+                android:contentDescription="@string/bigscreen_select"
+                app:layout_column="1"
+                app:layout_columnWeight="2"
+                app:layout_row="1"
+                app:layout_rowWeight="2" />
+
+            <ImageButton
+                android:id="@+id/right_button"
+                android:contentDescription="@string/bigscreen_right"
+                android:src="@drawable/ic_baseline_keyboard_arrow_right_24"
+                android:theme="@style/TransparentButton"
+                app:layout_column="2"
+                app:layout_columnWeight="1"
+                app:layout_row="1"
+                app:layout_rowWeight="1" />
+
+            <ImageButton
+                android:id="@+id/down_button"
+                android:contentDescription="@string/bigscreen_down"
+                android:src="@drawable/ic_baseline_keyboard_arrow_down_24"
+                android:theme="@style/TransparentButton"
+                app:layout_column="1"
+                app:layout_columnWeight="1"
+                app:layout_row="2"
+                app:layout_rowWeight="1" />
+
+        </androidx.gridlayout.widget.GridLayout>
+
+    </org.kde.kdeconnect.UserInterface.Utils.RoundedConstraintLayout>
+
+    <LinearLayout
+        android:id="@+id/rLinearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="32dp"
+
+        android:orientation="horizontal"
+
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/rConstraintLayout">
+
+        <ImageButton
+            android:id="@+id/home_button"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:contentDescription="@string/bigscreen_home"
+            android:src="@drawable/ic_home_black_24dp"
+            android:theme="@style/DisableableButton"/>
+
+        <ImageButton
+            android:id="@+id/mic_button"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:contentDescription="@string/bigscreen_mic"
+            android:src="@drawable/ic_mic_black"
+            android:theme="@style/DisableableButton"/>
+
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/activity_compose_send.xml
+++ b/res/layout/activity_compose_send.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <EditText
+        android:id="@+id/compose"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="16dp"
+        android:ems="10"
+        android:hint="@string/click_here_to_type"
+        android:imeActionLabel="@string/send_compose"
+        android:imeOptions="actionSend|actionDone"
+        android:importantForAutofill="no"
+        android:inputType="textLongMessage|textMultiLine"
+        android:isScrollContainer="true"
+        android:saveEnabled="true"
+        android:scrollbars="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout2"
+        app:layout_constraintVertical_bias="1.0"
+        tools:ignore="SpeakableTextPresentCheck,TextContrastCheck" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/activity_custom_devices.xml
+++ b/res/layout/activity_custom_devices.xml
@@ -1,36 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <androidx.coordinatorlayout.widget.CoordinatorLayout
    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"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.kde.kdeconnect.UserInterface.CustomDevicesActivity">

-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        tools:listitem="@layout/custom_device_item"/>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

-    <TextView
-        android:id="@+id/emptyListMessage"
-        style="@style/TextAppearance.AppCompat.Medium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:gravity="center_horizontal"
-        android:text="@string/custom_device_list_help"
-        />
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:listitem="@layout/custom_device_item"/>

-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingActionButton"
-        style="@style/KdeConnectThemeBase"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:elevation="@dimen/fab_elevation"
-        android:src="@drawable/ic_add"/>
+        <TextView
+            android:id="@+id/emptyListMessage"
+            style="@style/TextAppearance.AppCompat.Medium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:gravity="center_horizontal"
+            android:text="@string/custom_device_list_help"
+            />
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/floatingActionButton"
+            style="@style/KdeConnectThemeBase"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="@dimen/fab_margin"
+            app:elevation="@dimen/fab_elevation"
+            android:src="@drawable/ic_add"/>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_device.xml
+++ b/res/layout/activity_device.xml
@@ -1,113 +1,68 @@
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical"
    tools:context="org.kde.kdeconnect.UserInterface.DeviceFragment">

-    <LinearLayout
-        android:id="@+id/pairing_buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        android:padding="@dimen/activity_vertical_margin"
-        android:visibility="gone">
-
-        <ProgressBar
-            android:id="@+id/pair_progress"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"/>
-
-        <TextView
-            android:id="@+id/pair_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dip"
-            android:text="@string/device_not_paired"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <Button
-            android:id="@+id/pair_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/button_round"
-            android:text="@string/request_pairing"
-            android:textColor="@android:color/white"/>
-
-
-        <LinearLayout
-            android:id="@+id/pair_request_buttons"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone">
-
-            <Button
-                android:id="@+id/accept_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:layout_weight="1"
-                android:background="@drawable/button_round"
-                android:text="@string/pairing_accept"
-                android:textColor="@android:color/white"/>
-
-            <Button
-                android:id="@+id/reject_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:layout_weight="1"
-                android:background="@drawable/button_round"
-                android:text="@string/pairing_reject"
-                android:textColor="@android:color/white"/>
-
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/error_message_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:padding="16dp"
-        android:visibility="gone">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/error_message_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:paddingEnd="8dip"
-            android:paddingLeft="0dip"
-            android:paddingRight="8dip"
-            android:paddingStart="0dip"
-            android:src="@drawable/ic_error_outline_48dp"
-            app:tint="?attr/colorHighContrast"
-            tools:ignore="UnusedAttribute"/>
-
-        <TextView
-            android:id="@+id/not_reachable_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/unreachable_description"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="gone" />
-    </LinearLayout>
+    <!-- Layout shown when device is reachable but not yet paired -->
+    <include
+        android:id="@+id/pair_request"
+        layout="@layout/view_pair_request"
+        tools:visibility="gone"/>

+    <!-- Layout shown when we can't pair with device or device is not reachable -->
+    <include
+        android:id="@+id/pair_error"
+        layout="@layout/view_pair_error"
+        tools:visibility="gone"/>

+    <!-- Layout shown when device is paired and reachable -->
    <ListView
        android:id="@+id/buttons_list"
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
        android:fillViewport="true"
-        android:divider="@drawable/list_divider"
        tools:context=".DeviceActivity"
-        tools:listitem="@layout/list_item_with_icon_entry"/>
+        tools:listitem="@layout/list_item_with_icon_entry"
+        android:layout_weight=".8"
+        android:divider="@null"
+        android:dividerHeight="0dp" />
+
+    <!-- Extra information about the current device -->
+    <RelativeLayout
+        android:id="@+id/view_status_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:elevation="4dp"
+        android:padding="8dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:ignore="UnusedAttribute">
+
+        <TextView
+            android:id="@+id/view_status_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:padding="4dp"
+            android:text="@string/view_status_title"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5"
+            />
+
+        <CheckedTextView
+            android:id="@+id/view_battery_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/view_status_title"
+            android:checkMark="@null"
+            android:clickable="false"
+            android:padding="4dp"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+            android:text="@string/battery_status_unknown"
+            tools:text="100%"
+            />
+
+    </RelativeLayout>
 </LinearLayout>
--- a/res/layout/activity_easter_egg.xml
+++ b/res/layout/activity_easter_egg.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/easter_egg_layout"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#1d99f3"
+    android:gravity="center">
+
+    <ImageView
+        android:id="@+id/logo"
+        android:layout_width="396dp"
+        android:layout_height="396dp"
+        android:src="@drawable/ic_kde_48dp"
+        android:contentDescription="@string/easter_egg" />
+
+    <TextView
+        android:id="@+id/angle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@android:color/white"
+        tools:text="90°"/>
+</LinearLayout>
--- a/res/layout/activity_find_my_phone.xml
+++ b/res/layout/activity_find_my_phone.xml
@@ -1,23 +1,33 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
+    xmlns:tools="http://schemas.android.com/tools"
    tools:context="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhoneActivity">

+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />

-    <Button
-        android:id="@+id/bFindMyPhone"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:text="@string/findmyphone_found"
-        android:textSize="50sp" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

+        <Button
+            android:id="@+id/bFindMyPhone"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:text="@string/findmyphone_found"
+            android:textSize="50sp" />

-</RelativeLayout>
+    </RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_licenses.xml
+++ b/res/layout/activity_licenses.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context="org.kde.kdeconnect.UserInterface.About.LicensesActivity">
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/licenses_text"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -12,17 +12,7 @@
        android:layout_width="match_parent"
        tools:context="org.kde.kdeconnect.UserInterface.MainActivity">

-        <com.google.android.material.appbar.AppBarLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:elevation="8dp"/>
-        </com.google.android.material.appbar.AppBarLayout>
+        <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />

        <FrameLayout
            android:id="@+id/container"
@@ -37,7 +27,6 @@
        android:layout_width="wrap_content"
        android:layout_height="match_parent"
        android:layout_gravity="start"
-        app:headerLayout="@layout/nav_header"
-        style="?attr/mainNavigationViewStyle" />
+        app:headerLayout="@layout/nav_header" />

 </androidx.drawerlayout.widget.DrawerLayout>
--- a/res/layout/activity_mousepad.xml
+++ b/res/layout/activity_mousepad.xml
@@ -1,25 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>

-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/mousepad_view"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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:keepScreenOn="true"
-    android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity">

-    <TextView
-        style="@android:style/TextAppearance.Medium"
+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />
+
+    <RelativeLayout
+        android:id="@+id/mousepad_view"
        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:gravity="center"
-        android:padding="12dip"
-        android:text="@string/mousepad_info" />
+        android:layout_height="match_parent"
+        android:keepScreenOn="true"
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

-    <view
-        android:id="@+id/keyListener"
-        class="org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        <TextView
+            style="@android:style/TextAppearance.Medium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:gravity="center"
+            android:padding="12dip"
+            android:text="@string/mousepad_info" />

-</RelativeLayout>
+        <view
+            android:id="@+id/keyListener"
+            class="org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </RelativeLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_mpris.xml
+++ b/res/layout/activity_mpris.xml
@@ -1,31 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="15dp"
-    android:paddingLeft="25dp"
-    android:paddingRight="25dp"
-    android:paddingTop="25dp">
+    tools:context="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity">

-    <ImageView
-        android:id="@+id/album_art"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginBottom="25dp"
-        android:layout_weight="4"
-        android:contentDescription="@string/mpris_coverart_description"
-        android:scaleType="fitCenter" />
-
-    <include
-        layout="@layout/mpris_control"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <fragment android:name="org.kde.kdeconnect.Plugins.SystemvolumePlugin.SystemvolumeFragment"
-        android:id="@+id/systemvolume_fragment"
+    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"/>
+        android:elevation="8dp"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar">

-</LinearLayout>
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/mpris_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/toolbar_color"
+            app:tabIndicatorColor="?android:textColorPrimary"
+            app:tabSelectedTextColor="?android:textColorPrimary" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/mpris_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_notification_filter.xml
+++ b/res/layout/activity_notification_filter.xml
@@ -1,31 +1,55 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools"
    tools:context="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity">

-    <TextView
-        android:id="@+id/tFilter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingBottom="16dp"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:text="@string/filter_apps_info" />
+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />

-    <ProgressBar
-        android:id="@+id/spinner"
+    <LinearLayout
        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="64dip" />
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

-    <ListView
-        android:id="@+id/lvFilterApps"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:visibility="gone" />
+        <com.google.android.material.switchmaterial.SwitchMaterial
+            android:id="@+id/smScreenOffNotification"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingBottom="16dp"
+            android:text="@string/show_notification_if_screen_off" />

-</LinearLayout>
+        <TextView
+            android:id="@+id/tFilter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingBottom="16dp"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin"
+            android:text="@string/filter_apps_info" />
+
+        <ProgressBar
+            android:id="@+id/spinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="64dip" />
+
+        <ListView
+            android:id="@+id/lvFilterApps"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:visibility="gone"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="4dp" />
+
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_plugin_settings.xml
+++ b/res/layout/activity_plugin_settings.xml
@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>

-<FrameLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragmentPlaceHolder"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.kde.kdeconnect.UserInterface.PluginSettingsActivity">
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />
+
+    <FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/fragmentPlaceHolder"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_presenter.xml
+++ b/res/layout/activity_presenter.xml
@@ -1,63 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/mpris_control_view"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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:padding="12dp"
-    android:orientation="vertical">
-
-    <TextView
-        style="@android:style/TextAppearance.Medium"
-        android:id="@+id/textView"
-        android:layout_weight="0"
-        android:layout_marginBottom="6dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/presenter_lock_tip" />
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.kde.kdeconnect.Plugins.PresenterPlugin.PresenterActivity">

+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />

    <LinearLayout
+        android:id="@+id/mpris_control_view"
        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginBottom="6dp"
-        android:orientation="horizontal"
-        android:layout_weight="1">
+        android:layout_height="match_parent"
+        android:padding="12dp"
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

-        <ImageButton
-            android:id="@+id/previous_button"
+        <TextView
+            style="@android:style/TextAppearance.Medium"
+            android:id="@+id/textView"
+            android:layout_weight="0"
+            android:layout_marginBottom="6dp"
            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:contentDescription="@string/mpris_rew"
-            android:layout_weight="0.25"
-            android:layout_marginRight="3dp"
-            android:layout_marginEnd="3dp"
-            android:src="@drawable/ic_previous_black"
+            android:layout_height="wrap_content"
+            android:text="@string/presenter_lock_tip" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="6dp"
+            android:orientation="horizontal"
+            android:layout_weight="1">
+
+            <ImageButton
+                android:id="@+id/previous_button"
+                android:layout_width="match_parent"
+                android:layout_height="fill_parent"
+                android:contentDescription="@string/mpris_rew"
+                android:layout_weight="0.25"
+                android:layout_marginRight="3dp"
+                android:layout_marginEnd="3dp"
+                android:src="@drawable/ic_previous_black"
+                android:theme="@style/DisableableButton" />
+
+            <ImageButton
+                android:id="@+id/next_button"
+                android:layout_width="match_parent"
+                android:layout_height="fill_parent"
+                android:layout_marginLeft="3dp"
+                android:layout_marginStart="3dp"
+                android:layout_weight="0.25"
+                android:contentDescription="@string/mpris_ff"
+                android:src="@drawable/ic_next_black"
+                android:theme="@style/DisableableButton" />
+
+        </LinearLayout>
+
+
+        <Button
+            android:id="@+id/pointer_button"
+            android:layout_width="match_parent"
+            android:layout_marginBottom="6dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.30"
+            android:visibility="gone"
+            android:text="@string/presenter_pointer"
            android:theme="@style/DisableableButton" />

-        <ImageButton
-            android:id="@+id/next_button"
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
-            android:layout_marginLeft="3dp"
-            android:layout_marginStart="3dp"
-            android:layout_weight="0.25"
-            android:contentDescription="@string/mpris_ff"
-            android:src="@drawable/ic_next_black"
-            android:theme="@style/DisableableButton" />

    </LinearLayout>
-
-
-    <Button
-        android:id="@+id/pointer_button"
-        android:layout_width="match_parent"
-        android:layout_marginBottom="6dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="0.30"
-        android:visibility="gone"
-        android:text="@string/presenter_pointer"
-        android:theme="@style/DisableableButton" />
-
-
-</LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_run_command.xml
+++ b/res/layout/activity_run_command.xml
@@ -1,36 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout 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">
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandActivity">

-    <ListView
-        android:id="@+id/run_commands_list"
+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:layout_margin="4dp"
-        android:addStatesFromChildren="true"
-        android:orientation="vertical" />
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">

-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/add_command_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:src="@drawable/ic_action_image_edit_24dp"
-        app:backgroundTint="@color/primary"
-        app:layout_anchor="@id/run_commands_list"
-        app:layout_anchorGravity="bottom|end" />
+        <ListView
+            android:id="@+id/run_commands_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="4dp"
+            android:addStatesFromChildren="true"
+            android:orientation="vertical"
+            android:divider="@null"
+            android:dividerHeight="0dp" />

-    <TextView
-        android:id="@+id/add_comand_explanation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:padding="30dp"
-        android:text="@string/addcommand_explanation"
-        android:textAlignment="center"
-        android:textSize="16sp" />
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/add_command_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            android:src="@drawable/ic_action_image_edit_24dp"
+            app:backgroundTint="@color/primary"
+            app:layout_anchor="@id/run_commands_list"
+            app:layout_anchorGravity="bottom|end" />

+        <TextView
+            android:id="@+id/add_comand_explanation"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="30dp"
+            android:text="@string/addcommand_explanation"
+            android:textAlignment="center"
+            android:textSize="16sp" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_sendkeystrokes.xml
+++ b/res/layout/activity_sendkeystrokes.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.kde.kdeconnect.Plugins.MousePadPlugin.SendKeystrokesToHostActivity">
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />
+
+    <LinearLayout
+        android:id="@+id/sendkeystrokes_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:keepScreenOn="true"
+        android:orientation="vertical"
+        android:descendantFocusability="beforeDescendants"
+        android:focusableInTouchMode="true"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="4dp"
+            android:layout_margin="4dp"
+            app:errorEnabled="true">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/textToSend"
+                style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:cursorVisible="true"
+                android:hint="@string/sendkeystrokes_textbox_hint"
+                android:inputType="text"
+                android:lines="1"
+                android:maxLines="1"
+                android:scrollHorizontally="true"
+                android:text="" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <ListView
+            android:id="@+id/devices_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:addStatesFromChildren="true"
+            android:divider="@null"
+            android:dividerHeight="0dp"
+            android:orientation="vertical"
+            android:paddingTop="8dp"
+            tools:context=".MainActivity" />
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_share.xml
+++ b/res/layout/activity_share.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.kde.kdeconnect.Plugins.SharePlugin.ShareActivity">
+
+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent">
+
+        <include
+            layout="@layout/devices_list"
+            android:id="@+id/devices_list_layout" />
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/devices_list.xml
+++ b/res/layout/devices_list.xml
@@ -13,8 +13,6 @@
        android:divider="@null"
        android:dividerHeight="0dp"
        android:orientation="vertical"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
        tools:context=".MainActivity" />

 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
--- a/res/layout/fragment_about.xml
+++ b/res/layout/fragment_about.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:fillViewport="true">
+
+    <LinearLayout
+        android:id="@+id/about_layout"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.card.MaterialCardView
+            xmlns:card_view="https://schemas.android.com/apk/res-auto"
+            android:id="@+id/general_info_card"
+            android:background="?android:attr/selectableItemBackground"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            card_view:cardBackgroundColor="@color/card_stroke_color"
+            card_view:cardCornerRadius="12dp"
+            card_view:cardElevation="5dp"
+            card_view:cardUseCompatPadding="true">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="12dp">
+
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent">
+
+                    <ImageView
+                        android:id="@+id/app_icon"
+                        android:layout_width="52dp"
+                        android:layout_height="52dp"
+                        android:layout_gravity="top"
+                        android:paddingTop="@dimen/nav_header_vertical_spacing"
+                        android:paddingBottom="4dp"
+                        android:contentDescription="@string/kde_connect"
+                        tools:src="@drawable/icon" />
+
+                    <LinearLayout
+                        android:orientation="vertical"
+                        android:layout_gravity="center_vertical"
+                        android:layout_height="wrap_content"
+                        android:layout_width="match_parent">
+
+                        <TextView
+                            android:id="@+id/app_name"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            tools:text="Application Name"
+                            android:textAppearance="?attr/textAppearanceHeadline6" />
+
+                        <TextView
+                            android:id="@+id/app_version"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            tools:text="Version 1.xy.z" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/app_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textIsSelectable="true"
+                    android:layout_margin="12dp"
+                    tools:text="Application Description" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+
+        <org.kde.kdeconnect.UserInterface.About.AutoGridLayout
+            android:id="@+id/info_buttons_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:columnCount="3"
+            app:columnWidth="84dp"
+            app:changeColumnCountIfTheyHaveOnlyOneElement="true">
+
+            <FrameLayout
+                android:id="@+id/report_bug_button"
+                style="@style/AboutButton">
+
+                <TextView
+                    android:text="@string/report_bug"
+                    app:drawableTopCompat="@drawable/ic_baseline_bug_report_24"
+                    style="@style/AboutButton.TextView" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/donate_button"
+                style="@style/AboutButton">
+
+                <TextView
+                    android:text="@string/donate"
+                    app:drawableTopCompat="@drawable/ic_baseline_attach_money_24"
+                    style="@style/AboutButton.TextView" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/source_code_button"
+                style="@style/AboutButton">
+
+                <TextView
+                    android:text="@string/source_code"
+                    app:drawableTopCompat="@drawable/ic_baseline_code_24"
+                    style="@style/AboutButton.TextView" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/licenses_button"
+                style="@style/AboutButton">
+
+                <TextView
+                    android:text="@string/licenses"
+                    app:drawableTopCompat="@drawable/ic_baseline_gavel_24"
+                    style="@style/AboutButton.TextView" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/about_kde_button"
+                style="@style/AboutButton">
+
+                <TextView
+                    android:text="@string/about_kde"
+                    app:drawableTopCompat="@drawable/ic_kde_24dp"
+                    style="@style/AboutButton.TextView" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:id="@+id/website_button"
+                style="@style/AboutButton">
+
+                <TextView
+                    android:text="@string/website"
+                    app:drawableTopCompat="@drawable/ic_baseline_web_24"
+                    style="@style/AboutButton.TextView" />
+            </FrameLayout>
+        </org.kde.kdeconnect.UserInterface.About.AutoGridLayout>
+
+        <com.google.android.material.card.MaterialCardView
+            xmlns:card_view="https://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            card_view:cardBackgroundColor="@color/card_stroke_color"
+            card_view:cardCornerRadius="12dp"
+            card_view:cardElevation="5dp"
+            card_view:cardUseCompatPadding="true">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_gravity="center_vertical"
+                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:padding="12dp">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/authors"
+                    android:textAppearance="?attr/textAppearanceHeadline6" />
+
+                <org.kde.kdeconnect.UserInterface.About.AdapterLinearLayout
+                    android:id="@+id/authors_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="0dp" />
+
+                <TextView
+                    android:id="@+id/authors_footer_text"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:textSize="14sp"
+                    android:layout_marginTop="8dp"
+                    android:paddingStart="4dp"
+                    android:paddingLeft="4dp"
+                    tools:text="Everyone else who has contributed to KDE Connect over the years"
+                    tools:ignore="RtlSymmetry" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+    </LinearLayout>
+</ScrollView>
--- a/res/layout/list_item_category.xml
+++ b/res/layout/list_item_category.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
    android:orientation="vertical">

    <TextView
@@ -9,14 +10,11 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="8dp"
-        android:drawableBottom="@drawable/text_section_header"
        android:drawablePadding="4dp"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
-        android:textAllCaps="true"
-        android:textColor="?android:textColorSecondary"
-        android:textSize="14sp"
-        android:textStyle="bold" />
+        android:paddingLeft="16dip"
+        android:paddingRight="16dip"
+        android:textSize="16sp"
+        tools:text="Header" />

    <TextView
        android:id="@+id/list_item_category_empty_placeholder"
--- a/res/layout/list_item_entry.xml
+++ b/res/layout/list_item_entry.xml
@@ -3,7 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
-    android:background="@drawable/abc_list_selector_holo_dark"
+    android:background="?android:attr/selectableItemBackground"
    android:baselineAligned="false"
    android:gravity="center_vertical"
    android:minHeight="?android:attr/listPreferredItemHeight"
@@ -13,8 +13,6 @@
    android:paddingRight="?android:attr/scrollbarSize"
    android:paddingStart="12dip"
    android:id="@+id/list_item_entry">
-    <!-- We should use android:background="@android:/listChoiceBackgroundIndicator"
-         instead of abc_list_selector_holo_dark but that's only supported from API11 -->

    <TextView
        android:id="@+id/list_item_entry_title"
--- a/res/layout/list_item_systemvolume.xml
+++ b/res/layout/list_item_systemvolume.xml
@@ -1,44 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView 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/sink_card"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/systemvolume_label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+    android:layout_height="wrap_content"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="0dp"
+    app:contentPadding="8dp"
+    app:strokeColor="@color/card_stroke_color"
+    app:strokeWidth="1dp">

    <LinearLayout
-        android:id="@+id/systemvolume_layout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="8dip"
-        android:orientation="horizontal">
+        android:gravity="center"
+        android:orientation="vertical">

-        <ImageButton
-            android:id="@+id/systemvolume_mute"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:background="@android:color/transparent"
-            android:contentDescription="@string/mute"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_volume_black"
-            app:tint="?attr/colorHighContrast" />
+        <RadioButton
+            android:id="@+id/systemvolume_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:paddingLeft="14dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            tools:text="Device name" />

-        <SeekBar
-            android:id="@+id/systemvolume_seek"
-            android:layout_width="0dp"
+        <LinearLayout
+            android:id="@+id/systemvolume_layout"
+            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:max="100" />
+            android:layout_marginTop="8dip"
+            android:orientation="horizontal">

+            <ImageButton
+                android:id="@+id/systemvolume_mute"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:background="@android:color/transparent"
+                android:contentDescription="@string/mute"
+                android:scaleType="fitXY"
+                android:src="@drawable/ic_volume_black"
+                app:tint="?attr/colorHighContrast" />
+
+            <SeekBar
+                android:id="@+id/systemvolume_seek"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:max="100" />
+
+        </LinearLayout>
    </LinearLayout>
-
-
-</LinearLayout>
+</com.google.android.material.card.MaterialCardView>
--- a/res/layout/list_item_with_icon_entry.xml
+++ b/res/layout/list_item_with_icon_entry.xml
@@ -3,9 +3,10 @@
 <LinearLayout
    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="wrap_content"
-    android:background="@drawable/abc_list_selector_holo_dark"
+    android:background="?android:attr/selectableItemBackground"
    android:baselineAligned="false"
    android:gravity="center_vertical"
    android:minHeight="?android:attr/listPreferredItemHeight"
@@ -40,7 +41,9 @@
                android:fadingEdge="horizontal"
                android:singleLine="true"
                android:text=""
-                android:textAppearance="?android:attr/textAppearanceMedium"/>
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                tools:maxLength="20"
+                tools:text="@tools:sample/lorem/random"/>

            <TextView
                android:id="@+id/list_item_entry_summary"
@@ -52,8 +55,10 @@
                android:text=""
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="#CC2222"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                tools:text="Other (optional) info"
+                tools:visibility="visible"/>

        </LinearLayout>

-    </LinearLayout>
+</LinearLayout>
--- a/res/layout/mouse_receiver_cursor.xml
+++ b/res/layout/mouse_receiver_cursor.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/mouse_cursor"
+        android:src="@drawable/mouse_pointer" />
+</RelativeLayout>
--- a/res/layout/mpris_control.xml
+++ b/res/layout/mpris_control.xml
@@ -36,18 +36,56 @@
        android:singleLine="true"
        android:textAppearance="?android:attr/textAppearanceMedium" />

-    <ImageButton
-        android:id="@+id/play_button"
-        android:layout_width="fill_parent"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
        android:layout_height="75dp"
        android:layout_gravity="center"
-        android:layout_weight="0"
-        android:adjustViewBounds="false"
-        android:baselineAlignBottom="true"
-        android:clickable="false"
-        android:contentDescription="@string/mpris_play"
-        android:src="@drawable/ic_play_black"
-        android:theme="@style/DisableableButton" />
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/loop_button"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:adjustViewBounds="false"
+            android:baselineAlignBottom="true"
+            android:clickable="false"
+            android:contentDescription="@string/mpris_loop"
+            android:src="@drawable/ic_loop_none_black"
+            android:theme="@style/DisableableButton"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_percent="0.20" />
+
+        <ImageButton
+            android:id="@+id/play_button"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:adjustViewBounds="false"
+            android:baselineAlignBottom="true"
+            android:clickable="false"
+            android:contentDescription="@string/mpris_play"
+            android:src="@drawable/ic_play_black"
+            android:theme="@style/DisableableButton"
+            app:layout_constraintEnd_toStartOf="@id/shuffle_button"
+            app:layout_constraintStart_toEndOf="@id/loop_button"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageButton
+            android:id="@+id/shuffle_button"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:adjustViewBounds="false"
+            android:baselineAlignBottom="true"
+            android:clickable="false"
+            android:contentDescription="@string/mpris_shuffle"
+            android:src="@drawable/ic_shuffle_off_black"
+            android:theme="@style/DisableableButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintWidth_percent="0.20" />
+    </androidx.constraintlayout.widget.ConstraintLayout>

    <LinearLayout
        android:layout_width="match_parent"
--- a/res/layout/mpris_now_playing.xml
+++ b/res/layout/mpris_now_playing.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingHorizontal="@dimen/activity_horizontal_margin"
+    android:paddingVertical="@dimen/activity_vertical_margin">
+
+    <ImageView
+        android:id="@+id/album_art"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginBottom="25dp"
+        android:layout_weight="4"
+        android:contentDescription="@string/mpris_coverart_description"
+        android:scaleType="fitCenter" />
+
+    <include
+        android:id="@+id/mpris_control"
+        layout="@layout/mpris_control"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
--- a/res/layout/nav_header.xml
+++ b/res/layout/nav_header.xml
@@ -1,36 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="160dp"
-    android:background="@drawable/drawer_header"
-    android:gravity="bottom"
-    android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:fitsSystemWindows="true">

-    <TextView
-        android:id="@+id/kdeconnect_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingEnd="48dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="48dp"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:text="@string/kde_connect"
-        android:textColor="#FFF"
-        android:textStyle="bold" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/nav_header_horizontal_margin"
+        android:paddingLeft="@dimen/nav_header_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingEnd="@dimen/nav_header_horizontal_margin"
+        android:paddingRight="@dimen/nav_header_horizontal_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin">

-    <TextView
-        android:id="@+id/device_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="0dp"
-        android:paddingBottom="16dp"
-        android:paddingEnd="48dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="48dp"
-        android:paddingStart="16dp"
-        android:paddingTop="4dp"
-        android:text="My device"
-        android:textColor="#fff" />
+        <ImageView
+            android:id="@+id/device_type"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_gravity="top"
+            android:paddingTop="@dimen/nav_header_vertical_spacing"
+            android:paddingBottom="4dp"
+            tools:srcCompat="@drawable/ic_device_phone_32dp" />

-</LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/kdeconnect_label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/kde_connect"
+                android:textAppearance="?attr/textAppearanceHeadline6" />
+
+            <TextView
+                android:id="@+id/device_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="@color/material_on_surface_emphasis_medium"
+                tools:text="My device" />
+        </LinearLayout>
+    </LinearLayout>
+</FrameLayout>
--- a/res/layout/pairing_explanation_not_trusted.xml
+++ b/res/layout/pairing_explanation_not_trusted.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView 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="wrap_content"
    android:background="?attr/selectableItemBackground"
    android:clickable="false"
-    android:drawableStart="@drawable/ic_warning"
-    android:drawableLeft="@drawable/ic_warning"
    android:drawablePadding="8dp"
    android:paddingTop="16dp"
    android:paddingBottom="12dp"
-    android:text="@string/on_non_trusted_message">
+    android:paddingLeft="16dip"
+    android:paddingRight="16dip"
+    android:text="@string/on_non_trusted_message"
+    app:drawableStartCompat="@drawable/ic_warning"
+    app:drawableLeftCompat="@drawable/ic_warning">

 </TextView>
--- a/res/layout/pairing_explanation_text.xml
+++ b/res/layout/pairing_explanation_text.xml
@@ -5,6 +5,8 @@
    android:layout_height="wrap_content"
    android:paddingTop="16dp"
    android:paddingBottom="12dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
    android:text="@string/pairing_description"
    android:clickable="false"
    android:background="@android:color/transparent"
--- a/res/layout/pairing_explanation_text_no_wifi.xml
+++ b/res/layout/pairing_explanation_text_no_wifi.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView 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="wrap_content"
    android:background="?attr/selectableItemBackground"
    android:clickable="true"
-    android:drawableStart="@drawable/ic_wifi"
-    android:drawableLeft="@drawable/ic_wifi"
+    android:focusable="true"
    android:drawablePadding="8dp"
    android:paddingTop="16dp"
    android:paddingBottom="12dp"
-    android:text="@string/no_wifi">
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:text="@string/no_wifi"
+    app:drawableStartCompat="@drawable/ic_wifi"
+    app:drawableLeftCompat="@drawable/ic_wifi">

 </TextView>
--- a/res/layout/preference_checkbox.xml
+++ b/res/layout/preference_checkbox.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <CheckBox
    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/checkbox"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:focusable="false"
    android:clickable="false"
+    tools:viewBindingIgnore="true"
    android:background="@null"/>
--- a/res/layout/system_volume_fragment.xml
+++ b/res/layout/system_volume_fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/audio_devices_recycler"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:orientation="vertical"
+    android:paddingHorizontal="@dimen/activity_horizontal_margin"
+    android:paddingVertical="@dimen/activity_vertical_margin">
+
+</androidx.recyclerview.widget.RecyclerView>
--- a/res/layout/toolbar.xml
+++ b/res/layout/toolbar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<com.google.android.material.appbar.AppBarLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:theme="@style/ThemeOverlay.AppCompat.ActionBar">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:elevation="8dp"
+        app:title="@string/kde_connect"/>
+</com.google.android.material.appbar.AppBarLayout>
--- a/res/layout/trusted_network_list.xml
+++ b/res/layout/trusted_network_list.xml
@@ -1,38 +1,51 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="org.kde.kdeconnect.UserInterface.TrustedNetworksActivity">

+    <include layout="@layout/toolbar" android:id="@+id/toolbar_layout" />

-    <CheckBox
+    <LinearLayout
+        android:id="@+id/trusted_networks_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <CheckBox
            android:text="@string/allow_all_networks_text"
            android:layout_width="match_parent"
            android:checked="true"
            android:layout_height="wrap_content"
            android:id="@+id/trust_all_networks_checkBox"/>

-    <TextView
+        <TextView
            android:id="@+id/trusted_network_list_empty"
            android:layout_width="fill_parent"
            android:layout_height="100dp"
            android:text="@string/empty_trusted_networks_list_text"
            android:gravity="center" />

-    <ListView
+        <ListView
            android:id="@android:id/list"
            android:layout_width="fill_parent"
            android:layout_height="0dp"
            android:layout_weight="1"/>


-    <Button
-        android:id="@android:id/button1"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone" />
+        <Button
+            android:id="@android:id/button1"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />

-</LinearLayout>
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/view_pair_error.xml
+++ b/res/layout/view_pair_error.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/error_message_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:padding="16dp"
+    android:visibility="gone"
+    tools:visibility="visible">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/error_message_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:importantForAccessibility="no"
+        android:paddingEnd="8dip"
+        android:paddingLeft="0dip"
+        android:paddingRight="8dip"
+        android:paddingStart="0dip"
+        android:src="@drawable/ic_error_outline_48dp"
+        app:tint="?attr/colorHighContrast"
+        tools:ignore="UnusedAttribute" />
+
+    <TextView
+        android:id="@+id/not_reachable_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:text="@string/unreachable_description"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:visibility="gone"
+        tools:visibility="visible" />
+</LinearLayout>
--- a/res/layout/view_pair_request.xml
+++ b/res/layout/view_pair_request.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/pairing_buttons"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:orientation="vertical"
+    android:padding="@dimen/activity_vertical_margin"
+    android:visibility="gone"
+    tools:visibility="visible">
+
+    <ProgressBar
+        android:id="@+id/pair_progress"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/pair_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dip"
+        android:text="@string/device_not_paired"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <TextView
+        android:id="@+id/pair_verification"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawablePadding="5dp"
+        android:drawableLeft="@drawable/ic_key"
+        android:drawableStart="@drawable/ic_key"
+        android:layout_marginBottom="8dip"
+        android:visibility="gone"
+        android:text=""
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <Button
+        android:id="@+id/pair_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/button_round"
+        android:text="@string/request_pairing"
+        android:textColor="@android:color/white" />
+
+
+    <LinearLayout
+        android:id="@+id/pair_request_buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone">
+
+        <Button
+            android:id="@+id/accept_button"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dip"
+            android:layout_weight="1"
+            android:background="@drawable/button_round"
+            android:text="@string/pairing_accept"
+            android:textColor="@android:color/white" />
+
+        <Button
+            android:id="@+id/reject_button"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dip"
+            android:layout_weight="1"
+            android:background="@drawable/button_round"
+            android:text="@string/pairing_reject"
+            android:textColor="@android:color/white" />
+
+    </LinearLayout>
+</LinearLayout>
--- a/res/layout/widget_remote_command_plugin_dialog.xml
+++ b/res/layout/widget_remote_command_plugin_dialog.xml
@@ -11,6 +11,8 @@
        android:layout_height="match_parent"
        android:layout_margin="4dp"
        android:addStatesFromChildren="true"
-        android:orientation="vertical" />
+        android:orientation="vertical"
+        android:divider="@null"
+        android:dividerHeight="0dp" />

 </LinearLayout>
--- a/res/menu/menu_compose_send.xml
+++ b/res/menu/menu_compose_send.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_send_compose"
+        android:icon="@android:drawable/ic_menu_send"
+        android:title="@string/send_compose"
+        kdeconnect:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/menu_clear_compose"
+        android:title="@string/clear_compose"
+        kdeconnect:showAsAction="always" />
+
+</menu>
--- a/res/menu/menu_licenses.xml
+++ b/res/menu/menu_licenses.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_rise_up"
+        android:icon="@drawable/ic_arrow_upward_black_24dp"
+        android:title="@string/rise_up"
+        android:iconTint="@color/text_color"
+        kdeconnect:showAsAction="ifRoom" />
+
+    <item
+        android:id="@+id/menu_rise_down"
+        android:icon="@drawable/ic_arrow_downward_black_24dp"
+        android:title="@string/rise_down"
+        android:iconTint="@color/text_color"
+        kdeconnect:showAsAction="ifRoom" />
+</menu>
--- a/res/menu/menu_mousepad.xml
+++ b/res/menu/menu_mousepad.xml
@@ -8,6 +8,11 @@
        android:title="@string/show_keyboard"
        kdeconnect:showAsAction="ifRoom" />

+    <item
+        android:id="@+id/menu_open_compose_send"
+        android:icon="@drawable/ic_edit_note_24dp"
+        android:title="@string/open_compose_send"
+        kdeconnect:showAsAction="ifRoom" />
    <item
        android:id="@+id/menu_right_click"
        android:title="@string/right_click"
--- a/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
--- a/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
--- a/res/mipmap-hdpi/ic_launcher.png
+++ b/res/mipmap-hdpi/ic_launcher.png
--- a/res/mipmap-hdpi/ic_launcher_round.png
+++ b/res/mipmap-hdpi/ic_launcher_round.png
--- a/res/mipmap-mdpi/ic_launcher.png
+++ b/res/mipmap-mdpi/ic_launcher.png
--- a/res/mipmap-mdpi/ic_launcher_round.png
+++ b/res/mipmap-mdpi/ic_launcher_round.png
--- a/res/mipmap-xhdpi/ic_launcher.png
+++ b/res/mipmap-xhdpi/ic_launcher.png
--- a/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/res/mipmap-xhdpi/ic_launcher_round.png
--- a/res/mipmap-xxhdpi/ic_launcher.png
+++ b/res/mipmap-xxhdpi/ic_launcher.png
--- a/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/res/mipmap-xxxhdpi/ic_launcher.png
--- a/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -1,18 +1,27 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
+  <string name="kde_connect">كدي المتّصل</string>
+  <string name="manifest_label_share">أرسِل إلى جهاز</string>
+  <string name="foreground_notification_no_devices">غير متصل بأي جهاز</string>
+  <string name="foreground_notification_devices">متّصل بـ: %s</string>
+  <string name="foreground_notification_send_clipboard">أرسل الحافظة</string>
  <string name="pref_plugin_telephony">مُخطِر المهاتفة</string>
+  <string name="pref_plugin_telephony_desc">أرسل إخطارات للمكالمات الواردة</string>
  <string name="pref_plugin_battery">تقرير البطّاريّة</string>
  <string name="pref_plugin_battery_desc">بلّغ عن حالة البطّاريّة دوريًّا</string>
+  <string name="pref_plugin_connectivity_report">تقرير الاتصال</string>
  <string name="pref_plugin_sftp">اكشف نظام الملفّات</string>
  <string name="pref_plugin_sftp_desc">تسمح بتصفّح نظام ملفّات هذا الهاتف عن بعد</string>
  <string name="pref_plugin_clipboard">مزامنة الحافظة</string>
  <string name="pref_plugin_clipboard_desc">شارك محتوى الحافظة</string>
+  <string name="pref_plugin_clipboard_sent">أرسل الحافظة</string>
  <string name="pref_plugin_mousepad">الدّخل البعيد</string>
  <string name="pref_plugin_mousepad_desc">استخدم الهاتف أو اللوحيّ كفأرة ولوحة مفاتيح</string>
  <string name="pref_plugin_mpris">تحكّمات الوسائط المتعدّدة</string>
  <string name="pref_plugin_mpris_desc">توفّر تحكّمًا بعيدًا لمشغّل الوسائط</string>
  <string name="pref_plugin_runcommand">شغّل أمرًا</string>
  <string name="pref_plugin_runcommand_desc">تحفّز أوامر عن بعد من الهاتف أو اللوحيّ</string>
+  <string name="pref_plugin_contacts">مزامن المتراسلين</string>
  <string name="pref_plugin_ping">وخزة</string>
  <string name="pref_plugin_ping_desc">أرسل واستقبل وخزات</string>
  <string name="pref_plugin_notifications">مزامنة الإخطارات</string>
@@ -23,18 +32,22 @@
  <string name="pref_plugin_sharereceiver_desc">شارك الملفّات والعناوين بين الجهازين</string>
  <string name="device_list_empty">لا أجهزة</string>
  <string name="ok">حسنًا</string>
+  <string name="sad_ok">حسنًا ):</string>
  <string name="cancel">ألغِ</string>
  <string name="open_settings">افتح الإعدادات</string>
  <string name="no_permissions">عليك إعطاء التّطبيق صلاحيّات للنّفاذ إلى الإخطارات</string>
  <string name="send_ping">أرسل وخزة</string>
  <string name="open_mpris_controls">تحكّمات الوسائط المتعدّدة</string>
  <string name="open_mousepad">الدّخل البعيد</string>
+  <string name="mousepad_single_tap_settings_title">اضبط إجراء الطَرق بالأصبع</string>
  <string name="mousepad_double_tap_settings_title">اضبط إجراء اللمس بإصبعين</string>
  <string name="mousepad_triple_tap_settings_title">اضبط إجراء اللمس بثلاث أصابع</string>
  <string name="mousepad_sensitivity_settings_title">اضبط حساسيّة لوحة اللمس</string>
+  <string name="mousepad_acceleration_profile_settings_title">عيّن تسارع المؤشر</string>
  <string name="mousepad_scroll_direction_title">اعكس اتّجاه التّمرير</string>
  <string-array name="mousepad_tap_entries">
-    <item>النّقر باليمين</item>
+    <item>النّقر باليسار</item>
+    <item>النقر باليمين</item>
    <item>النّقر بالوسط</item>
    <item>لا شيء</item>
  </string-array>
@@ -46,13 +59,17 @@
    <item>الأسرع</item>
  </string-array>
  <string-array name="mousepad_acceleration_profile_entries">
-    <item>No Acceleration</item>
-    <item>Weakest</item>
-    <item>Weaker</item>
-    <item>Medium</item>
-    <item>Stronger</item>
-    <item>Strongest</item>
+    <item>بدون تسريع</item>
+    <item>الأكثر ضعفاً</item>
+    <item>ضعيف</item>
+    <item>متوسط</item>
+    <item>أقوى</item>
+    <item>الأقوى</item>
  </string-array>
+  <string name="view_status_title">الحالة</string>
+  <string name="battery_status_format">البطارية: %d%%</string>
+  <string name="battery_status_low_format">البطارية: %d%% منخفضة</string>
+  <string name="battery_status_charging_format">البطارية: %d%% تشحن</string>
  <string name="category_connected_devices">الأجهزة المقترن بها</string>
  <string name="category_not_paired_devices">الأجهزة المتوفّرة</string>
  <string name="category_remembered_devices">الأجهزة المتذكَّرة</string>
@@ -68,10 +85,9 @@
  <string name="error_canceled_by_other_peer">ألغاه ندّ آخر</string>
  <string name="encryption_info_title">معلومات التّعمية</string>
  <string name="encryption_info_msg_no_ssl">لا يستخدم الجهاز الآخر إصدارة حديثة من «كدي المتّصل»، ستُستخدم طريقة التّعمية القديمة.</string>
-  <string name="my_device_fingerprint">بصمة SHA1 لشهادة جهازك هي:</string>
-  <string name="remote_device_fingerprint">بصمة SHA1 لشهادة الجهاز البعيد هي:</string>
  <string name="pair_requested">طُلب الاقتران</string>
  <string name="pairing_request_from">طلب اقتران من %1s</string>
+  <string name="tap_to_open">اطرق لتفتح</string>
  <string name="received_file_text">المس لفتح \'%1s\'</string>
  <string name="tap_to_answer">المس للإجابة</string>
  <string name="right_click">أرسل نقرة باليمين</string>
@@ -81,13 +97,18 @@
  <string name="request_pairing">اطلب الاقتران</string>
  <string name="pairing_accept">اقبل</string>
  <string name="pairing_reject">ارفض</string>
+  <string name="settings">إعدادات</string>
  <string name="mpris_play">شغّل</string>
+  <string name="mpris_pause">ألبث</string>
  <string name="mpris_previous">السّابق</string>
  <string name="mpris_rew">رجوع</string>
  <string name="mpris_ff">تقدّم سريع</string>
  <string name="mpris_next">التّالي</string>
+  <string name="mpris_loop">حلقة</string>
+  <string name="mpris_shuffle">اخلط</string>
  <string name="mpris_volume">المستوى</string>
  <string name="mpris_time_settings_title">زرّا التّقدّم والإرجاع</string>
+  <string name="mpris_time_settings_summary">اضبط الوقت عند نقر زرّيّ التّقديم أو الإرجاع</string>
  <string-array name="mpris_time_entries">
    <item>10 ثوان</item>
    <item>20 ثانية</item>
@@ -95,20 +116,33 @@
    <item>دقيقة واحدة</item>
    <item>دقيقتان</item>
  </string-array>
+  <string name="share_to">شارك مع...</string>
  <string name="protocol_version_newer">يستخدم هذا الجهاز إصدار ميفاق أحدث</string>
  <string name="plugin_settings_with_name">إعدادات %s</string>
  <string name="invalid_device_name">اسم جهاز غير صالح</string>
  <string name="shareplugin_text_saved">استُقبل نصّ، حُفظ إلى الحافظة</string>
  <string name="custom_devices_settings">قائمة أجهزة مخصّصة</string>
  <string name="custom_device_list">أضف أجهزة بميفاق الإنترنت مإ</string>
+  <string name="custom_device_deleted">حُذف الجهاز المخصّص</string>
+  <string name="custom_device_fab_hint">أضف جهازاً</string>
+  <string name="undo">تراجع</string>
  <string name="share_notification_preference">إخطارات مزعجة</string>
  <string name="share_notification_preference_summary">اهتزّ وشغّل صوتًا عند استقبال ملفّ</string>
+  <string name="share_destination_folder_preference">مجلد الوجهة</string>
+  <string name="share">شارك</string>
+  <string name="share_received_file">شارك \"%s\"</string>
  <string name="title_activity_notification_filter">مرشّح الإخطارات</string>
  <string name="filter_apps_info">ستُزامن الإخطارات من التّطبيقات المحدّدة.</string>
  <string name="sftp_sdcard_num">بطاقة SD ‏%d</string>
  <string name="sftp_sdcard">بطاقة SD</string>
  <string name="sftp_readonly">(للقراءة فقط)</string>
  <string name="sftp_camera">صور الكاميرا</string>
+  <string name="add_device_dialog_title">أضف جهازاً</string>
+  <string name="add_device_hint">اسم المضيف أو عنوان IP</string>
+  <string name="sftp_storage_preference_click_to_select">"انقر للاختيار "</string>
+  <string name="sftp_storage_preference_display_name">اسم العرض</string>
+  <string name="sftp_action_mode_menu_delete">احذف</string>
+  <string name="sftp_no_sdcard_detected">لم يكتشف أي بطاقة ذاكرة</string>
  <string name="no_players_connected">لم يُعثر على مشغّلات</string>
  <string name="send_files">أرسل ملفّات</string>
  <string name="pairing_title">أجهزة «كدي المتّصل»</string>
@@ -123,23 +157,108 @@
  <string name="findmyphone_title">جِد جهازي</string>
  <string name="findmyphone_title_tablet">جِد جهازي اللوحيّ</string>
  <string name="findmyphone_description">يرّن هذا الجهاز لتجده</string>
+  <string name="findmyphone_found">عثر عليه</string>
  <string name="open">افتح</string>
  <string name="close">أغلق</string>
+  <string name="select_ringtone">اختر النغمة</string>
+  <string name="telephony_pref_blocked_title">أرقام محظورة</string>
+  <string name="mpris_coverart_description">الصورة الفنية للوسيط الحالي</string>
+  <string name="device_icon_description">أيقونة الجهاز</string>
+  <string name="settings_icon_description">أيقونة الإعدادات</string>
+  <string name="presenter_fullscreen">ملء الشّاشة</string>
+  <string name="presenter_exit">اخرج من العرض التقديمي</string>
+  <string name="add_command">أضف أمراً</string>
+  <string name="addcommand_explanation">لا يوجد أوامر مسجلة</string>
+  <string name="pref_plugin_mprisreceiver">متحكم الوسائط</string>
+  <string name="notification_channel_default">إخطارات أخرى</string>
+  <string name="notification_channel_media_control">متحكم الوسائط</string>
+  <string name="notification_channel_filetransfer">نقل الملفّات</string>
+  <string name="notification_channel_high_priority">مرتفعة الأولوية</string>
+  <string name="notification_channel_sms_mms">رسالة جديدة</string>
+  <string name="mpris_stop">أوقف المشغل الحالي</string>
+  <string name="copy_url_to_clipboard">انسخ المسار إلى الحافظة</string>
+  <string name="clipboard_toast">نُسخ إلى الحافظة</string>
+  <string name="runcommand_notreachable">الجهاز غير قابل الوصول</string>
+  <string name="runcommand_notpaired">الجهاز غير مقترن</string>
+  <string name="pref_plugin_findremotedevice">اعثر على جهاز بعيد</string>
+  <string name="pref_plugin_findremotedevice_desc">رنّ على الجهاز البعيد</string>
+  <string name="ring">رّن</string>
+  <string name="pref_plugin_systemvolume">صوت النظام</string>
+  <string name="mute">اكتم</string>
+  <string name="all">الكلّ</string>
+  <string name="devices">الأجهزة</string>
+  <string name="settings_rename">اسم الجهاز</string>
+  <string name="settings_dark_mode">سمة مظلمة</string>
+  <string name="settings_more_settings_title">المزيد من الإعدادات</string>
+  <string name="privacy_options">خيارات الخصوصية</string>
+  <string name="set_privacy_options">حدد خيارات الخصوصية</string>
+  <string name="block_contents">امنح محتويات الإخطارات</string>
+  <string name="block_images">امنع الصور في الإخطارات</string>
+  <string name="notification_channel_receivenotification">إخطارات من أجهزة أخرى</string>
+  <string name="take_picture">شغّل الكاميرا</string>
+  <string name="presenter_pointer">المؤشر</string>
+  <string name="trusted_networks">الشّبكات الموثوقة</string>
+  <string name="add_trusted_network">أضف %s</string>
+  <string name="allow_all_networks_text">اسمح للكل</string>
+  <string name="location_permission_needed_title">الإذن مطلوب</string>
+  <string name="bigscreen_home">المنزل</string>
+  <string name="bigscreen_up">أعلى</string>
+  <string name="bigscreen_left">يسار</string>
+  <string name="bigscreen_select">اختر</string>
+  <string name="bigscreen_right">يمين</string>
+  <string name="bigscreen_down">أسفل</string>
+  <string name="bigscreen_mic">اللاقط</string>
+  <string name="pref_plugin_bigscreen">متحكم الشاشة الكبيرة</string>
+  <string name="bigscreen_speech_extra_prompt">حديث</string>
+  <string name="message_reply_label">ردّ</string>
+  <string name="mark_as_read_label">علّم كمقروءة</string>
+  <string name="user_display_name">أنت</string>
+  <string name="set_default_sms_app_title">أرسل رسالة قصيرة</string>
+  <string name="set_group_message_as_mms_title">أرسل رسالة جماعية</string>
+  <string name="set_long_text_as_mms_title">أرسل نص طويل كرسالة وسائط</string>
+  <string name="convert_to_mms_after_title">حول إلى رسالة وسائط</string>
  <string-array name="convert_to_mms_after_entries">
-    <item>After one message</item>
-    <item>After two messages</item>
-    <item>After three messages</item>
-    <item>After four messages</item>
-    <item>After five messages</item>
+    <item>بعد رسالة واحدة</item>
+    <item>بعد رسالتين</item>
+    <item>بعد ثلاث رسائل</item>
+    <item>بعد أربع رسائل</item>
+    <item>بعد خمس رسائل</item>
  </string-array>
+  <string name="theme_dialog_title">اختر سمة</string>
  <string-array name="theme_list">
-    <item>Set by Battery Saver</item>
-    <item/>
-    <item>Dark</item>
+    <item>معينة بواسطة حافظ البطارية</item>
+    <item>خفيف</item>
+    <item>مظلمة</item>
  </string-array>
  <string-array name="theme_list_v28">
-    <item/>
-    <item/>
-    <item>Dark</item>
+    <item>افتراضيات النظام</item>
+    <item>خفيف</item>
+    <item>مظلمة</item>
  </string-array>
+  <string name="report_bug">أبلغ عن علة</string>
+  <string name="donate">تبرّع</string>
+  <string name="source_code">الشيفرة المصدرية</string>
+  <string name="licenses">الرّخص</string>
+  <string name="website">موقع الوبّ</string>
+  <string name="about">عن</string>
+  <string name="authors">المؤلفين</string>
+  <string name="thanks_to">الشكر إلى</string>
+  <string name="easter_egg">بيض الفصح</string>
+  <string name="email_contributor">راسل المساهم:\n%s</string>
+  <string name="visit_contributors_homepage">زر صفحة المساهم الرئيسية\n%s</string>
+  <string name="version">الإصدار %s</string>
+  <string name="about_kde">عن كدي</string>
+  <string name="kde_be_free">كدي- كن حرًّا!</string>
+  <string name="kde">كدي</string>
+  <string name="konqi">كوينكي</string>
+  <string name="rise_up">ارفع</string>
+  <string name="rise_down">اخفض</string>
+  <string name="click_here_to_type">اطُرق لتكتب</string>
+  <string name="clear_compose">امسح</string>
+  <string name="send_compose">أرسل</string>
+  <string name="open_compose_send">ألف نص</string>
+  <string name="maintainer_and_developer">المصين ومطوّر</string>
+  <string name="developer">مطوّر</string>
+  <string name="bug_fixes_and_general_improvements">إصلاح علل وتحسينات عامة</string>
+  <string name="send_clipboard">أرسل الحافظة</string>
 </resources>
--- a/Show More
+++ b/Show More