diff --git a/CHANGELOG.md b/CHANGELOG.md
index 075900f..9014221 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added the option to wrap page links in parenthesis when creating tasks with the command. You may find this useful if you primarily use Todoist on mobile where links are less obvious. Thanks to [@ThDag](https://github.com/ThDag) for the contribution!
 - You can now use the `{{filename}}` placeholder in the filter property. This will be replaced with the name of the file where the query is defined.
   - For example, if the full file path is `My Vault/Notes/How to Take Smart Notes.md` then the replaced file name will be `How to Take Smart Notes`.
-- Create "Add item" button to rendered queries. This will open the task creatio modal.
+- Added "Add item" button to rendered queries. This will open the task creation modal.
 
 ### 🔁 Changes
 
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Change the style of the sync button to match the Obsidian style of the "edit" codeblock button.
 - Fix intent level to match standard markdown levels in order to have consistent style.
 - Aligned the grouping behaviour with Todoist's when grouping by project. This will be expanded on in a future release.
+- Changed all icons to be part of the Lucide set to align with Obsidian.
 
 ## [1.11.1] - 2023-04-09
 
diff --git a/src/components/ObsidianIcon.svelte b/src/components/ObsidianIcon.svelte
new file mode 100644
index 0000000..d3757d1
--- /dev/null
+++ b/src/components/ObsidianIcon.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+  import { setIcon } from "obsidian";
+  import { onMount } from "svelte";
+
+  export let iconId: string;
+  export let size: number | undefined = undefined;
+
+  let clazz: string | undefined = undefined;
+  export { clazz as class };
+
+  let containerEl: HTMLDivElement;
+
+  onMount(() => {
+    setIcon(containerEl, iconId, size);
+  });
+</script>
+
+<div bind:this={containerEl} class={clazz} />
+
+<style>
+  div {
+    display: flex;
+    align-items: center;
+  }
+</style>
diff --git a/src/components/icons/CalendarIcon.svelte b/src/components/icons/CalendarIcon.svelte
deleted file mode 100644
index cd4c699..0000000
--- a/src/components/icons/CalendarIcon.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script lang="ts">
-  let clazz: string;
-  export { clazz as class };
-</script>
-
-<svg
-  class={clazz}
-  xmlns="http://www.w3.org/2000/svg"
-  viewBox="0 0 20 20"
-  fill="currentColor"
->
-  <path
-    fill-rule="evenodd"
-    d="M6 2a1 1 0 00-1 1v1H4a2 2 0 00-2 2v10a2 2 0 002 2h12a2 2 0 002-2V6a2 2 0 00-2-2h-1V3a1 1 0 10-2 0v1H7V3a1 1 0 00-1-1zm0 5a1 1 0 000 2h8a1 1 0 100-2H6z"
-    clip-rule="evenodd"
-  />
-</svg>
diff --git a/src/components/icons/LabelIcon.svelte b/src/components/icons/LabelIcon.svelte
deleted file mode 100644
index f4aa055..0000000
--- a/src/components/icons/LabelIcon.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script lang="ts">
-  let clazz: string;
-  export { clazz as class };
-</script>
-
-<svg
-  class={clazz}
-  xmlns="http://www.w3.org/2000/svg"
-  viewBox="0 0 20 20"
-  fill="currentColor"
->
-  <path
-    fill-rule="evenodd"
-    d="M17.707 9.293a1 1 0 010 1.414l-7 7a1 1 0 01-1.414 0l-7-7A.997.997 0 012 10V5a3 3 0 013-3h5c.256 0 .512.098.707.293l7 7zM5 6a1 1 0 100-2 1 1 0 000 2z"
-    clip-rule="evenodd"
-  />
-</svg>
diff --git a/src/components/icons/ProjectIcon.svelte b/src/components/icons/ProjectIcon.svelte
deleted file mode 100644
index 9996ff7..0000000
--- a/src/components/icons/ProjectIcon.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script lang="ts">
-  let clazz: string;
-  export { clazz as class };
-</script>
-
-<svg
-  class={clazz}
-  xmlns="http://www.w3.org/2000/svg"
-  viewBox="0 0 20 20"
-  fill="currentColor"
->
-  <path
-    fill-rule="evenodd"
-    d="M5 3a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2V5a2 2 0 00-2-2H5zm0 2h10v7h-2l-1 2H8l-1-2H5V5z"
-    clip-rule="evenodd"
-  />
-</svg>
diff --git a/src/ui/TaskRenderer.svelte b/src/ui/TaskRenderer.svelte
index 613cff7..5f93eac 100644
--- a/src/ui/TaskRenderer.svelte
+++ b/src/ui/TaskRenderer.svelte
@@ -1,8 +1,5 @@
 <script lang="ts">
   import { fade } from "svelte/transition";
-  import CalendarIcon from "../components/icons/CalendarIcon.svelte";
-  import LabelIcon from "../components/icons/LabelIcon.svelte";
-  import ProjectIcon from "../components/icons/ProjectIcon.svelte";
   import MarkdownRenderer from "../components/MarkdownRenderer.svelte";
   import { showTaskContext } from "../contextMenu";
   import { settings } from "../settings";
@@ -12,6 +9,7 @@
   import { getDueDateInfo, type DueDateInfo } from "../api/domain/dueDate";
   import type { CalendarSpec } from "moment";
   import { getTaskActions } from "./contexts";
+  import ObsidianIcon from "../components/ObsidianIcon.svelte";
 
   const dateOnlyCalendarSpec: CalendarSpec = {
     sameDay: "[Today]",
@@ -147,27 +145,27 @@
   {/if}
   <div class="task-metadata">
     {#if shouldRenderProject}
-      <div class="task-project">
+      <div class="task-metadata-item">
         {#if $settings.renderProjectIcon}
-          <ProjectIcon class="task-project-icon" />
+          <ObsidianIcon iconId="inbox" />
         {/if}
-        {projectLabel}
+        <span>{projectLabel}</span>
       </div>
     {/if}
     {#if shouldRenderDueDate}
-      <div class="task-date {dateTimeClass}">
+      <div class="task-metadata-item {dateTimeClass}">
         {#if $settings.renderDateIcon}
-          <CalendarIcon class="task-calendar-icon" />
+          <ObsidianIcon iconId="calendar" />
         {/if}
-        {dateLabel}
+        <span>{dateLabel}</span>
       </div>
     {/if}
     {#if shouldRenderLabels}
-      <div class="task-labels">
+      <div class="task-metadata-item">
         {#if $settings.renderLabelsIcon}
-          <LabelIcon class="task-labels-icon" />
+          <ObsidianIcon iconId="tag" />
         {/if}
-        {labels}
+        <span>{labels}</span>
       </div>
     {/if}
   </div>
diff --git a/src/ui/TodoistQuery.svelte b/src/ui/TodoistQuery.svelte
index fba165b..6849ff2 100644
--- a/src/ui/TodoistQuery.svelte
+++ b/src/ui/TodoistQuery.svelte
@@ -11,6 +11,7 @@
   import TaskListRoot from "./TaskListRoot.svelte";
   import { Notice } from "obsidian";
   import { setTaskActions } from "./contexts";
+  import ObsidianIcon from "../components/ObsidianIcon.svelte";
 
   export let query: Query;
   export let todoistAdapter: TodoistAdapter;
@@ -114,25 +115,11 @@
   }}
   aria-label="Refresh list"
 >
-  <svg
-    class={fetching
-      ? "svg-icon lucide-code-2 todoist-refresh-spin"
-      : "svg-icon lucide-code-2"}
-    xmlns="http://www.w3.org/2000/svg"
-    width="24"
-    height="24"
-    viewBox="0 0 24 24"
-    fill="none"
-    stroke="currentColor"
-    stroke-width="2"
-    stroke-linecap="round"
-    stroke-linejoin="round"
-    ><path d="M21 12a9 9 0 0 0-9-9 9.75 9.75 0 0 0-6.74 2.74L3 8" /><path
-      d="M3 3v5h5"
-    /><path d="M3 12a9 9 0 0 0 9 9 9.75 9.75 0 0 0 6.74-2.74L21 16" /><path
-      d="M16 16h5v5"
-    />
-  </svg>
+  <ObsidianIcon
+    class={fetching ? "todoist-refresh-spin" : ""}
+    iconId="refresh-ccw"
+    size={24}
+  />
 </div>
 <div
   class="edit-block-button todoist-add-button"
@@ -141,18 +128,7 @@
   }}
   aria-label="Add item"
 >
-  <svg
-    class="svg-icon lucide-code-2"
-    xmlns="http://www.w3.org/2000/svg"
-    width="24"
-    height="24"
-    viewBox="0 0 24 24"
-    fill="none"
-    stroke="currentColor"
-    stroke-width="2"
-    stroke-linecap="round"
-    stroke-linejoin="round"><path d="M5 12h14" /><path d="M12 5v14" /></svg
-  >
+  <ObsidianIcon iconId="plus" size={24} />
 </div>
 <br />
 {#if fetchedOnce}
diff --git a/styles.css b/styles.css
index 23850a7..71d858a 100644
--- a/styles.css
+++ b/styles.css
@@ -17,6 +17,14 @@
 .markdown-reading-view .todoist-refresh-button {
   float: right;
   margin-left: 8px;
+  color: var(--text-muted);
+  border-radius: var(--radius-s);
+  padding: var(--size-2-2) var(--size-2-3);
+}
+
+.markdown-reading-view .todoist-add-button:hover,
+.markdown-reading-view .todoist-refresh-button:hover {
+  background-color: var(--background-modifier-hover);
 }
 
 .todoist-refresh-disabled {
@@ -41,18 +49,19 @@
 
 .is-live-preview .task-metadata,
 .is-live-preview .todoist-task-description {
-  margin-left: 28px;
+  margin-left: 26px;
+}
+
+.task-metadata-item {
+  display: flex;
+  align-items: center;
 }
 
-.task-calendar-icon,
-.task-project-icon,
-.task-labels-icon {
-  vertical-align: middle;
-  height: 17px;
-  width: 17px;
+.task-metadata-item > * + * {
+  margin-left: 0.25rem;
 }
 
-.task-date.task-overdue {
+.task-metadata-item.task-overdue {
   color: var(--text-error);
 }