diff --git a/app/build.gradle b/app/build.gradle
index f09f3782..ded63c3d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "it.niedermann.owncloud.notes"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 54
-        versionName "2.1.0"
+        versionCode 55
+        versionName "2.1.1"
 //        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/ServerResponse.java b/app/src/main/java/it/niedermann/owncloud/notes/util/ServerResponse.java
index eb7c3870..5c649ee5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/util/ServerResponse.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/util/ServerResponse.java
@@ -51,7 +51,7 @@ public class ServerResponse {
     }
 
     protected String getContent() {
-        return response.getContent();
+        return response == null ? null : response.getContent();
     }
 
     public String getETag() {
diff --git a/app/src/main/res/layout/widget_note_list.xml b/app/src/main/res/layout/widget_note_list.xml
index 075f609f..1f2e20ac 100644
--- a/app/src/main/res/layout/widget_note_list.xml
+++ b/app/src/main/res/layout/widget_note_list.xml
@@ -1,11 +1,10 @@
 <?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:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:background="@color/widget_background">
+    android:background="@color/widget_background"
+    android:orientation="vertical">
 
     <!-- Widget header -->
     <RelativeLayout
@@ -50,7 +49,7 @@
             android:id="@+id/widget_note_list_create_icon"
             android:layout_width="@dimen/widget_note_list_icon_width"
             android:layout_height="match_parent"
-            app:srcCompat="@drawable/ic_add_white_24dp"
+            android:src="@drawable/ic_add_white_24dp"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:paddingStart="@dimen/widget_note_list_inner_padding"
diff --git a/app/src/main/res/layout/widget_note_list_dark.xml b/app/src/main/res/layout/widget_note_list_dark.xml
index ee596abe..feb6407f 100644
--- a/app/src/main/res/layout/widget_note_list_dark.xml
+++ b/app/src/main/res/layout/widget_note_list_dark.xml
@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:background="@color/widget_background_dark_theme">
@@ -50,7 +49,7 @@
             android:id="@+id/widget_note_list_create_icon_dark"
             android:layout_width="@dimen/widget_note_list_icon_width"
             android:layout_height="match_parent"
-            app:srcCompat="@drawable/ic_add_white_24dp"
+            android:src="@drawable/ic_add_white_24dp"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             android:paddingStart="@dimen/widget_note_list_inner_padding"
diff --git a/fastlane/metadata/android/en-US/changelogs/55.txt b/fastlane/metadata/android/en-US/changelogs/55.txt
index 5a3c72a9..b510c0ce 100644
--- a/fastlane/metadata/android/en-US/changelogs/55.txt
+++ b/fastlane/metadata/android/en-US/changelogs/55.txt
@@ -8,6 +8,7 @@
 - #604 Crash upon cutting the last item of a bullet list
 - #613 Crash on start. shortLabel cannot be empty
 - #619 Skip dropping automatic indices (Thanks to @Unpublished)
+- #630 Note list widget now missing "+" button
 - Hide FAB when scrolling down
 - Translation updates
 
diff --git a/fastlane/metadata/android/en-US/changelogs/56.txt b/fastlane/metadata/android/en-US/changelogs/56.txt
new file mode 100644
index 00000000..e69de29b