diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..55531aa62
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,51 @@
+# .editorconfig
+
+# see http://EditorConfig.org
+
+# SPDX-FileCopyrightText: 2018-2025 Nextcloud GmbH and Nextcloud contributors
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+# This is the file in the root of the project.
+# For sub folders you can have other files that override only some settings.
+# For these, this settings should be false.
+root=true
+
+[*]
+max_line_length=120
+# use spaces, not tabs.
+indent_style=space
+indent_size=4
+
+[*.yml]
+max_line_length=150
+
+charset=utf-8
+
+# Trimming is good for consistency
+trim_trailing_whitespace=true
+# I've seen cases where a missing new_line was ignored on *nix systems.
+# Never again with this setting!
+insert_final_newline=true
+
+[*.properties]
+# Exception for Java properties files should be encoded latin1 (aka iso8859-1)
+charset=latin1
+
+[*.{cmd,bat}]
+# batch files on Windows should stay with CRLF
+end_of_line=crlf
+
+[*.md]
+trim_trailing_whitespace=false
+
+[.drone.yml]
+indent_size=2
+
+[*.{kt,kts}]
+ktlint_code_style = android_studio
+# IDE does not follow this Ktlint rule strictly, but the default ordering is pretty good anyway, so let's ditch it
+ktlint_standard_import-ordering = disabled
+ktlint_standard_no-consecutive-comments = disabled
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index ef660e4ad..bd5dcceee 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -534,8 +534,8 @@ private void setupNotesList() {
             final var layoutManager = new LinearLayoutManager(this);
             listView.setLayoutManager(layoutManager);
             listView.addItemDecoration(new SectionItemDecoration(adapter,
-                    getResources().getDimensionPixelSize(R.dimen.spacer_activity_sides) + getResources().getDimensionPixelSize(R.dimen.spacer_1x) + getResources().getDimensionPixelSize(R.dimen.spacer_3x) + getResources().getDimensionPixelSize(R.dimen.spacer_2x),
-                    getResources().getDimensionPixelSize(R.dimen.spacer_3x),
+                    getResources().getDimensionPixelSize(R.dimen.spacer_1hx) + getResources().getDimensionPixelSize(R.dimen.spacer_3x) + getResources().getDimensionPixelSize(R.dimen.spacer_2x),
+                    getResources().getDimensionPixelSize(R.dimen.spacer_2x),
                     getResources().getDimensionPixelSize(R.dimen.spacer_1x),
                     0
             ));
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
index f8936e4f9..ae2c9d2fb 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
@@ -40,12 +40,10 @@
 import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemGridBinding;
 import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemGridOnlyTitleBinding;
 import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemWithExcerptBinding;
-import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemWithoutExcerptBinding;
 import it.niedermann.owncloud.notes.databinding.ItemNotesListSectionItemBinding;
 import it.niedermann.owncloud.notes.main.items.grid.NoteViewGridHolder;
 import it.niedermann.owncloud.notes.main.items.grid.NoteViewGridHolderOnlyTitle;
-import it.niedermann.owncloud.notes.main.items.list.NoteViewHolderWithExcerpt;
-import it.niedermann.owncloud.notes.main.items.list.NoteViewHolderWithoutExcerpt;
+import it.niedermann.owncloud.notes.main.items.list.NoteViewListHolder;
 import it.niedermann.owncloud.notes.main.items.section.SectionItem;
 import it.niedermann.owncloud.notes.main.items.section.SectionViewHolder;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
@@ -140,15 +138,10 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                     BrandingUtil.of(color, parent.getContext()).platform.colorTextView(binding.sectionTitle);
                     return new SectionViewHolder(binding);
                 }
