diff --git a/src/App.vue b/src/App.vue
index a2e8ff3..e34fea6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
 import Player from './components/Player.vue'
+import LeftArrowIcon from './assets/icons/leftarrow.vue'
+import SearchIcon from './assets/icons/search.vue'
+import CorgIcon from './assets/icons/corg.vue'
 
 const route = useRoute()
 
@@ -33,24 +36,18 @@ const route = useRoute()
 					</ul>
 
 					<div v-else>
-						<button class="text-white w-9 h-9 bg-white/5 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl" @click="$router.back()">
-							<div class="w-4 h-4 mx-auto my-auto">
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M7.82843 10.9999H20V12.9999H7.82843L13.1924 18.3638L11.7782 19.778L4 11.9999L11.7782 4.22168L13.1924 5.63589L7.82843 10.9999Z"></path></svg>
-							</div>
+						<button class="text-white w-9 h-9 bg-white/5 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl flex justify-center items-center" @click="$router.back()">
+							<LeftArrowIcon :size="4" />
 						</button>
 					</div>
 
 					<div class="flex gap-2">
-						<button class="text-white w-9 h-9 bg-neutral-800/80 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl">
-							<div class="w-4 h-4 mx-auto my-auto">
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M18.031 16.6168L22.3137 20.8995L20.8995 22.3137L16.6168 18.031C15.0769 19.263 13.124 20 11 20C6.032 20 2 15.968 2 11C2 6.032 6.032 2 11 2C15.968 2 20 6.032 20 11C20 13.124 19.263 15.0769 18.031 16.6168ZM16.0247 15.8748C17.2475 14.6146 18 12.8956 18 11C18 7.1325 14.8675 4 11 4C7.1325 4 4 7.1325 4 11C4 14.8675 7.1325 18 11 18C12.8956 18 14.6146 17.2475 15.8748 16.0247L16.0247 15.8748Z"></path></svg>
-							</div>
+						<button class="text-white w-9 h-9 bg-neutral-800/80 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl flex justify-center items-center">
+							<SearchIcon :size="4" />
 						</button>
 
-						<button class="text-white w-9 h-9 bg-neutral-800/80 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl">
-							<div class="w-4 h-4 mx-auto my-auto">
-								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M2 11.9998C2 11.1353 2.1097 10.2964 2.31595 9.49631C3.40622 9.55283 4.48848 9.01015 5.0718 7.99982C5.65467 6.99025 5.58406 5.78271 4.99121 4.86701C6.18354 3.69529 7.66832 2.82022 9.32603 2.36133C9.8222 3.33385 10.8333 3.99982 12 3.99982C13.1667 3.99982 14.1778 3.33385 14.674 2.36133C16.3317 2.82022 17.8165 3.69529 19.0088 4.86701C18.4159 5.78271 18.3453 6.99025 18.9282 7.99982C19.5115 9.01015 20.5938 9.55283 21.6841 9.49631C21.8903 10.2964 22 11.1353 22 11.9998C22 12.8643 21.8903 13.7032 21.6841 14.5033C20.5938 14.4468 19.5115 14.9895 18.9282 15.9998C18.3453 17.0094 18.4159 18.2169 19.0088 19.1326C17.8165 20.3043 16.3317 21.1794 14.674 21.6383C14.1778 20.6658 13.1667 19.9998 12 19.9998C10.8333 19.9998 9.8222 20.6658 9.32603 21.6383C7.66832 21.1794 6.18354 20.3043 4.99121 19.1326C5.58406 18.2169 5.65467 17.0094 5.0718 15.9998C4.48848 14.9895 3.40622 14.4468 2.31595 14.5033C2.1097 13.7032 2 12.8643 2 11.9998ZM6.80385 14.9998C7.43395 16.0912 7.61458 17.3459 7.36818 18.5236C7.77597 18.8138 8.21005 19.0652 8.66489 19.2741C9.56176 18.4712 10.7392 17.9998 12 17.9998C13.2608 17.9998 14.4382 18.4712 15.3351 19.2741C15.7899 19.0652 16.224 18.8138 16.6318 18.5236C16.3854 17.3459 16.566 16.0912 17.1962 14.9998C17.8262 13.9085 18.8225 13.1248 19.9655 12.7493C19.9884 12.5015 20 12.2516 20 11.9998C20 11.7481 19.9884 11.4981 19.9655 11.2504C18.8225 10.8749 17.8262 10.0912 17.1962 8.99982C16.566 7.90845 16.3854 6.65378 16.6318 5.47605C16.224 5.18588 15.7899 4.93447 15.3351 4.72552C14.4382 5.52844 13.2608 5.99982 12 5.99982C10.7392 5.99982 9.56176 5.52844 8.66489 4.72552C8.21005 4.93447 7.77597 5.18588 7.36818 5.47605C7.61458 6.65378 7.43395 7.90845 6.80385 8.99982C6.17376 10.0912 5.17754 10.8749 4.03451 11.2504C4.01157 11.4981 4 11.7481 4 11.9998C4 12.2516 4.01157 12.5015 4.03451 12.7493C5.17754 13.1248 6.17376 13.9085 6.80385 14.9998ZM12 14.9998C10.3431 14.9998 9 13.6567 9 11.9998C9 10.343 10.3431 8.99982 12 8.99982C13.6569 8.99982 15 10.343 15 11.9998C15 13.6567 13.6569 14.9998 12 14.9998ZM12 12.9998C12.5523 12.9998 13 12.5521 13 11.9998C13 11.4475 12.5523 10.9998 12 10.9998C11.4477 10.9998 11 11.4475 11 11.9998C11 12.5521 11.4477 12.9998 12 12.9998Z"></path></svg>
-							</div>
+						<button class="text-white w-9 h-9 bg-neutral-800/80 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl flex justify-center items-center">
+							<CorgIcon :size="4" />
 						</button>
 
 						<Player />
