diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
index 6b214cb09611d37fa7e4bf72baa131c065abcf54..27e55b7dd6d3cf9a3cbae59a4c1b25f6bd487eb5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
@@ -83,9 +83,7 @@ public class BrandingUtil {
 
     @ColorInt
     public static int readBrandMainColor(@NonNull Context context) {
-        final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context.getApplicationContext());
-        Log.v(TAG, "--- Read: shared_preference_theme_main");
-        return sharedPreferences.getInt(pref_key_branding_main, context.getApplicationContext().getResources().getColor(R.color.defaultBrand));
+        return ContextCompat.getColor(context, R.color.defaultBrand);
     }
 
     @ColorInt
@@ -162,21 +160,9 @@ public class BrandingUtil {
     }
 
     public static void tintMenuIcon(@NonNull MenuItem menuItem, @ColorInt int color) {
-        var drawable = menuItem.getIcon();
-        if (drawable != null) {
-            drawable = DrawableCompat.wrap(drawable);
-            DrawableCompat.setTint(drawable, color);
-            menuItem.setIcon(drawable);
-        }
     }
 
     public static void applyBrandToLayerDrawable(@NonNull LayerDrawable check, @IdRes int areaToColor, @ColorInt int mainColor) {
-        final var drawable = check.findDrawableByLayerId(areaToColor);
-        if (drawable == null) {
-            Log.e(TAG, "Could not find areaToColor (" + areaToColor + "). Cannot apply brand.");
-        } else {
-            DrawableCompat.setTint(drawable, mainColor);
-        }
     }
 
     @ColorInt
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
index 8334634b7ddecf4ba6043c25c63b7a20f1a12e41..0fced7893d374a51c889bf22698d77c81730b34b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
@@ -9,7 +9,6 @@ import static it.niedermann.owncloud.notes.shared.util.WidgetUtil.pendingIntentF
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import trikita.log.Log;
@@ -20,10 +19,8 @@ import android.view.View;
 import android.widget.ScrollView;
 
 import androidx.annotation.CallSuper;
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.core.graphics.drawable.IconCompat;
@@ -37,7 +34,6 @@ import java.util.Calendar;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import it.niedermann.android.util.ColorUtil;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.accountpicker.AccountPickerDialogFragment;
 import it.niedermann.owncloud.notes.branding.BrandedFragment;
@@ -53,7 +49,6 @@ import it.niedermann.owncloud.notes.shared.model.DBStatus;
 import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
 import it.niedermann.owncloud.notes.shared.util.ApiVersionUtil;
 import it.niedermann.owncloud.notes.shared.util.NoteUtil;
-import it.niedermann.owncloud.notes.shared.util.NotesColorUtil;
 import it.niedermann.owncloud.notes.shared.util.ShareUtil;
 
 public abstract class BaseNoteFragment extends BrandedFragment implements CategoryDialogListener, EditTitleListener {
@@ -201,7 +196,7 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
     }
 
     private void prepareFavoriteOption(MenuItem item) {
-        item.setIcon(note.getFavorite() ? R.drawable.ic_star_accent_24dp : R.drawable.ic_star_border_accent_24dp);
+        item.setIcon(note.getFavorite() ? R.drawable.ic_star_golden_24dp : R.drawable.ic_star_border_24dp);
         item.setChecked(note.getFavorite());
         tintMenuIcon(item, colorAccent);
     }
@@ -252,7 +247,7 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
                 if (ShortcutManagerCompat.isRequestPinShortcutSupported(context)) {
                     final var pinShortcutInfo = new ShortcutInfoCompat.Builder(context, String.valueOf(note.getId()))
                             .setShortLabel(note.getTitle())
-                            .setIcon(IconCompat.createWithResource(context.getApplicationContext(), TRUE.equals(note.getFavorite()) ? R.drawable.ic_star_accent_24dp : R.drawable.ic_star_border_accent_24dp))
+                            .setIcon(IconCompat.createWithResource(context.getApplicationContext(), TRUE.equals(note.getFavorite()) ? R.drawable.ic_star_golden_24dp : R.drawable.ic_star_border_24dp))
                             .setIntent(new Intent(getActivity(), EditNoteActivity.class).putExtra(EditNoteActivity.PARAM_NOTE_ID, note.getId()).setAction(ACTION_SHORTCUT))
                             .build();
 
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 c1d4a119db2c0673cae304191c2ee48ad48123c4..8160875fdf805688fa9239bb0988dde796acb750 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
@@ -606,10 +606,8 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A
 
         binding.headerView.setBackgroundColor(mainColor);
         binding.appName.setTextColor(textColor);
-        activityBinding.progressCircular.getIndeterminateDrawable().setColorFilter(getSecondaryForegroundColorDependingOnTheme(this, mainColor), PorterDuff.Mode.SRC_IN);
 
         // TODO We assume, that the background of the spinner is always white
-        activityBinding.swiperefreshlayout.setColorSchemeColors(contrastRatioIsSufficient(Color.WHITE, mainColor) ? mainColor : Color.BLACK);
         binding.appName.setTextColor(textColor);
 
         adapter.applyBrand(mainColor, textColor);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java
index 5ce45bd3e492a73f7fdcdfc383f4fe73f7f0cae9..43bc9c00c3849fa2c09d65fd6b5370828331ff25 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java
@@ -318,8 +318,8 @@ public class MainViewModel extends AndroidViewModel {
 
     private static List<NavigationItem> fromCategoriesWithNotesCount(@NonNull Context context, @Nullable String expandedCategory, @NonNull List<CategoryWithNotesCount> fromDatabase, int count, int favoritesCount) {
         final var categories = convertToCategoryNavigationItem(context, fromDatabase);
-        final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.ic_access_time_grey600_24dp, RECENT);
-        final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_grey_24dp, FAVORITES);
+        final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.ic_access_time_24dp, RECENT);
+        final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_24dp, FAVORITES);
 
         final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);
         items.add(itemRecent);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