-                case TYPE_NOTE_WITH_EXCERPT -> {
+                case TYPE_NOTE_WITH_EXCERPT, TYPE_NOTE_ONLY_TITLE, TYPE_NOTE_WITHOUT_EXCERPT -> {
                     ItemNotesListNoteItemWithExcerptBinding binding = ItemNotesListNoteItemWithExcerptBinding.inflate(inflater, parent, false);
                     BrandingUtil.of(color, parent.getContext()).notes.themeCard(binding.noteCard);
-                    return new NoteViewHolderWithExcerpt(binding, noteClickListener);
-                }
-                case TYPE_NOTE_ONLY_TITLE, TYPE_NOTE_WITHOUT_EXCERPT -> {
-                    ItemNotesListNoteItemWithoutExcerptBinding binding = ItemNotesListNoteItemWithoutExcerptBinding.inflate(inflater, parent, false);
-                    BrandingUtil.of(color, parent.getContext()).notes.themeCard(binding.noteCard);
-                    return new NoteViewHolderWithoutExcerpt(binding, noteClickListener);
+                    return new NoteViewListHolder(binding, noteClickListener);
                 }
                 default -> {
                     throw new IllegalArgumentException("Not supported viewType: " + viewType);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithoutExcerpt.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithoutExcerpt.java
deleted file mode 100644
index 266af03be..000000000
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithoutExcerpt.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Nextcloud Notes - Android Client
- *
- * SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-package it.niedermann.owncloud.notes.main.items.list;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.res.ResourcesCompat;
-
-import it.niedermann.owncloud.notes.R;
-import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemWithoutExcerptBinding;
-import it.niedermann.owncloud.notes.main.items.NoteViewHolder;
-import it.niedermann.owncloud.notes.persistence.entity.Note;
-import it.niedermann.owncloud.notes.shared.model.DBStatus;
-import it.niedermann.owncloud.notes.shared.model.NoteClickListener;
-
-public class NoteViewHolderWithoutExcerpt extends NoteViewHolder {
-    @NonNull
-    private final ItemNotesListNoteItemWithoutExcerptBinding binding;
-
-    private final int defaultSwipeBackgroundColor;
-    private final int starSwipeBackgroundColor;
-    private final int deleteSwipeBackgroundColor;
-
-    public NoteViewHolderWithoutExcerpt(@NonNull ItemNotesListNoteItemWithoutExcerptBinding binding, @NonNull NoteClickListener noteClickListener) {
-        super(binding.getRoot(), noteClickListener);
-        this.binding = binding;
-        Resources resources = binding.getRoot().getContext().getResources();
-        this.defaultSwipeBackgroundColor = ResourcesCompat.getColor(resources, R.color.transparent, null);
-        this.starSwipeBackgroundColor = ResourcesCompat.getColor(resources, R.color.bg_warning, null);
-        this.deleteSwipeBackgroundColor = ResourcesCompat.getColor(resources, R.color.bg_attention, null);
-    }
-
-    public void showSwipe(float dX) {
-        if (dX == 0.0f) {
-            binding.noteFavoriteLeft.setVisibility(View.INVISIBLE);
-            binding.noteDeleteRight.setVisibility(View.INVISIBLE);
-            binding.noteSwipeFrame.setCardBackgroundColor(defaultSwipeBackgroundColor);
-        } else {
-            boolean left = dX > 0;
-            binding.noteFavoriteLeft.setVisibility(left ? View.VISIBLE : View.INVISIBLE);
-            binding.noteDeleteRight.setVisibility(left ? View.INVISIBLE : View.VISIBLE);
-            binding.noteSwipeFrame.setCardBackgroundColor(left ? starSwipeBackgroundColor : deleteSwipeBackgroundColor);
-        }
-    }
-
-    public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, int color, @Nullable CharSequence searchQuery) {
-        super.bind(isSelected, note, showCategory, color, searchQuery);
-        @NonNull final Context context = itemView.getContext();
-        binding.noteCard.setAlpha(DBStatus.LOCAL_DELETED.equals(note.getStatus()) ? 0.5f : 1.0f);
-        bindCategory(context, binding.noteCategory, showCategory, note.getCategory(), color);
-        bindStatus(binding.noteStatus, note.getStatus(), color);
-        bindFavorite(binding.noteFavorite, note.getFavorite());
-        bindModified(binding.noteModified, note.getModified());
-        bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
-    }
-
-    @NonNull
-    public View getNoteSwipeable() {
-        return binding.noteCard;
-    }
-}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithExcerpt.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolder.java
similarity index 83%
rename from app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithExcerpt.java
rename to app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolder.java
index b2b245a02..087ee4739 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithExcerpt.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolder.java
@@ -21,7 +21,7 @@
 import it.niedermann.owncloud.notes.shared.model.DBStatus;
 import it.niedermann.owncloud.notes.shared.model.NoteClickListener;
 
-public class NoteViewHolderWithExcerpt extends NoteViewHolder {
+public class NoteViewListHolder extends NoteViewHolder {
     @NonNull
     private final ItemNotesListNoteItemWithExcerptBinding binding;
 
@@ -30,7 +30,7 @@ public class NoteViewHolderWithExcerpt extends NoteViewHolder {
     private final int deleteSwipeBackgroundColor;
 
 
-    public NoteViewHolderWithExcerpt(@NonNull ItemNotesListNoteItemWithExcerptBinding binding, @NonNull NoteClickListener noteClickListener) {
+    public NoteViewListHolder(@NonNull ItemNotesListNoteItemWithExcerptBinding binding, @NonNull NoteClickListener noteClickListener) {
         super(binding.getRoot(), noteClickListener);
         this.binding = binding;
         Resources resources = binding.getRoot().getContext().getResources();
@@ -62,7 +62,17 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @
         bindModified(binding.noteModified, note.getModified());
 
         bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
-        bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt(), color);
+        if (note.getExcerpt().isEmpty()) {
+            bindSearchableContent(
+                    context,
+                    binding.noteExcerpt,
+                    searchQuery,
+                    context.getString(R.string.listview_no_content),
+                    color
+            );
+        } else {
+            bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt(), color);
+        }
     }
 
     @NonNull
diff --git a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
index a18f531a4..e83063594 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
@@ -68,21 +68,23 @@
 
                 <ImageView
                     android:id="@+id/noteFavorite"
-                    android:layout_width="56dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/menu_favorite"
-                    android:padding="@dimen/spacer_2x"
+                    android:paddingStart="@dimen/spacer_list_card"
+                    android:paddingEnd="@dimen/spacer_1x"
                     tools:src="@drawable/ic_star_yellow_24dp" />
 
                 <ImageView
                     android:id="@+id/custom_checkbox"
-                    android:layout_width="56dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:clickable="false"
                     android:contentDescription="@null"
                     android:focusable="false"
-                    android:padding="@dimen/spacer_2x"
+                    android:paddingStart="@dimen/spacer_list_card"
+                    android:paddingEnd="@dimen/spacer_1x"
                     android:src="@drawable/ic_checkbox_blank_outline" />
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -91,7 +93,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical|end"
                     android:layout_marginTop="12dp"
-                    android:layout_marginEnd="4dp"
+                    android:layout_marginEnd="0dp"
                     android:baseline="14dp"
                     app:srcCompat="@drawable/ic_sync_blue_18dp" />
             </FrameLayout>
@@ -101,9 +103,10 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:orientation="vertical"
-                android:paddingVertical="@dimen/spacer_2x"
+                android:paddingTop="@dimen/spacer_1x"
+                android:paddingBottom="@dimen/spacer_list_card"
                 android:paddingStart="@dimen/zero"
-                android:paddingEnd="@dimen/spacer_2x">
+                android:paddingEnd="@dimen/spacer_list_card">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -131,7 +134,6 @@
 
                 </LinearLayout>
 
-
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
diff --git a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
deleted file mode 100644
index 8f0ba83fd..000000000
--- a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Nextcloud Notes - Android Client
- ~
- ~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors
- ~ SPDX-License-Identifier: GPL-3.0-or-later
--->
-<FrameLayout 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:layout_marginTop="@dimen/spacer_1x"
-    android:clickable="true"
-    android:focusable="true">
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/noteSwipeFrame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/spacer_1x"
-        android:layout_marginEnd="@dimen/spacer_1x"
-        app:cardBackgroundColor="@color/bg_attention"
-        app:strokeColor="@color/transparent">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <ImageView
-                android:id="@+id/noteFavoriteLeft"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="@dimen/button_padding"
-                android:contentDescription="@string/menu_favorite"
-                app:srcCompat="@drawable/ic_star_white_24dp" />
-
-            <ImageView
-                android:id="@+id/noteDeleteRight"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end|center_vertical"
-                android:layout_marginEnd="@dimen/spacer_2x"
-                android:contentDescription="@string/menu_delete"
-                app:srcCompat="@drawable/ic_delete_white_24dp" />
-
-        </FrameLayout>
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/noteCard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacer_1x"
-        android:layout_marginEnd="@dimen/spacer_1x">
-
-        <LinearLayout
-            android:id="@+id/noteContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:baselineAligned="false"
-            android:gravity="center_vertical">
-
-            <FrameLayout
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent">
-
-                <ImageView
-                    android:id="@+id/noteFavorite"
-                    android:layout_width="56dp"
-                    android:layout_height="match_parent"
-                    android:background="?attr/selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/menu_favorite"
-                    android:padding="@dimen/spacer_2x"
-                    tools:src="@drawable/ic_star_yellow_24dp" />
-
-                <ImageView
-                    android:id="@+id/custom_checkbox"
-                    android:layout_width="56dp"
-                    android:layout_height="match_parent"
-                    android:clickable="false"
-                    android:contentDescription="@null"
-                    android:focusable="false"
-                    android:padding="@dimen/spacer_2x"
-                    android:src="@drawable/ic_checkbox_blank_outline" />
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/noteStatus"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|end"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginEnd="4dp"
-                    android:baseline="14dp"
-                    app:srcCompat="@drawable/ic_sync_blue_18dp" />
-            </FrameLayout>
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:orientation="horizontal"
-                android:paddingStart="@dimen/zero"
-                android:paddingEnd="@dimen/spacer_2x">
-
-                <TextView
-                    android:id="@+id/noteTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="10sp"
-                    android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:paddingVertical="@dimen/spacer_2x"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="@dimen/primary_font_size"
-                    tools:text="@tools:sample/lorem/random" />
-
-                <TextView
-                    android:id="@+id/noteCategory"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="10sp"
-                    android:layout_marginStart="@dimen/spacer_1x"
-                    android:layout_marginTop="1dp"
-                    android:background="@drawable/border"
-                    android:maxLines="1"
-                    android:paddingHorizontal="@dimen/spacer_1x"
-                    android:paddingBottom="1dp"
-                    android:singleLine="true"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="@dimen/secondary_font_size"
-                    tools:maxLength="15"
-                    tools:text="@tools:sample/lorem/random" />
-
-                <TextView
-                    android:id="@+id/noteModified"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginVertical="10sp"
-                    android:paddingStart="@dimen/spacer_1x"
-                    android:paddingEnd="@dimen/zero"
-                    tools:text="27.11." />
-
-            </LinearLayout>
-        </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-</FrameLayout>
diff --git a/app/src/main/res/layout/item_notes_list_section_item.xml b/app/src/main/res/layout/item_notes_list_section_item.xml
index 71f9935e8..def9f06da 100644
--- a/app/src/main/res/layout/item_notes_list_section_item.xml
+++ b/app/src/main/res/layout/item_notes_list_section_item.xml
@@ -2,7 +2,7 @@
 <!--
  ~ Nextcloud Notes - Android Client
  ~
- ~ SPDX-FileCopyrightText: 2015-2024 Nextcloud GmbH and Nextcloud contributors
+ ~ SPDX-FileCopyrightText: 2015-2025 Nextcloud GmbH and Nextcloud contributors
  ~ SPDX-License-Identifier: GPL-3.0-or-later
 -->
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -16,7 +16,8 @@
     android:ellipsize="end"
     android:gravity="center_vertical"
     android:hint="@string/listview_updated_yesterday"
-    android:padding="@dimen/spacer_1x"
+    android:paddingStart="@dimen/spacer_1x"
+    android:paddingEnd="@dimen/zero"
     android:textColor="@color/fg_default_selection"
-    android:textStyle="bold"
-    android:textSize="@dimen/primary_font_size" />
+    android:textSize="@dimen/primary_font_size"
+    android:textStyle="bold" />
diff --git a/app/src/main/res/values-v31/dimens.xml b/app/src/main/res/values-v31/dimens.xml
index a6cdbf9fe..ee5173986 100644
--- a/app/src/main/res/values-v31/dimens.xml
+++ b/app/src/main/res/values-v31/dimens.xml
@@ -7,42 +7,8 @@
   ~ SPDX-License-Identifier: GPL-3.0-or-later
 -->
 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="spacer_1qx">2dp</dimen>
-    <dimen name="spacer_1hx">4dp</dimen>
-    <dimen name="spacer_1x">8dp</dimen>
-    <dimen name="spacer_2x">16dp</dimen>
-    <dimen name="spacer_3x">24dp</dimen>
-    <dimen name="spacer_5x">40dp</dimen>
-
-    <dimen name="avatar_size">40dp</dimen>
-
-    <dimen name="spacer_activity_sides">0dp</dimen>
-
-    <!-- Drawer header -->
-    <dimen name="drawer_header_height">100dp</dimen>
-    <dimen name="drawer_header_logo_size">42dp</dimen>
-
-    <!-- Buttons -->
-    <dimen name="button_padding">@dimen/spacer_2x</dimen>
-
-    <dimen name="primary_font_size">16sp</dimen>
-    <dimen name="secondary_font_size">14sp</dimen>
-
-    <!-- Font Sizes -->
-    <dimen name="note_font_size_small">16sp</dimen>
-    <dimen name="note_font_size_medium">18sp</dimen>
-    <dimen name="note_font_size_large">22sp</dimen>
-
-    <item format="float" name="note_line_spacing" type="dimen">1.15</item>
-
     <!-- Widgets -->
     <dimen name="widget_outer_radius">@android:dimen/system_app_widget_background_radius</dimen>
     <dimen name="widget_margin">@android:dimen/system_app_widget_background_radius</dimen>
     <dimen name="widget_inner_padding_vertical">@android:dimen/system_app_widget_inner_radius</dimen>
-    <dimen name="widget_inner_padding_horizontal">@dimen/spacer_1x</dimen>
-    <dimen name="widget_note_list_outer_padding">4dp</dimen>
-    <dimen name="widget_note_list_inner_padding">4dp</dimen>
-    <dimen name="widget_note_list_fav_icon_width">26dp</dimen>
-    <dimen name="widget_note_list_fav_icon_height">20dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8a62962a1..2b7ce7fcd 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,6 +20,7 @@
     <dimen name="spacer_3x">24dp</dimen>
     <dimen name="spacer_4x">36dp</dimen>
     <dimen name="spacer_5x">40dp</dimen>
+    <dimen name="spacer_list_card">12dp</dimen>
     <dimen name="button_width">140dp</dimen>
     <dimen name="button_corner_radius">24dp</dimen>
     <dimen name="button_extra_width">180dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3babf2b94..dad9cb358 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -175,6 +175,7 @@
     <string name="listview_updated_last_week">Last week</string>
     <string name="listview_updated_this_month">This month</string>
     <string name="listview_updated_last_month">Last month</string>
+    <string name="listview_no_content">No content</string>
 
     <string name="settings_note_mode">Display mode for notes</string>
     <string name="settings_note_mode_new">Notes opening behaviour</string>