diff --git a/src/assets/icons/corg.vue b/src/assets/icons/corg.vue
new file mode 100644
index 0000000..dee7db2
--- /dev/null
+++ b/src/assets/icons/corg.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+			<path
+				d="M2 11.9998C2 11.1353 2.1097 10.2964 2.31595 9.49631C3.40622 9.55283 4.48848 9.01015 5.0718 7.99982C5.65467 6.99025 5.58406 5.78271 4.99121 4.86701C6.18354 3.69529 7.66832 2.82022 9.32603 2.36133C9.8222 3.33385 10.8333 3.99982 12 3.99982C13.1667 3.99982 14.1778 3.33385 14.674 2.36133C16.3317 2.82022 17.8165 3.69529 19.0088 4.86701C18.4159 5.78271 18.3453 6.99025 18.9282 7.99982C19.5115 9.01015 20.5938 9.55283 21.6841 9.49631C21.8903 10.2964 22 11.1353 22 11.9998C22 12.8643 21.8903 13.7032 21.6841 14.5033C20.5938 14.4468 19.5115 14.9895 18.9282 15.9998C18.3453 17.0094 18.4159 18.2169 19.0088 19.1326C17.8165 20.3043 16.3317 21.1794 14.674 21.6383C14.1778 20.6658 13.1667 19.9998 12 19.9998C10.8333 19.9998 9.8222 20.6658 9.32603 21.6383C7.66832 21.1794 6.18354 20.3043 4.99121 19.1326C5.58406 18.2169 5.65467 17.0094 5.0718 15.9998C4.48848 14.9895 3.40622 14.4468 2.31595 14.5033C2.1097 13.7032 2 12.8643 2 11.9998ZM6.80385 14.9998C7.43395 16.0912 7.61458 17.3459 7.36818 18.5236C7.77597 18.8138 8.21005 19.0652 8.66489 19.2741C9.56176 18.4712 10.7392 17.9998 12 17.9998C13.2608 17.9998 14.4382 18.4712 15.3351 19.2741C15.7899 19.0652 16.224 18.8138 16.6318 18.5236C16.3854 17.3459 16.566 16.0912 17.1962 14.9998C17.8262 13.9085 18.8225 13.1248 19.9655 12.7493C19.9884 12.5015 20 12.2516 20 11.9998C20 11.7481 19.9884 11.4981 19.9655 11.2504C18.8225 10.8749 17.8262 10.0912 17.1962 8.99982C16.566 7.90845 16.3854 6.65378 16.6318 5.47605C16.224 5.18588 15.7899 4.93447 15.3351 4.72552C14.4382 5.52844 13.2608 5.99982 12 5.99982C10.7392 5.99982 9.56176 5.52844 8.66489 4.72552C8.21005 4.93447 7.77597 5.18588 7.36818 5.47605C7.61458 6.65378 7.43395 7.90845 6.80385 8.99982C6.17376 10.0912 5.17754 10.8749 4.03451 11.2504C4.01157 11.4981 4 11.7481 4 11.9998C4 12.2516 4.01157 12.5015 4.03451 12.7493C5.17754 13.1248 6.17376 13.9085 6.80385 14.9998ZM12 14.9998C10.3431 14.9998 9 13.6567 9 11.9998C9 10.343 10.3431 8.99982 12 8.99982C13.6569 8.99982 15 10.343 15 11.9998C15 13.6567 13.6569 14.9998 12 14.9998ZM12 12.9998C12.5523 12.9998 13 12.5521 13 11.9998C13 11.4475 12.5523 10.9998 12 10.9998C11.4477 10.9998 11 11.4475 11 11.9998C11 12.5521 11.4477 12.9998 12 12.9998Z">
+			</path>
+		</svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/assets/icons/forward.vue b/src/assets/icons/forward.vue
new file mode 100644
index 0000000..4e2963d
--- /dev/null
+++ b/src/assets/icons/forward.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+			<path
+				d="M4.78834 17.4434C4.70398 17.503 4.60326 17.535 4.5 17.535C4.22386 17.535 4 17.3111 4 17.035V6.96488C4 6.86163 4.03197 6.7609 4.09152 6.67654C4.25076 6.45094 4.56274 6.39715 4.78834 6.5564L11.9213 11.5914C11.9679 11.6243 12.0086 11.665 12.0415 11.7116C12.2007 11.9372 12.1469 12.2492 11.9213 12.4084L4.78834 17.4434ZM13 6.96488C13 6.86163 13.032 6.7609 13.0915 6.67654C13.2508 6.45094 13.5627 6.39715 13.7883 6.5564L20.9213 11.5914C20.9679 11.6243 21.0086 11.665 21.0415 11.7116C21.2007 11.9372 21.1469 12.2492 20.9213 12.4084L13.7883 17.4434C13.704 17.503 13.6033 17.535 13.5 17.535C13.2239 17.535 13 17.3111 13 17.035V6.96488Z">
+			</path>
+		</svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/assets/icons/leftarrow.vue b/src/assets/icons/leftarrow.vue
new file mode 100644
index 0000000..2b6d447
--- /dev/null
+++ b/src/assets/icons/leftarrow.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M7.82843 10.9999H20V12.9999H7.82843L13.1924 18.3638L11.7782 19.778L4 11.9999L11.7782 4.22168L13.1924 5.63589L7.82843 10.9999Z"></path></svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/assets/icons/loadingindicator.vue b/src/assets/icons/loadingindicator.vue
new file mode 100644
index 0000000..05351c8
--- /dev/null
+++ b/src/assets/icons/loadingindicator.vue
@@ -0,0 +1,20 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200">
+			<circle fill="none" stroke-opacity="1" stroke="#FFFFFF" stroke-width=".5" cx="100" cy="100" r="0">
+				<animate attributeName="r" calcMode="spline" dur="2" values="1;80" keyTimes="0;1"
+					keySplines="0 .2 .5 1" repeatCount="indefinite"></animate>
+				<animate attributeName="stroke-width" calcMode="spline" dur="2" values="0;25" keyTimes="0;1"
+					keySplines="0 .2 .5 1" repeatCount="indefinite"></animate>
+				<animate attributeName="stroke-opacity" calcMode="spline" dur="2" values="1;0" keyTimes="0;1"
+					keySplines="0 .2 .5 1" repeatCount="indefinite"></animate>
+			</circle>
+		</svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/assets/icons/pause.vue b/src/assets/icons/pause.vue
new file mode 100644
index 0000000..28451e3
--- /dev/null
+++ b/src/assets/icons/pause.vue
@@ -0,0 +1,13 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+			<path d="M6 5H8V19H6V5ZM16 5H18V19H16V5Z"></path>
+		</svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/assets/icons/play.vue b/src/assets/icons/play.vue
new file mode 100644
index 0000000..3334db7
--- /dev/null
+++ b/src/assets/icons/play.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+			<path
+				d="M19.376 12.4161L8.77735 19.4818C8.54759 19.635 8.23715 19.5729 8.08397 19.3432C8.02922 19.261 8 19.1645 8 19.0658V4.93433C8 4.65818 8.22386 4.43433 8.5 4.43433C8.59871 4.43433 8.69522 4.46355 8.77735 4.5183L19.376 11.584C19.6057 11.7372 19.6678 12.0477 19.5146 12.2774C19.478 12.3323 19.4309 12.3795 19.376 12.4161Z">
+			</path>
+		</svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/assets/icons/rewind.vue b/src/assets/icons/rewind.vue
new file mode 100644
index 0000000..7ee4ca8
--- /dev/null
+++ b/src/assets/icons/rewind.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+			<path
+				d="M11.0002 17.035C11.0002 17.1383 10.9682 17.239 10.9087 17.3234C10.7494 17.549 10.4375 17.6028 10.2119 17.4435L3.07889 12.4085C3.03228 12.3756 2.99164 12.335 2.95874 12.2883C2.7995 12.0627 2.85329 11.7508 3.07889 11.5915L10.2119 6.55648C10.2962 6.49693 10.3969 6.46497 10.5002 6.46497C10.7763 6.46497 11.0002 6.68882 11.0002 6.96497V17.035ZM12.0789 12.4085C12.0323 12.3756 11.9916 12.335 11.9587 12.2883C11.7995 12.0627 11.8533 11.7508 12.0789 11.5915L19.2119 6.55648C19.2962 6.49693 19.3969 6.46497 19.5002 6.46497C19.7763 6.46497 20.0002 6.68882 20.0002 6.96497V17.035C20.0002 17.1383 19.9682 17.239 19.9087 17.3234C19.7494 17.549 19.4375 17.6028 19.2119 17.4435L12.0789 12.4085Z">
+			</path>
+		</svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/assets/icons/search.vue b/src/assets/icons/search.vue
new file mode 100644
index 0000000..a37dff3
--- /dev/null
+++ b/src/assets/icons/search.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M18.031 16.6168L22.3137 20.8995L20.8995 22.3137L16.6168 18.031C15.0769 19.263 13.124 20 11 20C6.032 20 2 15.968 2 11C2 6.032 6.032 2 11 2C15.968 2 20 6.032 20 11C20 13.124 19.263 15.0769 18.031 16.6168ZM16.0247 15.8748C17.2475 14.6146 18 12.8956 18 11C18 7.1325 14.8675 4 11 4C7.1325 4 4 7.1325 4 11C4 14.8675 7.1325 18 11 18C12.8956 18 14.6146 17.2475 15.8748 16.0247L16.0247 15.8748Z"></path></svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/assets/icons/shuffle.vue b/src/assets/icons/shuffle.vue
new file mode 100644
index 0000000..25511fd
--- /dev/null
+++ b/src/assets/icons/shuffle.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+			<path
+				d="M18 17.8832V16L23 19L18 22V19.9095C14.9224 19.4698 12.2513 17.4584 11.0029 14.5453L11 14.5386L10.9971 14.5453C9.57893 17.8544 6.32508 20 2.72483 20H2V18H2.72483C5.52503 18 8.05579 16.3312 9.15885 13.7574L9.91203 12L9.15885 10.2426C8.05579 7.66878 5.52503 6 2.72483 6H2V4H2.72483C6.32508 4 9.57893 6.14557 10.9971 9.45473L11 9.46141L11.0029 9.45473C12.2513 6.5416 14.9224 4.53022 18 4.09051V2L23 5L18 8V6.11684C15.7266 6.53763 13.7737 8.0667 12.8412 10.2426L12.088 12L12.8412 13.7574C13.7737 15.9333 15.7266 17.4624 18 17.8832Z">
+			</path>
+		</svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/assets/icons/starempty.vue b/src/assets/icons/starempty.vue
new file mode 100644
index 0000000..e765ee4
--- /dev/null
+++ b/src/assets/icons/starempty.vue
@@ -0,0 +1,15 @@
+<script setup lang="ts">
+defineProps<{
+	size: number
+}>()
+</script>
+
+<template>
+	<div :class="`w-${size} h-${size}`">
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+			<path
+				d="M12.0006 18.26L4.94715 22.2082L6.52248 14.2799L0.587891 8.7918L8.61493 7.84006L12.0006 0.5L15.3862 7.84006L23.4132 8.7918L17.4787 14.2799L19.054 22.2082L12.0006 18.26ZM12.0006 15.968L16.2473 18.3451L15.2988 13.5717L18.8719 10.2674L14.039 9.69434L12.0006 5.27502L9.96214 9.69434L5.12921 10.2674L8.70231 13.5717L7.75383 18.3451L12.0006 15.968Z">
+			</path>
+		</svg>
+	</div>
+</template>
\ No newline at end of file
diff --git a/src/components/Player.vue b/src/components/Player.vue
index 5f04221..02433b7 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -3,6 +3,10 @@ import { usePlayQueueStore } from '../stores/usePlayQueueStore'
 import { useTemplateRef, watch } from 'vue'
 import { useRoute } from 'vue-router'
 
