diff --git a/res/layout/activity_list.xml b/res/layout/activity_list.xml
--- a/res/layout/activity_list.xml
+++ b/res/layout/activity_list.xml
@@ -7,4 +7,4 @@
     android:orientation="vertical"
     android:paddingLeft="16dip"
     android:paddingRight="16dip"
-    tools:context="org.kde.kdeconnect.UserInterface.MainActivity"></ListView>
+    tools:context="org.kde.kdeconnect.UserInterface.MainActivity" />
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -24,7 +24,7 @@
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"></FrameLayout>
+            android:layout_height="match_parent" />
 
     </LinearLayout>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,9 +19,9 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="KdeConnectTheme" parent="KdeConnectThemeBase"></style>
+    <style name="KdeConnectTheme" parent="KdeConnectThemeBase" />
 
-    <style name="KdeConnectTheme.NoActionBar" parent="KdeConnectThemeBase.NoActionBar"></style>
+    <style name="KdeConnectTheme.NoActionBar" parent="KdeConnectThemeBase.NoActionBar" />
 
     <style name="DisableableButton" parent="ThemeOverlay.AppCompat">
         <item name="colorButtonNormal">@drawable/disableable_button</item>
diff --git a/res/xml/findmyphoneplugin_preferences.xml b/res/xml/findmyphoneplugin_preferences.xml
--- a/res/xml/findmyphoneplugin_preferences.xml
+++ b/res/xml/findmyphoneplugin_preferences.xml
@@ -6,5 +6,5 @@
     <RingtonePreference
         android:key="select_ringtone"
         android:showSilent="false"
-        android:title="@string/select_ringtone"></RingtonePreference>
+        android:title="@string/select_ringtone" />
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/remotekeyboardplugin_method.xml b/res/xml/remotekeyboardplugin_method.xml
--- a/res/xml/remotekeyboardplugin_method.xml
+++ b/res/xml/remotekeyboardplugin_method.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
-    android:supportsSwitchingToNextInputMethod="true"></input-method>
+    android:supportsSwitchingToNextInputMethod="true" />
diff --git a/res/xml/telephonyplugin_preferences.xml b/res/xml/telephonyplugin_preferences.xml
--- a/res/xml/telephonyplugin_preferences.xml
+++ b/res/xml/telephonyplugin_preferences.xml
@@ -4,6 +4,6 @@
     <EditTextPreference
         android:dialogMessage="@string/telephony_pref_blocked_dialog_desc"
         android:key="telephony_blocked_numbers"
-        android:title="@string/telephony_pref_blocked_title"></EditTextPreference>
+        android:title="@string/telephony_pref_blocked_title" />
 
 </PreferenceScreen>
\ No newline at end of file