index 194dcbc88cf31f956857c819e13d6f7446bd9c37..e7ed128fe87ddaf49b5163c357e3d588015c2bbc 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
@@ -81,14 +81,6 @@ public class MultiSelectedActionModeCallback implements Callback {
         // inflate contextual menu
         mode.getMenuInflater().inflate(R.menu.menu_list_context_multiple, menu);
         menu.findItem(R.id.menu_move).setVisible(canMoveNoteToAnotherAccounts);
-        for (int i = 0; i < menu.size(); i++) {
-            var drawable = menu.getItem(i).getIcon();
-            if (drawable != null) {
-                drawable = DrawableCompat.wrap(drawable);
-                DrawableCompat.setTint(drawable, colorAccent);
-                menu.getItem(i).setIcon(drawable);
-            }
-        }
         return true;
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java
index 499957069baaf8b0d54764cd3f69d66ccb43b5a8..f439adc45b7f1385be75a0d42aefb22333f9581f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java
@@ -1,8 +1,6 @@
 package it.niedermann.owncloud.notes.main.items;
 
 import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.BackgroundColorSpan;
@@ -17,17 +15,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.recyclerview.selection.ItemDetailsLookup;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.chip.Chip;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import it.niedermann.android.util.ColorUtil;
-import it.niedermann.owncloud.notes.NotesApplication;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
@@ -36,7 +29,6 @@ import it.niedermann.owncloud.notes.shared.model.NoteClickListener;
 
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
-import static it.niedermann.owncloud.notes.shared.util.NotesColorUtil.contrastRatioIsSufficient;
 
 public abstract class NoteViewHolder extends RecyclerView.ViewHolder {
     @NonNull
@@ -56,55 +48,15 @@ public abstract class NoteViewHolder extends RecyclerView.ViewHolder {
 
     protected void bindStatus(AppCompatImageView noteStatus, DBStatus status, int mainColor) {
         noteStatus.setVisibility(DBStatus.VOID.equals(status) ? INVISIBLE : VISIBLE);
-        DrawableCompat.setTint(noteStatus.getDrawable(), BrandingUtil.getSecondaryForegroundColorDependingOnTheme(noteStatus.getContext(), mainColor));
     }
 
     protected void bindCategory(@NonNull Context context, @NonNull TextView noteCategory, boolean showCategory, @NonNull String category, int mainColor) {
-        final boolean isDarkThemeActive = NotesApplication.isDarkThemeActive(context);
         noteCategory.setVisibility(showCategory && !category.isEmpty() ? View.VISIBLE : View.GONE);
         noteCategory.setText(category);
-
-        @ColorInt final int categoryForeground;
-        @ColorInt final int categoryBackground;
-
-        if (isDarkThemeActive) {
-            if (ColorUtil.INSTANCE.isColorDark(mainColor)) {
-                if (contrastRatioIsSufficient(mainColor, Color.BLACK)) {
-                    categoryBackground = mainColor;
-                    categoryForeground = Color.WHITE;
-                } else {
-                    categoryBackground = Color.WHITE;
-                    categoryForeground = mainColor;
-                }
-            } else {
-                categoryBackground = mainColor;
-                categoryForeground = Color.BLACK;
-            }
-        } else {
-            categoryForeground = Color.BLACK;
-            if (ColorUtil.INSTANCE.isColorDark(mainColor) || contrastRatioIsSufficient(mainColor, Color.WHITE)) {
-                categoryBackground = mainColor;
-            } else {
-                categoryBackground = Color.BLACK;
-            }
-        }
-
-        noteCategory.setTextColor(categoryForeground);
-        if (noteCategory instanceof Chip) {
-            final Chip chip = (Chip) noteCategory;
-            chip.setChipStrokeColor(ColorStateList.valueOf(categoryBackground));
-            if(isDarkThemeActive) {
-                chip.setChipBackgroundColor(ColorStateList.valueOf(categoryBackground));
-            } else {
-                chip.setChipBackgroundColorResource(R.color.grid_item_background_selector);
-            }
-        } else {
-            DrawableCompat.setTint(noteCategory.getBackground(), categoryBackground);
-        }
     }
 
     protected void bindFavorite(@NonNull ImageView noteFavorite, boolean isFavorite) {
-        noteFavorite.setImageResource(isFavorite ? R.drawable.ic_star_accent_24dp : R.drawable.ic_star_border_accent_24dp);
+        noteFavorite.setImageResource(isFavorite ? R.drawable.ic_star_golden_24dp : R.drawable.ic_star_border_24dp);
         noteFavorite.setOnClickListener(view -> noteClickListener.onNoteFavoriteClick(getLayoutPosition(), view));
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationAdapter.java
index 78ac616d2852c74d6d420a1ab1f8e310e16a2f47..98e1985e939f850958ccc6dbfce087df3aa3b6da 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationAdapter.java
@@ -3,13 +3,11 @@ package it.niedermann.owncloud.notes.main.navigation;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.ArrayList;
@@ -28,20 +26,20 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationViewHolder
     @ColorInt
     private int mainColor;
     @DrawableRes
-    public static final int ICON_FOLDER = R.drawable.ic_folder_grey600_24dp;
+    public static final int ICON_FOLDER = R.drawable.ic_folder_24dp;
     @DrawableRes
-    public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_grey600_24dp;
+    public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_24dp;
     @DrawableRes
-    public static final int ICON_SUB_FOLDER = R.drawable.ic_folder_grey600_18dp;
+    public static final int ICON_SUB_FOLDER = R.drawable.ic_folder_18dp;
     @DrawableRes
-    public static final int ICON_MULTIPLE = R.drawable.ic_create_new_folder_grey600_24dp;
+    public static final int ICON_MULTIPLE = R.drawable.ic_create_new_folder_24dp;
     @DrawableRes
-    public static final int ICON_MULTIPLE_OPEN = R.drawable.ic_folder_grey600_24dp;
+    public static final int ICON_MULTIPLE_OPEN = R.drawable.ic_folder_24dp;
     @DrawableRes
-    public static final int ICON_SUB_MULTIPLE = R.drawable.ic_create_new_folder_grey600_18dp;
+    public static final int ICON_SUB_MULTIPLE = R.drawable.ic_create_new_folder_18dp;
 
     public void applyBrand(int mainColor, int textColor) {
-        this.mainColor = BrandingUtil.getSecondaryForegroundColorDependingOnTheme(context, mainColor);
+        this.mainColor = BrandingUtil.readBrandMainColor(context);
         notifyDataSetChanged();
     }
 
@@ -53,7 +51,7 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationViewHolder
 
     public NavigationAdapter(@NonNull Context context, @NonNull NavigationClickListener navigationClickListener) {
         this.context = context;
-        this.mainColor = BrandingUtil.getSecondaryForegroundColorDependingOnTheme(context, BrandingUtil.readBrandMainColor(context));
+        this.mainColor = BrandingUtil.readBrandMainColor(context);
         this.navigationClickListener = navigationClickListener;
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java
index 81bab0faf68a4982322a68c6ec1304be7d3a7260..de861ef35bb3b644ba117595cc506692b00cbca0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java
@@ -54,11 +54,10 @@ class NavigationViewHolder extends RecyclerView.ViewHolder {
             icon.setVisibility(View.GONE);
         }
         final int textColor = isSelected ? mainColor : ContextCompat.getColor(view.getContext(), R.color.color_default_primary_text);
-        int unSelectedIconColor = ContextCompat.getColor(view.getContext(), isSelected ? R.color.accent_color : R.color.icon_color_default);
 
         name.setTextColor(textColor);
         count.setTextColor(textColor);
-        icon.setColorFilter(isSelected ? textColor : unSelectedIconColor);
+        icon.setSelected(isSelected);
 
         view.setSelected(isSelected);
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
index 9770197b931bb6b0191e3a06035cb57553d7b9a2..e9af6c644f68f54788974f163f63026af0c72cce 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -595,7 +595,7 @@ public class NotesRepository {
 
                                 newShortcuts.add(new ShortcutInfo.Builder(this.context, note.getId() + "")
                                         .setShortLabel(note.getTitle() + "")
-                                        .setIcon(Icon.createWithResource(this.context, note.getFavorite() ? R.drawable.ic_star_accent_24dp : R.drawable.ic_star_border_accent_24dp))
+                                        .setIcon(Icon.createWithResource(this.context, note.getFavorite() ? R.drawable.ic_star_golden_24dp : R.drawable.ic_star_border_24dp))
                                         .setIntent(intent)
                                         .build());
                             } else {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java
index 8a8207b9b60ab1fab6cf6a2c20e3c328fa19d128..5c73ca2c397942eea6c4496761cd50ca08a12147 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java
@@ -45,8 +45,8 @@ public class NoteListViewModel extends AndroidViewModel {
                             final var categories = convertToCategoryNavigationItem(getApplication(), fromDatabase);
 
                             final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);
-                            items.add(new NavigationItem(MainActivity.ADAPTER_KEY_RECENT, getApplication().getString(R.string.label_all_notes), count, R.drawable.ic_access_time_grey600_24dp, RECENT));
-                            items.add(new NavigationItem(MainActivity.ADAPTER_KEY_STARRED, getApplication().getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_grey_24dp, FAVORITES));
+                            items.add(new NavigationItem(MainActivity.ADAPTER_KEY_RECENT, getApplication().getString(R.string.label_all_notes), count, R.drawable.ic_access_time_24dp, RECENT));
+                            items.add(new NavigationItem(MainActivity.ADAPTER_KEY_STARRED, getApplication().getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_24dp, FAVORITES));
 
                             if (categories.size() > 2 && categories.get(2).label.isEmpty()) {
                                 items.add(new NavigationItem(MainActivity.ADAPTER_KEY_UNCATEGORIZED, "", null, NavigationAdapter.ICON_NOFOLDER));
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
index a17124a8a2428cae858f2af7443d907e45e048ea..60ecb44ef193c6594ba303449ab5a49c3a3a7190 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
@@ -134,8 +134,8 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
             note_content.setOnClickFillInIntent(R.id.widget_note_list_entry, fillInIntent);
             note_content.setTextViewText(R.id.widget_entry_content_tv, note.getTitle());
             note_content.setImageViewResource(R.id.widget_entry_fav_icon, note.getFavorite()
-                    ? R.drawable.ic_star_accent_24dp
-                    : R.drawable.ic_star_border_accent_24dp);
+                    ? R.drawable.ic_star_golden_24dp
+                    : R.drawable.ic_star_border_24dp);
         }
 
         return note_content;
diff --git a/app/src/main/res/drawable-night/border.xml b/app/src/main/res/drawable-night/border.xml
deleted file mode 100644
index ab9d52ea233fef0221ad777fbd4bf26663937ee9..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable-night/border.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/category_background" />
-    <stroke
-        android:width="1dip"
-        android:color="@color/category_border" />
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/alphabetical_asc.xml b/app/src/main/res/drawable/alphabetical_asc.xml
index 15fd95750a67f58056cebbabd7b5ccf0a939ac06..c75a836f9a0264196e4f32326d17c91e84161366 100644
--- a/app/src/main/res/drawable/alphabetical_asc.xml
+++ b/app/src/main/res/drawable/alphabetical_asc.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="26">
 
     <path
-        android:fillColor="#757575"
+        android:fillColor="@color/icon_color_default"
         android:pathData="M20.401,13.623L18.877,13.621L18.868,20.218L17.228,18.57L16.145,19.651L19.627,23.145L23.12,19.663L22.039,18.58L20.392,20.219L20.401,13.623ZM15.034,12.122L15.034,13.376L10.691,19.609L10.691,19.684L15.1,19.684L15.1,21.481L7.847,21.481L7.847,20.302L12.292,13.967L12.292,13.91L8.268,13.91L8.268,12.122L15.034,12.122ZM13.051,1.85L15.981,11.208L13.678,11.208L12.949,8.68L10.244,8.68L9.571,11.208L7.352,11.208L10.244,1.85L13.051,1.85ZM12.64,7.165L12.05,5.182L11.807,4.273L11.573,3.374L11.545,3.374L11.339,4.283L11.114,5.2L10.553,7.165L12.64,7.165Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_navdrawer_item.xml b/app/src/main/res/drawable/bg_navdrawer_item.xml
index 008b2abbf1ab27e0553e56913c65e145aaaa92f4..ea3e945e6e59a81c9e66f7306d98b555b47f89c3 100644
--- a/app/src/main/res/drawable/bg_navdrawer_item.xml
+++ b/app/src/main/res/drawable/bg_navdrawer_item.xml
@@ -3,32 +3,25 @@
     android:color="?colorControlHighlight">
 
     <item
-        android:id="@android:id/mask"
-        android:left="@dimen/spacer_1x"
-        android:right="@dimen/spacer_1x">
+        android:id="@android:id/mask">
 
         <shape android:shape="rectangle">
             <!-- value of color is irrelevant, but solid needs to be defined for mask to work -->
             <solid android:color="@color/bg_highlighted" />
-            <corners android:radius="@dimen/spacer_5x" />
         </shape>
     </item>
 
-    <item
-        android:left="@dimen/spacer_1x"
-        android:right="@dimen/spacer_1x">
+    <item>
 
         <selector>
             <item android:state_selected="true">
                 <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/spacer_5x" />
-                    <solid android:color="@color/bg_highlighted" />
+                    <solid android:color="@color/e_alpha_accent" />
                 </shape>
             </item>
 
             <item>
                 <shape android:shape="rectangle">
-                    <corners android:radius="@dimen/spacer_5x" />
                 </shape>
             </item>
         </selector>
diff --git a/app/src/main/res/drawable/border.xml b/app/src/main/res/drawable/border.xml
index 319814a6022eb1f5e56dffaf505edab2a221a074..2dd2888d2736c67ad983712e32cea9f5f1251068 100644
--- a/app/src/main/res/drawable/border.xml
+++ b/app/src/main/res/drawable/border.xml
@@ -1,8 +1,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@android:color/transparent" />
-    <stroke
-        android:width="1dip"
-        android:color="@color/category_border" />
+    <solid android:color="@color/accent" />
     <corners android:radius="4dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/check.xml b/app/src/main/res/drawable/check.xml
index 4c6c6b760e1a8fb2dcd938f69ef8c58ab9c4b7b9..c50c9158607b462a8c0cd1b55193bf590b60019f 100644
--- a/app/src/main/res/drawable/check.xml
+++ b/app/src/main/res/drawable/check.xml
@@ -5,7 +5,7 @@
             <solid android:color="@color/defaultBrand" />
             <stroke
                 android:width="1dp"
-                android:color="@android:color/white" />
+                android:color="@color/defaultBrand" />
         </shape>
     </item>
     <item android:drawable="@drawable/ic_check_white_24dp" />
diff --git a/app/src/main/res/drawable/ic_access_time_24dp.xml b/app/src/main/res/drawable/ic_access_time_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3197e022af19b3ade139e4611c3012ae2e07c18a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_access_time_24dp.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/ic_access_time_accent_24dp"/>
+
+    <item android:drawable="@drawable/ic_access_time_grey600_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_access_time_accent_24dp.xml b/app/src/main/res/drawable/ic_access_time_accent_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8a94e1f75a539790f6df402cc31cfc46d3df1b58
--- /dev/null
+++ b/app/src/main/res/drawable/ic_access_time_accent_24dp.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_create_new_folder_18dp.xml b/app/src/main/res/drawable/ic_create_new_folder_18dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ed5c86fa3ca74905cf1ac309216d7bcdccc12147
--- /dev/null
+++ b/app/src/main/res/drawable/ic_create_new_folder_18dp.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/ic_create_new_folder_accent_18dp"/>
+
+    <item android:drawable="@drawable/ic_create_new_folder_grey600_18dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_create_new_folder_24dp.xml b/app/src/main/res/drawable/ic_create_new_folder_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8b55d5ce98c14ee3c2b1bfa6b4f978468e074c9e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_create_new_folder_24dp.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/ic_create_new_folder_accent_24dp"/>
+
+    <item android:drawable="@drawable/ic_create_new_folder_grey600_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_create_new_folder_accent_18dp.xml b/app/src/main/res/drawable/ic_create_new_folder_accent_18dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c08c2f69cfc819c51ebe25956888b7af86363296
--- /dev/null
+++ b/app/src/main/res/drawable/ic_create_new_folder_accent_18dp.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector android:autoMirrored="true"
+    android:height="18dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="18dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@color/defaultBrand"
+        android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_create_new_folder_accent_24dp.xml b/app/src/main/res/drawable/ic_create_new_folder_accent_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..85b9d19c0d4af19471f1c9d4ee279aec90aba055
--- /dev/null
+++ b/app/src/main/res/drawable/ic_create_new_folder_accent_24dp.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@color/defaultBrand"
+        android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_18dp.xml b/app/src/main/res/drawable/ic_folder_18dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b224bad9d81b6b570ba09bbbd9c483152c7f1e52
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_18dp.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/ic_folder_accent_18dp"/>
+
+    <item android:drawable="@drawable/ic_folder_grey600_18dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_folder_24dp.xml b/app/src/main/res/drawable/ic_folder_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f28a8b0dab815dd85b7317880128d2989d7f71cc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_24dp.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/ic_folder_accent_24dp"/>
+
+    <item android:drawable="@drawable/ic_folder_grey_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_folder_accent_18dp.xml b/app/src/main/res/drawable/ic_folder_accent_18dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1dac709f68ebf2ac1fc18972dabfb578da1df0b9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_accent_18dp.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/accent"
+        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_accent_24dp.xml b/app/src/main/res/drawable/ic_folder_accent_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9f55647369a2c7e9cc5d6aced36175185517e52c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_accent_24dp.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@color/defaultBrand"
+        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_open_24dp.xml b/app/src/main/res/drawable/ic_folder_open_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fb623afbbfb4c903e6a538e198de555b86b58970
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_open_24dp.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/ic_folder_open_accent_24dp"/>
+
+    <item android:drawable="@drawable/ic_folder_open_grey600_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_folder_open_accent_24dp.xml b/app/src/main/res/drawable/ic_folder_open_accent_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f1954c16de70693596616e31c0a9253d96b8b3dd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_open_accent_24dp.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<vector android:autoMirrored="true"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@color/defaultBrand"
+        android:pathData="M20,6h-8l-2,-2L4,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,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_hamberger_24dp.xml b/app/src/main/res/drawable/ic_hamberger_24dp.xml
index cdc451e7d178b9bdad22b50bf8e6ce13986e3dbe..49fd9f6ec5379fc55fc740f2804d6fff0113cda7 100644
--- a/app/src/main/res/drawable/ic_hamberger_24dp.xml
+++ b/app/src/main/res/drawable/ic_hamberger_24dp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright Murena SAS 2022
+  ~ Copyright Murena SAS 2023
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
   ~ the Free Software Foundation, either version 3 of the License, or
diff --git a/app/src/main/res/drawable/ic_star_24dp.xml b/app/src/main/res/drawable/ic_star_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cc9fb0d09acf15e0c70450bdd2a3e788fdcf0490
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_24dp.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true" android:drawable="@drawable/ic_star_accent_24dp"/>
+
+    <item android:drawable="@drawable/ic_star_grey_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_star_accent_24dp.xml b/app/src/main/res/drawable/ic_star_accent_24dp.xml
index 67343f62156561850197fdeadc1a7326577db84e..a67a307edd4e7e1d3dbba25ab752bef72effca7e 100644
--- a/app/src/main/res/drawable/ic_star_accent_24dp.xml
+++ b/app/src/main/res/drawable/ic_star_accent_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright Murena SAS 2022
+  ~ Copyright Murena SAS 2023
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
   ~ the Free Software Foundation, either version 3 of the License, or
@@ -14,12 +14,13 @@
   ~ You should have received a copy of the GNU General Public License
   ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
+
 <vector android:height="24dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/defaultBrand"
         android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_border_accent_24dp.xml b/app/src/main/res/drawable/ic_star_border_24dp.xml
similarity index 93%
rename from app/src/main/res/drawable/ic_star_border_accent_24dp.xml
rename to app/src/main/res/drawable/ic_star_border_24dp.xml
index a90ab8f4b81186588468e3f543b431100356913d..fdc0e705582612a2227db0e065b4601eb3f9dc8f 100644
--- a/app/src/main/res/drawable/ic_star_border_accent_24dp.xml
+++ b/app/src/main/res/drawable/ic_star_border_24dp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright Murena SAS 2022
+  ~ Copyright Murena SAS 2023
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
   ~ the Free Software Foundation, either version 3 of the License, or
@@ -21,6 +21,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="@color/accent_color"
+        android:fillColor="@color/icon_color_default"
         android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_star_golden_24dp.xml b/app/src/main/res/drawable/ic_star_golden_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cef5dc7fa9536aa3e7cce498290c75d32ec55e89
--- /dev/null
+++ b/app/src/main/res/drawable/ic_star_golden_24dp.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<vector android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@color/color_star_fill"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_star_grey_24dp.xml b/app/src/main/res/drawable/ic_star_grey_24dp.xml
index ce8dbc9ea83e5cf8c8d147cb9aec61c52ab38d23..086335a88af5a35be940174223432fd23089219f 100644
--- a/app/src/main/res/drawable/ic_star_grey_24dp.xml
+++ b/app/src/main/res/drawable/ic_star_grey_24dp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright Murena SAS 2022
+  ~ Copyright Murena SAS 2023
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
   ~ the Free Software Foundation, either version 3 of the License, or
diff --git a/app/src/main/res/drawable/ic_sync_blue_18dp.xml b/app/src/main/res/drawable/ic_sync_18dp.xml
similarity index 90%
rename from app/src/main/res/drawable/ic_sync_blue_18dp.xml
rename to app/src/main/res/drawable/ic_sync_18dp.xml
index 55ffa35deebb53a5cb4f16bb5e38140a1908850f..1b4f9b0977b2159fe442e12ccdd642563d68e205 100644
--- a/app/src/main/res/drawable/ic_sync_blue_18dp.xml
+++ b/app/src/main/res/drawable/ic_sync_18dp.xml
@@ -5,6 +5,6 @@
     android:width="18dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/icon_color_default"
         android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z" />
 </vector>
diff --git a/app/src/main/res/drawable/list_item_background_selector.xml b/app/src/main/res/drawable/list_item_background_selector.xml
index 4025de9d9f881f084e675311ad4311866f55ef44..573bd924b6c0dbd700c254b5e5c88dde6277db20 100644
--- a/app/src/main/res/drawable/list_item_background_selector.xml
+++ b/app/src/main/res/drawable/list_item_background_selector.xml
@@ -5,11 +5,11 @@
     <item>
         <selector>
             <item android:state_selected="true">
-                <color android:color="@color/fg_default" />
+                <color android:color="@color/bg_highlighted" />
             </item>
 
             <item android:state_activated="true">
-                <color android:color="@color/fg_default" />
+                <color android:color="@color/bg_highlighted" />
             </item>
 
             <item>
diff --git a/app/src/main/res/drawable/modification_desc.xml b/app/src/main/res/drawable/modification_desc.xml
index edd8f2584f7cded6c7233de08a48704b2a04ede0..c0db4d4afb9bec6735fc274bc2fec1c81e3dadc1 100644
--- a/app/src/main/res/drawable/modification_desc.xml
+++ b/app/src/main/res/drawable/modification_desc.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="26">
 
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="@color/icon_color_default"
         android:pathData="M23.563,22.69L14.635,22.69L14.635,20.838L23.563,20.838L23.563,22.69ZM11.59,2.133C16.177,2.138 20.131,5.479 20.902,10L18.979,10C18.232,6.53 15.139,4.029 11.59,4.025C7.44,4.026 4.026,7.44 4.025,11.59C4.025,15.74 7.44,19.156 11.59,19.156C12.068,19.155 12.546,19.109 13.016,19.018L13.016,20.922C12.544,21 12.068,21.043 11.59,21.049C6.36,21.049 2.133,16.791 2.133,11.59C2.133,6.402 6.402,2.133 11.59,2.133ZM20.587,18.06L14.635,18.06L14.635,16.208L20.587,16.208L20.587,18.06ZM12.062,6.863L12.062,11.826L13.016,12.393L13.016,13.957L10.645,12.535L10.645,6.863L12.062,6.863ZM17.611,13.429L14.635,13.429L14.635,11.577L17.611,11.577L17.611,13.429Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 1c686f5d7491d426bd4fc19faf1d32a81d31d993..d8dc98fd3d9bcf66959e4bca61ee0729b8d250b0 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright Murena SAS 2022
+  ~ Copyright Murena SAS 2023
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
   ~ the Free Software Foundation, either version 3 of the License, or
diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml
index cd71677f58e79095bdb0e5798a9559290d3a9999..f8fcfae4de9dabec16ec371fabd5ede92963593f 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -28,7 +28,7 @@
                     android:layout_marginHorizontal="@dimen/spacer_activity_sides"
                     android:layout_marginVertical="@dimen/spacer_1hx"
                     app:cardBackgroundColor="@color/appbar"
-                    app:cardCornerRadius="@dimen/spacer_4x"
+                    app:cardCornerRadius="0dp"
                     app:cardElevation="2dp"
                     app:strokeWidth="0dp">
 
@@ -64,7 +64,6 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:contentDescription="@string/action_sorting_method"
                                 android:padding="@dimen/spacer_2x"
-                                android:tint="?attr/colorAccent"
                                 android:translationX="@dimen/spacer_2x"
                                 app:srcCompat="@drawable/alphabetical_asc" />
 
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index c2b8ddf5f0975877bde7b6193cd948aac235b927..103c67df5dc034e55dda5ce73459e92f98600691 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -18,20 +18,20 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         app:drawerLayoutCornerSize="0dp"
-        android:background="@color/fg_default"
+        android:background="@color/e_drawer_background"
         android:fitsSystemWindows="true">
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/scrollView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/fg_default">
+            android:background="@color/e_drawer_background">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:background="@color/fg_default">
+                android:background="@color/e_drawer_background">
 
                 <RelativeLayout
                     android:id="@+id/header_view"
diff --git a/app/src/main/res/layout/item_navigation.xml b/app/src/main/res/layout/item_navigation.xml
index 7966a93687f6c5413bde10c92773930019c0eca8..8fc7009a614d50b689b2aef3665bf88e21c3bd75 100644
--- a/app/src/main/res/layout/item_navigation.xml
+++ b/app/src/main/res/layout/item_navigation.xml
@@ -15,7 +15,6 @@
         android:contentDescription="@null"
         android:focusable="false"
         android:scaleType="center"
-        android:tint="@color/icon_color_default"
         app:srcCompat="@drawable/ic_folder_grey600_24dp" />
 
     <TextView
diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid.xml b/app/src/main/res/layout/item_notes_list_note_item_grid.xml
index 818e72e538f65b1b1e9db97d5819d8d0f71d6433..09c79ab15b697a66e6d04d351168806bb0dcb0f7 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_grid.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_grid.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:focusable="true"
-    app:cardBackgroundColor="@color/appbar"
+    app:cardBackgroundColor="@color/e_background"
     app:cardCornerRadius="@dimen/spacer_1x">
 
     <LinearLayout
@@ -60,7 +60,7 @@
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/menu_favorite"
                     android:padding="@dimen/spacer_2x"
-                    tools:src="@drawable/ic_star_accent_24dp" />
+                    tools:src="@drawable/ic_star_golden_24dp" />
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/noteStatus"
@@ -70,7 +70,7 @@
                     android:layout_marginTop="12dp"
                     android:layout_marginEnd="4dp"
                     android:baseline="14dp"
-                    app:srcCompat="@drawable/ic_sync_blue_18dp" />
+                    app:srcCompat="@drawable/ic_sync_18dp" />
             </FrameLayout>
 
             <FrameLayout
@@ -87,9 +87,9 @@
                     android:layout_marginEnd="@dimen/spacer_2x"
                     android:ellipsize="middle"
                     android:padding="@dimen/spacer_1hx"
-                    android:textColor="?android:textColorPrimary"
+                    android:textColor="@color/e_background"
                     android:textSize="@dimen/secondary_font_size"
-                    app:chipBackgroundColor="@color/primary"
+                    app:chipBackgroundColor="@color/defaultBrand"
                     app:chipEndPadding="@dimen/spacer_1x"
                     app:chipMinHeight="0dp"
                     app:chipStartPadding="@dimen/spacer_1x"
diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml b/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
index 6ecb33c29ae2044d74320fd98085d14f51080001..a1f2cd38227fb93b1c89c37a969e891685b6fc41 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:focusable="true"
-    app:cardBackgroundColor="@color/appbar"
+    app:cardBackgroundColor="@color/e_background"
     app:cardCornerRadius="@dimen/spacer_1x">
 
     <LinearLayout
@@ -29,7 +29,7 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/menu_favorite"
                 android:padding="@dimen/spacer_2x"
-                tools:src="@drawable/ic_star_accent_24dp" />
+                tools:src="@drawable/ic_star_golden_24dp" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/noteStatus"
@@ -39,7 +39,7 @@
                 android:layout_marginTop="12dp"
                 android:layout_marginEnd="4dp"
                 android:baseline="14dp"
-                app:srcCompat="@drawable/ic_sync_blue_18dp" />
+                app:srcCompat="@drawable/ic_sync_18dp" />
         </FrameLayout>
 
         <TextView
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 8f21aac2f6edbd10299835f5e05104612d67a6e9..3d82d4aed71814bd31fc0e4f1c0b24ddd4c27a27 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
@@ -5,7 +5,7 @@
     android:id="@+id/noteSwipeFrame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/bg_attention">
+    android:background="@color/e_background">
 
     <ImageView
         android:id="@+id/noteFavoriteLeft"
@@ -45,7 +45,7 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/menu_favorite"
                 android:padding="@dimen/spacer_2x"
-                tools:src="@drawable/ic_star_accent_24dp" />
+                tools:src="@drawable/ic_star_golden_24dp" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/noteStatus"
@@ -55,7 +55,7 @@
                 android:layout_marginTop="12dp"
                 android:layout_marginEnd="4dp"
                 android:baseline="14dp"
-                app:srcCompat="@drawable/ic_sync_blue_18dp" />
+                app:srcCompat="@drawable/ic_sync_18dp" />
         </FrameLayout>
 
 
@@ -110,7 +110,7 @@
                     android:paddingVertical="1dp"
                     android:paddingHorizontal="@dimen/spacer_1x"
                     android:singleLine="true"
-                    android:textColor="@color/color_default_primary_text"
+                    android:textColor="@color/e_background"
                     android:textSize="@dimen/secondary_font_size"
                     tools:maxLength="15"
                     tools:text="@tools:sample/lorem/random" />
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
index 89ac4c9469983610ff877c2e5e2ce87df0cdc855..59af0bf63140fb5019ac650c2948b24532d0f284 100644
--- 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
@@ -46,7 +46,7 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/menu_favorite"
                 android:padding="@dimen/spacer_2x"
-                tools:src="@drawable/ic_star_accent_24dp" />
+                tools:src="@drawable/ic_star_golden_24dp" />
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/noteStatus"
@@ -56,7 +56,7 @@
                 android:layout_marginTop="12dp"
                 android:layout_marginEnd="4dp"
                 android:baseline="14dp"
-                app:srcCompat="@drawable/ic_sync_blue_18dp" />
+                app:srcCompat="@drawable/ic_sync_18dp" />
         </FrameLayout>
 
         <TextView
@@ -84,7 +84,7 @@
             android:paddingHorizontal="@dimen/spacer_1x"
             android:paddingBottom="1dp"
             android:singleLine="true"
-            android:textColor="?android:textColorPrimary"
+            android:textColor="@color/e_background"
             android:textSize="@dimen/secondary_font_size"
             tools:maxLength="15"
             tools:text="@tools:sample/lorem/random" />
diff --git a/app/src/main/res/layout/widget_entry.xml b/app/src/main/res/layout/widget_entry.xml
index a39905847293f2f654def5c24db2ea96b591bc44..580eba5ea571ebb6222c885c77f59f8120cb71ca 100644
--- a/app/src/main/res/layout/widget_entry.xml
+++ b/app/src/main/res/layout/widget_entry.xml
@@ -19,7 +19,7 @@
         android:foregroundGravity="center_vertical"
         android:paddingStart="@dimen/widget_note_list_inner_padding"
         android:paddingEnd="@dimen/widget_note_list_outer_padding"
-        app:srcCompat="@drawable/ic_star_accent_24dp" />
+        app:srcCompat="@drawable/ic_star_golden_24dp" />
 
     <TextView
         android:id="@+id/widget_entry_content_tv"
diff --git a/app/src/main/res/menu/menu_note_activity.xml b/app/src/main/res/menu/menu_note_activity.xml
index e7bf3f7f9e363ab68b6b59437b2665902e74fbba..967bb4f075a7ba9bf6b8615d0110117134e6b825 100644
--- a/app/src/main/res/menu/menu_note_activity.xml
+++ b/app/src/main/res/menu/menu_note_activity.xml
@@ -6,13 +6,11 @@
         android:icon="@drawable/ic_eye_grey600_24dp"
         android:orderInCategory="60"
         android:title="@string/menu_preview"
-        app:iconTint="@color/e_icon_color"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_edit"
         android:icon="@drawable/ic_edit_grey600_24dp"
         android:orderInCategory="60"
         android:title="@string/simple_edit"
-        app:iconTint="@color/e_icon_color"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_note_fragment.xml b/app/src/main/res/menu/menu_note_fragment.xml
index 76e01ec8cb2801deb1f1da8ce1bfe272e26eec47..83f05fcba8a0242636cc5175328d2fde6615e5c8 100644
--- a/app/src/main/res/menu/menu_note_fragment.xml
+++ b/app/src/main/res/menu/menu_note_fragment.xml
@@ -6,7 +6,6 @@
         android:id="@+id/search"
         android:title="@string/action_search"
         android:icon="@drawable/ic_search_grey600_24dp"
-        app:iconTint="@color/e_icon_color"
         android:orderInCategory="50"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
@@ -14,7 +13,6 @@
     <item
         android:id="@+id/menu_favorite"
         android:orderInCategory="80"
-        app:iconTint="@color/e_icon_color"
         android:title="@string/menu_favorite"
         android:checkable="true"
         app:showAsAction="ifRoom" />
@@ -27,21 +25,18 @@
     <item
         android:id="@+id/menu_category"
         android:icon="@drawable/ic_folder_grey_24dp"
-        app:iconTint="@color/e_icon_color"
         android:orderInCategory="100"
         android:title="@string/menu_change_category"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/menu_share"
         android:icon="@drawable/ic_share_grey_24dp"
-        app:iconTint="@color/e_icon_color"
         android:orderInCategory="100"
         android:title="@string/menu_share"
         app:showAsAction="never" />
     <item
         android:id="@+id/menu_move"
         android:icon="@drawable/ic_send_grey600_24dp"
-        app:iconTint="@color/e_icon_color"
         android:orderInCategory="120"
         android:title="@string/simple_move"
         app:showAsAction="never" />
@@ -55,7 +50,6 @@
     <item
         android:id="@+id/menu_delete"
         android:icon="@drawable/ic_delete_grey600_24dp"
-        app:iconTint="@color/e_icon_color"
         android:orderInCategory="140"
         android:title="@string/menu_delete"
         app:showAsAction="never" />
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e1322d7ff5b7e005dd3eb74e866626800d37b56a
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<resources>
+    <color name="bg_highlighted">#1e242a</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5de03b526782df7540d3409ad070aba8a76e7e47..452cbc5ec7f4cebbae25697113efa7707d8eaf88 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,7 +15,7 @@
     <color name="cursorHandles">#555566</color>
     <color name="defaultTextHighlightBackground">#2233334a</color>
 
-    <color name="bg_highlighted">@android:color/white</color>
+    <color name="bg_highlighted">#eaf5ff</color>
     <color name="bg_selected_item">@color/e_floating_background</color>
     <color name="bg_normal">@color/e_background</color>
     <color name="bg_attention">#d40000</color>
@@ -39,4 +39,6 @@
 
     <color name="widget_background">@color/e_background</color>
     <color name="widget_foreground">@color/e_primary_text_color</color>
+
+    <color name="color_star_fill">#FFC300</color>
 </resources>