+import PlayIcon from '../assets/icons/play.vue'
+import PauseIcon from '../assets/icons/pause.vue'
+import LoadingIndicator from '../assets/icons/loadingindicator.vue'
+
 const playQueueStore = usePlayQueueStore()
 const route = useRoute()
 const player = useTemplateRef('playerRef')
@@ -114,28 +118,11 @@ function updateCurrentTime() {
 				<button class="h-9 w-9 flex justify-center items-center" @click.stop="() => {
 					playQueueStore.isPlaying = !playQueueStore.isPlaying
 				}">
-					<div class="w-4 h-4" v-if="playQueueStore.isPlaying">
-						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200" v-if="playQueueStore.isBuffering === true">
-							<circle fill="none" stroke-opacity="1" stroke="#FFFFFF" stroke-width=".5" cx="100" cy="100" r="0">
-								<animate attributeName="r" calcMode="spline" dur="2" values="1;80" keyTimes="0;1" keySplines="0 .2 .5 1"
-									repeatCount="indefinite"></animate>
-								<animate attributeName="stroke-width" calcMode="spline" dur="2" values="0;25" keyTimes="0;1"
-									keySplines="0 .2 .5 1" repeatCount="indefinite"></animate>
-								<animate attributeName="stroke-opacity" calcMode="spline" dur="2" values="1;0" keyTimes="0;1"
-									keySplines="0 .2 .5 1" repeatCount="indefinite"></animate>
-							</circle>
-						</svg>
-						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" v-else>
-							<path d="M6 5H8V19H6V5ZM16 5H18V19H16V5Z"></path>
-						</svg>
-					</div>
-					<div class="w-4 h-4" v-else>
-						<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
-							<path
-								d="M19.376 12.4161L8.77735 19.4818C8.54759 19.635 8.23715 19.5729 8.08397 19.3432C8.02922 19.261 8 19.1645 8 19.0658V4.93433C8 4.65818 8.22386 4.43433 8.5 4.43433C8.59871 4.43433 8.69522 4.46355 8.77735 4.5183L19.376 11.584C19.6057 11.7372 19.6678 12.0477 19.5146 12.2774C19.478 12.3323 19.4309 12.3795 19.376 12.4161Z">
-							</path>
-						</svg>
+					<div v-if="playQueueStore.isPlaying">
+						<LoadingIndicator v-if="playQueueStore.isBuffering === true" :size="4" />
+						<PauseIcon v-else :size="4" />
 					</div>
+					<PlayIcon v-else :size="4" />
 				</button>
 			</div>
 	</div>
diff --git a/src/pages/AlbumDetail.vue b/src/pages/AlbumDetail.vue
index c722a96..9e40313 100644
--- a/src/pages/AlbumDetail.vue
+++ b/src/pages/AlbumDetail.vue
@@ -6,6 +6,10 @@ import { usePlayQueueStore } from '../stores/usePlayQueueStore'
 import { artistsOrganize } from '../utils'
 import TrackItem from '../components/TrackItem.vue'
 
+import PlayIcon from '../assets/icons/play.vue'
+import StarEmptyIcon from '../assets/icons/starempty.vue'
+import ShuffleIcon from '../assets/icons/shuffle.vue'
+
 const album = ref<Album>()
 
 const route = useRoute()
@@ -69,36 +73,18 @@ function playTheAlbum() {
 					<button
 						class="bg-sky-500/20 hover:bg-sky-500/30 active:bg-sky-600/30 active:shadow-inner border border-[#ffffff39] rounded-full w-56 h-10 text-base text-white flex justify-center items-center gap-2"
 						@click="playTheAlbum">
-						<div class="w-4 h-4">
-							<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
-								<path
-									d="M19.376 12.4161L8.77735 19.4818C8.54759 19.635 8.23715 19.5729 8.08397 19.3432C8.02922 19.261 8 19.1645 8 19.0658V4.93433C8 4.65818 8.22386 4.43433 8.5 4.43433C8.59871 4.43433 8.69522 4.46355 8.77735 4.5183L19.376 11.584C19.6057 11.7372 19.6678 12.0477 19.5146 12.2774C19.478 12.3323 19.4309 12.3795 19.376 12.4161Z">
-								</path>
-							</svg>
-						</div>
+						<PlayIcon :size="4" />
 						<div>播放专辑</div>
 					</button>
 
 					<button
 						class="text-white w-10 h-10 bg-white/5 border border-[#ffffff39] rounded-full flex justify-center items-center">
-						<div class="w-4 h-4">
-							<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
-								<path
-									d="M18 17.8832V16L23 19L18 22V19.9095C14.9224 19.4698 12.2513 17.4584 11.0029 14.5453L11 14.5386L10.9971 14.5453C9.57893 17.8544 6.32508 20 2.72483 20H2V18H2.72483C5.52503 18 8.05579 16.3312 9.15885 13.7574L9.91203 12L9.15885 10.2426C8.05579 7.66878 5.52503 6 2.72483 6H2V4H2.72483C6.32508 4 9.57893 6.14557 10.9971 9.45473L11 9.46141L11.0029 9.45473C12.2513 6.5416 14.9224 4.53022 18 4.09051V2L23 5L18 8V6.11684C15.7266 6.53763 13.7737 8.0667 12.8412 10.2426L12.088 12L12.8412 13.7574C13.7737 15.9333 15.7266 17.4624 18 17.8832Z">
-								</path>
-							</svg>
-						</div>
+						<ShuffleIcon :size="4" />
 					</button>
 
 					<button
 						class="text-white w-10 h-10 bg-white/5 border border-[#ffffff39] rounded-full flex justify-center items-center">
-						<div class="w-4 h-4">
-							<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
-								<path
-									d="M12.0006 18.26L4.94715 22.2082L6.52248 14.2799L0.587891 8.7918L8.61493 7.84006L12.0006 0.5L15.3862 7.84006L23.4132 8.7918L17.4787 14.2799L19.054 22.2082L12.0006 18.26ZM12.0006 15.968L16.2473 18.3451L15.2988 13.5717L18.8719 10.2674L14.039 9.69434L12.0006 5.27502L9.96214 9.69434L5.12921 10.2674L8.70231 13.5717L7.75383 18.3451L12.0006 15.968Z">
-								</path>
-							</svg>
-						</div>
+						<StarEmptyIcon :size="4" />
 					</button>
 				</div>
 
diff --git a/src/pages/Playroom.vue b/src/pages/Playroom.vue
index ae0ea48..f8a7b8f 100644
--- a/src/pages/Playroom.vue
+++ b/src/pages/Playroom.vue
@@ -7,6 +7,12 @@ import { onMounted } from 'vue'
 import { useTemplateRef } from 'vue'
 import { ref, watch } from 'vue'
 
+import RewindIcon from '../assets/icons/rewind.vue'
+import ForwardIcon from '../assets/icons/forward.vue'
+import PlayIcon from '../assets/icons/play.vue'
+import PauseIcon from '../assets/icons/pause.vue'
+import LoadingIndicator from '../assets/icons/loadingindicator.vue'
+
 const playQueueStore = usePlayQueueStore()
 gsap.registerPlugin(Draggable)
 
@@ -83,7 +89,8 @@ function playPrevious() {
 </script>
 
 <template>
-	<div class="z-0 absolute top-0 left-0 w-screen h-screen" v-if="playQueueStore.list[playQueueStore.currentIndex].album?.coverDeUrl">
+	<div class="z-0 absolute top-0 left-0 w-screen h-screen"
+		v-if="playQueueStore.list[playQueueStore.currentIndex].album?.coverDeUrl">
 		<img class="w-full h-full blur-2xl object-cover"
 			:src="playQueueStore.list[playQueueStore.currentIndex].album?.coverDeUrl" />
 		<div class="bg-gray-600/50 w-full h-full absolute top-0 left-0" />
@@ -122,7 +129,8 @@ function playPrevious() {
 					<div class="flex-1 text-left"></div>
 					<div class="flex-2 text-center align-center justify-center gap-2 flex">
 
-						<button class="text-white flex-1 h-8 flex justify-center items-center rounded-lg hover:bg-white/25" @click="playPrevious">
+						<button class="text-white flex-1 h-8 flex justify-center items-center rounded-lg hover:bg-white/25"
+							@click="playPrevious">
 							<div class="w-6 h-6">
 								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
 									<path
@@ -134,31 +142,15 @@ function playPrevious() {
 
 						<button class="text-white flex-1 h-8 flex justify-center items-center rounded-lg hover:bg-white/25"
 							@click="playQueueStore.isPlaying = !playQueueStore.isPlaying">
-							<div class="w-6 h-6">
-								<div v-if="playQueueStore.isPlaying">
-									<svg v-if="playQueueStore.isBuffering" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200">
-										<circle fill="none" stroke-opacity="1" stroke="#FFFFFF" stroke-width=".5" cx="100" cy="100" r="0">
-											<animate attributeName="r" calcMode="spline" dur="2" values="1;80" keyTimes="0;1"
-												keySplines="0 .2 .5 1" repeatCount="indefinite"></animate>
-											<animate attributeName="stroke-width" calcMode="spline" dur="2" values="0;25" keyTimes="0;1"
-												keySplines="0 .2 .5 1" repeatCount="indefinite"></animate>
-											<animate attributeName="stroke-opacity" calcMode="spline" dur="2" values="1;0" keyTimes="0;1"
-												keySplines="0 .2 .5 1" repeatCount="indefinite"></animate>
-										</circle>
-									</svg>
-									<svg v-else xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
-										<path d="M6 5H8V19H6V5ZM16 5H18V19H16V5Z"></path>
-									</svg>
-								</div>
-								<svg v-else xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
-									<path
-										d="M19.376 12.4161L8.77735 19.4818C8.54759 19.635 8.23715 19.5729 8.08397 19.3432C8.02922 19.261 8 19.1645 8 19.0658V4.93433C8 4.65818 8.22386 4.43433 8.5 4.43433C8.59871 4.43433 8.69522 4.46355 8.77735 4.5183L19.376 11.584C19.6057 11.7372 19.6678 12.0477 19.5146 12.2774C19.478 12.3323 19.4309 12.3795 19.376 12.4161Z">
-									</path>
-								</svg>
+							<div v-if="playQueueStore.isPlaying">
+								<LoadingIndicator v-if="playQueueStore.isBuffering" :size="6" />
+								<PauseIcon v-else :size="6" />
 							</div>
+							<PlayIcon v-else :size="6" />
 						</button>
 
-						<button class="text-white flex-1 h-8 flex justify-center items-center rounded-lg hover:bg-white/25" @click="playNext">
+						<button class="text-white flex-1 h-8 flex justify-center items-center rounded-lg hover:bg-white/25"
+							@click="playNext">
 							<div class="w-6 h-6">
 								<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
 									<path