diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bfdffb8fa..c54ddaf0a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 ## [unreleased]
 ### New
  - Add option to delete orphaned votes
+ - Add vote indicator for locked options
 
 ### Changes
  - Make vote cell focusable
@@ -16,7 +17,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixes
  - Force list view mode initially on mobile viewports
- - Fix some viual issues of the vote page
+ - Fix some visual issues of the vote page
+ - Bring back indicator for confirmed options after closing the poll
 
 ## [8.1.4] - 2025-07-15
 ### Fixes
diff --git a/src/assets/scss/vars.scss b/src/assets/scss/vars.scss
index f6858a2df4..5fe5ec20bb 100644
--- a/src/assets/scss/vars.scss
+++ b/src/assets/scss/vars.scss
@@ -11,4 +11,6 @@
 	--color-polls-background-maybe: rgba(var(--color-warning-rgb), 0.1);
 	--container-background-light: rgba(var(--color-info-rgb), 0.1);
 	--cap-width: 49rem;
+	--shadow-height: 0.7rem;
+	--shadow-height-inverted: -0.7rem;
 }
diff --git a/src/components/Base/modules/StickyDiv.vue b/src/components/Base/modules/StickyDiv.vue
index e14b7f9a5d..8d3159c154 100644
--- a/src/components/Base/modules/StickyDiv.vue
+++ b/src/components/Base/modules/StickyDiv.vue
@@ -50,7 +50,6 @@ const style = computed(() => {
 })
 
 const stickyClass = computed(() => ({
-	container: true,
 	'sticky-top': stickyTop,
 	'sticky-left': stickyLeft,
 	'sticky-bottom-shadow': activateBottomShadow,
@@ -59,93 +58,114 @@ const stickyClass = computed(() => ({
 </script>
 
 <template>
-	<div :class="stickyClass" :style="style">
-		<slot name="default">
-			<div class="inner"></div>
-		</slot>
+	<div :class="['sticky-div', stickyClass]" :style="style">
+		<div class="top-left-corner"></div>
+		<div class="top"></div>
+		<div class="top-right-corner"></div>
+
+		<div class="right"></div>
+
+		<div class="bottom-right-corner"></div>
+		<div class="bottom"></div>
+		<div class="bottom-left-corner"></div>
+
+		<div class="left"></div>
+
+		<div class="stage outer" :style="style">
+			<slot name="default">
+				<div class="inner"></div>
+			</slot>
+		</div>
 	</div>
 </template>
 
 <style lang="scss" scoped>
-.container {
-	--shadow-height: 10px;
+.sticky-div {
+	display: grid;
+	grid-template-columns: auto 1fr auto;
+	grid-template-rows: auto 1fr auto;
+	grid-template-areas:
+		'top-left-corner top top-right-corner'
+		'left center right'
+		'bottom-left-corner bottom bottom-right-corner';
 }
 
-.inner {
+.stage {
+	padding: 0.3rem;
+	grid-area: center;
 	width: 100%;
 	height: 100%;
 	background-color: var(--color-main-background);
 }
 
+.top-left-corner {
+	grid-area: top-left-corner;
+	height: 0;
+	width: 0;
+}
+
+.top {
+	grid-area: top;
+	height: 0;
+}
+
+.top-right-corner {
+	grid-area: top-right-corner;
+	height: 0;
+	width: 0;
+}
+
+.right {
+	grid-area: right;
+	width: 0;
+}
+
+.bottom-right-corner {
+	grid-area: bottom-right-corner;
+	height: 0;
+	width: 0;
+}
+
+.bottom {
+	grid-area: bottom;
+	height: 0;
+}
+
+.bottom-left-corner {
+	grid-area: bottom-left-corner;
+	height: 0;
+	width: 0;
+}
+
+.left {
+	grid-area: left;
+	width: 0;
+}
+
 .sticky-left {
 	position: sticky;
 	left: 0;
 }
 
 .sticky-top {
-	--shadow-height: 10px;
 	position: sticky;
 	top: 0;
-	padding-bottom: 0px;
-	padding-bottom: var(--shadow-height);
-
-	&::after {
-		content: '';
-		position: absolute;
-		bottom: 0;
-		left: -1px;
-		right: 0;
-		height: 0;
-		background: linear-gradient(
-			to bottom,
-			rgba(var(--color-box-shadow-rgb), 0.3),
-			rgba(var(--color-box-shadow-rgb), 0)
-		);
-		transition:
-			all var(--animation-slow) linear,
-			border 1ms;
-	}
-
-	&.sticky-bottom-shadow {
-		border-top: 0;
-		padding-bottom: var(--shadow-height);
-		margin-bottom: 0;
-		&::after {
-			height: var(--shadow-height);
-		}
-	}
 }
 
-/* TODO: Implement sticky right shadow
-	An Alternative could be using a grid instead of ::after
-	to be able to position multiple shadows in all directions */
-
-/*
-	padding-right: var(--shadow-height);
-
-	&::after {
-		content: '';
-		position: absolute;
-		right: 0;
-		top: -1px;
-		bottom: 0;
-		width: 0;
-		background: linear-gradient(
-			to right,
-			rgba(var(--color-box-shadow-rgb), 0.3),
-			rgba(var(--color-box-shadow-rgb), 0)
-		);
-		transition:
-			all var(--animation-slow) linear,
-			border 1ms;
+.bottom-right-corner,
+.bottom,
+.bottom-left-corner {
+	background: linear-gradient(
+		to bottom,
+		rgba(var(--color-box-shadow-rgb), 0.3),
+		rgba(var(--color-box-shadow-rgb), 0)
+	);
+
+	transition:
+		all var(--animation-slow) linear,
+		border 1ms;
+	.sticky-bottom-shadow & {
+		height: var(--shadow-height);
 	}
-
-	&.sticky-right-shadow {
-		border-right: 0;
-		padding-right: var(--shadow-height);
-		margin-right: 0;
-		&::after {
-			width: var(--shadow-height);
-		}
-	} */
+}
 </style>
diff --git a/src/components/Options/Counter.vue b/src/components/Options/Counter.vue
index b901ba2aba..2c21285ece 100644
--- a/src/components/Options/Counter.vue
+++ b/src/components/Options/Counter.vue
@@ -6,8 +6,11 @@
 <script setup lang="ts">
 import YesCounterIcon from 'vue-material-design-icons/AccountCheck.vue'
 import MaybeCounterIcon from 'vue-material-design-icons/AccountCheckOutline.vue'
+import CheckboxMarkedOutlinedIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
 import { Option } from '../../Types/index.ts'
+import { usePollStore } from '../../stores/poll.ts'
 
+const pollStore = usePollStore()
 interface Props {
 	option: Option
 	showMaybe?: boolean
@@ -17,7 +20,10 @@ const { option, showMaybe = false } = defineProps<Props>()
 </script>
 
 <template>
-	<div class="counter">
+	<div v-if="option.confirmed && pollStore.status.isExpired" class="counter">
+		<CheckboxMarkedOutlinedIcon :size="20" />
+	</div>
+	<div v-else class="counter">
 		<div class="yes">
 			<YesCounterIcon
 				fill-color="var(--color-polls-foreground-yes)"
diff --git a/src/components/Options/OptionItem.vue b/src/components/Options/OptionItem.vue
index 59fb22b21a..14a9ddfb90 100644
--- a/src/components/Options/OptionItem.vue
+++ b/src/components/Options/OptionItem.vue
@@ -64,6 +64,17 @@ const pollStore = usePollStore()
 	grid-template-areas: 'drag option owner actions';
 	position: relative;
 	padding: 8px 0;
+	background-color: var(--color-main-background);
+	.confirmed & {
+		background-color: var(--color-polls-background-yes);
+		border-radius: var(--border-radius-container);
+		border: 2px solid var(--color-success-text);
+	}
+	.list-view .confirmed & {
+		padding-left: 0.5rem;
+		left: -0.5rem;
+		padding-right: 0.5rem;
+	}
 }
 
 .grid-area-drag-icon {
diff --git a/src/components/VoteTable/VoteButton.vue b/src/components/VoteTable/VoteButton.vue
index 213ce88218..ee5276528e 100644
--- a/src/components/VoteTable/VoteButton.vue
+++ b/src/components/VoteTable/VoteButton.vue
@@ -5,64 +5,62 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
+import { AxiosError } from '@nextcloud/axios'
+
+import { t } from '@nextcloud/l10n'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 
+import VoteIndicator from './VoteIndicator.vue'
 import { usePollStore } from '../../stores/poll.ts'
-import { useVotesStore } from '../../stores/votes.ts'
+import { Answer, useVotesStore } from '../../stores/votes.ts'
 import { Option, User } from '../../Types/index.ts'
 
-import { t } from '@nextcloud/l10n'
-import VoteIndicator from './VoteIndicator.vue'
-import { AxiosError } from '@nextcloud/axios'
-
 interface Props {
 	option: Option
 	user: User
 }
 
+export type richAnswer = {
+	name: Answer
+	translated: string
+}
+
+const richAnswers: { [key in Answer]: richAnswer } = {
+	yes: { name: 'yes', translated: t('polls', 'Yes') },
+	maybe: { name: 'maybe', translated: t('polls', 'Maybe') },
+	no: { name: 'no', translated: t('polls', 'No') },
+	'': { name: '', translated: t('polls', 'No answer') },
+}
+
 const { option, user } = defineProps<Props>()
 
 const pollStore = usePollStore()
 const votesStore = useVotesStore()
 
-const thisVote = computed(() =>
+const vote = computed(() =>
 	votesStore.getVote({
 		option,
 		user,
 	}),
 )
 
-const iconAnswer = computed(() => {
-	if (['no', ''].includes(thisVote.value.answer)) {
-		return pollStore.isClosed && option.confirmed ? 'no' : ''
+const nextAnswer = computed<richAnswer>(() => {
+	if (['no', ''].includes(vote.value.answer)) {
+		return richAnswers.yes
 	}
-	return thisVote.value.answer
-})
 
-const nextAnswer = computed(() => {
-	if (pollStore.answerSequence.indexOf(thisVote.value.answer) < 0) {
-		return pollStore.answerSequence[1]
+	if (vote.value.answer === 'yes' && pollStore.configuration.allowMaybe) {
+		return richAnswers.maybe
 	}
-	return pollStore.answerSequence[
-		(pollStore.answerSequence.indexOf(thisVote.value.answer) + 1)
-			% pollStore.answerSequence.length
-	]
-})
-const nextAnswerTranslated = computed(() => {
-	if (nextAnswer.value === 'yes') {
-		return t('polls', 'Yes')
-	}
-	if (nextAnswer.value === 'maybe') {
-		return t('polls', 'Maybe')
-	}
-	return t('polls', 'No')
+
+	return pollStore.configuration.useNo ? richAnswers.no : richAnswers['']
 })
 
 async function setVote() {
 	try {
 		await votesStore.set({
 			option,
-			setTo: nextAnswer.value,
+			setTo: nextAnswer.value.name,
 		})
 		showSuccess(t('polls', 'Vote saved'), { timeout: 2000 })
 	} catch (error) {
@@ -78,15 +76,15 @@ async function setVote() {
 <template>
 	<button
 		class="vote-button active"
-		:class="[thisVote.answer]"
+		:class="[vote.answer]"
 		:aria-label="
-			t('polls', 'Vote {nextAnswer} for {option}', {
+			t('polls', 'Click to vote with {nextAnswer} for option {option}', {
 				option: option.text,
-				nextAnswer: nextAnswerTranslated,
+				nextAnswer: nextAnswer.translated,
 			})
 		"
 		@click="setVote()">
-		<VoteIndicator :answer="iconAnswer" />
+		<VoteIndicator :answer="vote.answer" />
 	</button>
 </template>
 
diff --git a/src/components/VoteTable/VoteColumn.vue b/src/components/VoteTable/VoteColumn.vue
deleted file mode 100644
index 9303b4a8b5..0000000000
--- a/src/components/VoteTable/VoteColumn.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
-  - SPDX-FileCopyrightText: 2018 Nextcloud contributors
-  - SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import { getCurrentUser } from '@nextcloud/auth'
-
-import Counter from '../Options/Counter.vue'
-import OptionItem from '../Options/OptionItem.vue'
-import VoteItem from './VoteItem.vue'
-import CalendarPeek from '../Calendar/CalendarPeek.vue'
-import { usePollStore } from '../../stores/poll.ts'
-import { useVotesStore } from '../../stores/votes.ts'
-import { usePreferencesStore } from '../../stores/preferences.ts'
-import { Option } from '../../stores/options.ts'
-import OptionMenu from '../Options/OptionMenu.vue'
-
-const { option } = defineProps<{ option: Option }>()
-
-const pollStore = usePollStore()
-const votesStore = useVotesStore()
-const preferencesStore = usePreferencesStore()
-
-const componentClass = computed(() => {
-	const classList = ['vote-column']
-	if (option.locked) {
-		classList.push('locked')
-	}
-
-	if (option.confirmed && pollStore.isClosed) {
-		classList.push('confirmed')
-	}
-	if (option.votes.currentUser) {
-		classList.push(option.votes.currentUser)
-	}
-
-	return classList
-})
-
-const showCalendarPeek = computed(
-	() =>
-		pollStore.type === 'datePoll'
-		&& getCurrentUser()
-		&& preferencesStore.user.calendarPeek,
-)
-</script>
-
-<template>
-	<div :class="componentClass">
-		<div class="option-menu">
-			<OptionMenu :option="option" use-sort />
-		</div>
-		<div class="column-header">
-			<OptionItem :option="option" />
-
-			<Counter
-				v-if="pollStore.permissions.seeResults"
-				:show-maybe="pollStore.configuration.allowMaybe"
-				:option="option" />
-
-			<CalendarPeek
-				v-if="showCalendarPeek"
-				:focus-trap="false"
-				:option="option" />
-		</div>
-
-		<VoteItem
-			v-for="participant in votesStore.getChunkedParticipants"
-			:key="participant.id"
-			:user="participant"
-			:option="option" />
-	</div>
-</template>
-
-<style lang="scss">
-.option-menu {
-	// display: grid;
-	// grid-template-columns: 1fr auto;
-	// grid-template-areas: 'menu sort';
-	// align-content: center;
-	align-self: center;
-	flex: 0 0 34px;
-}
-
-.vote-style-beta-510 .vote-column {
-	border-radius: var(--border-radius-large);
-
-	&:hover {
-		background-color: var(--color-background-dark);
-	}
-
-	&.locked:hover {
-		background-color: var(--color-polls-background-no);
-	}
-}
-</style>
diff --git a/src/components/VoteTable/VoteIndicator.vue b/src/components/VoteTable/VoteIndicator.vue
index c583e462cd..d4ec3b3914 100644
--- a/src/components/VoteTable/VoteIndicator.vue
+++ b/src/components/VoteTable/VoteIndicator.vue
@@ -4,15 +4,15 @@
 -->
 
 <script setup lang="ts">
-import { computed } from 'vue'
 import CheckIcon from 'vue-material-design-icons/Check.vue'
 import CloseIcon from 'vue-material-design-icons/Close.vue'
+import CancelIcon from 'vue-material-design-icons/Cancel.vue'
 import { MaybeIcon } from '../AppIcons/index.ts'
 import { Answer } from '../../Types/index.ts'
 
 const ICON_SIZE = 26
 
-const { answer } = defineProps<{ answer: Answer }>()
+const { answer } = defineProps<{ answer: Answer | 'locked' }>()
 
 const colorCodeNo = getComputedStyle(document.documentElement).getPropertyValue(
 	'--color-error',
@@ -23,31 +23,25 @@ const colorCodeYes = getComputedStyle(document.documentElement).getPropertyValue
 const colorCodeMaybe = getComputedStyle(document.documentElement).getPropertyValue(
 	'--color-warning',
 )
-
-const foregroundColor = computed(() => {
-	if (answer === 'yes') {
-		return colorCodeYes
-	}
-	if (answer === 'maybe') {
-		return colorCodeMaybe
-	}
-	return colorCodeNo
-})
 </script>
 
 <template>
 	<div class="vote-indicator">
 		<MaybeIcon
 			v-if="answer === 'maybe'"
-			:fill-color="foregroundColor"
+			:fill-color="colorCodeMaybe"
 			:size="ICON_SIZE" />
 		<CheckIcon
 			v-if="answer === 'yes'"
-			:fill-color="foregroundColor"
+			:fill-color="colorCodeYes"
 			:size="ICON_SIZE" />
 		<CloseIcon
 			v-if="answer === 'no'"
-			:fill-color="foregroundColor"
+			:fill-color="colorCodeNo"
+			:size="ICON_SIZE" />
+		<CancelIcon
+			v-if="answer === 'locked'"
+			:fill-color="colorCodeNo"
 			:size="ICON_SIZE" />
 	</div>
 </template>
@@ -61,10 +55,6 @@ const foregroundColor = computed(() => {
 	* {
 		cursor: pointer;
 	}
-	.material-design-icon {
-		width: 26px;
-		height: 26px;
-	}
 
 	&:hover {
 		width: 35px;
diff --git a/src/components/VoteTable/VoteItem.vue b/src/components/VoteTable/VoteItem.vue
index a57b3fc47d..f7e770e9ee 100644
--- a/src/components/VoteTable/VoteItem.vue
+++ b/src/components/VoteTable/VoteItem.vue
@@ -15,34 +15,35 @@ import VoteIndicator from './VoteIndicator.vue'
 interface Props {
 	option: Option
 	user: User
+	currentUser?: boolean
 }
 
-const { option, user } = defineProps<Props>()
+const { option, user, currentUser = false } = defineProps<Props>()
 
 const pollStore = usePollStore()
 const votesStore = useVotesStore()
-
-const answer = computed(
-	() =>
-		votesStore.getVote({
-			option,
-			user,
-		}).answer,
+const vote = computed(() =>
+	votesStore.getVote({
+		option,
+		user,
+	}),
 )
 
 const iconAnswer = computed(() => {
-	if (answer.value === 'no') {
-		return pollStore.isClosed && option.confirmed ? 'no' : ''
+	if (option.locked && currentUser && !pollStore.isClosed) {
+		return 'locked'
 	}
-	if (answer.value === '') {
-		return pollStore.isClosed && option.confirmed ? 'no' : ''
+
+	if (['', 'no'].includes(vote.value.answer)) {
+		return pollStore.isClosed && (option.confirmed || currentUser) ? 'no' : ''
 	}
-	return answer.value
+
+	return vote.value.answer
 })
 </script>
 
 <template>
-	<div class="vote-item" :class="answer">
+	<div class="vote-item" :class="vote.answer">
 		<VoteIndicator :answer="iconAnswer" />
 	</div>
 </template>
diff --git a/src/components/VoteTable/VoteTable.vue b/src/components/VoteTable/VoteTable.vue
index 17c6e34f21..b46f6a4f8d 100644
--- a/src/components/VoteTable/VoteTable.vue
+++ b/src/components/VoteTable/VoteTable.vue
@@ -4,29 +4,31 @@
 -->
 
 <script setup lang="ts">
+import { computed, ref } from 'vue'
+import { NcButton } from '@nextcloud/vue'
 import { t } from '@nextcloud/l10n'
+import { getCurrentUser } from '@nextcloud/auth'
 
 import { usePollStore } from '../../stores/poll.ts'
 import { Option, useOptionsStore } from '../../stores/options.ts'
 import { useVotesStore } from '../../stores/votes.ts'
 
-import { NcButton } from '@nextcloud/vue'
-import SortNameIcon from 'vue-material-design-icons/SortAlphabeticalDescending.vue'
-import { computed, ref } from 'vue'
-import { getCurrentUser } from '@nextcloud/auth'
-import Counter from '../Options/Counter.vue'
+import StickyDiv from '../Base/modules/StickyDiv.vue'
 import CalendarPeek from '../Calendar/CalendarPeek.vue'
+import Counter from '../Options/Counter.vue'
 import OptionItem from '../Options/OptionItem.vue'
 import OptionMenu from '../Options/OptionMenu.vue'
-import { usePreferencesStore } from '../../stores/preferences.ts'
-
-import SortOptionIcon from 'vue-material-design-icons/SortBoolAscendingVariant.vue'
 import VoteButton from './VoteButton.vue'
-import VoteParticipant from './VoteParticipant.vue'
 import VoteItem from './VoteItem.vue'
+import VoteParticipant from './VoteParticipant.vue'
+
+import { usePreferencesStore } from '../../stores/preferences.ts'
 import { useSessionStore } from '../../stores/session.ts'
+
 import { User } from '../../Types/index.ts'
-import StickyDiv from '../Base/modules/StickyDiv.vue'
+
+import SortOptionIcon from 'vue-material-design-icons/SortBoolAscendingVariant.vue'
+import SortNameIcon from 'vue-material-design-icons/SortAlphabeticalDescending.vue'
 
 const pollStore = usePollStore()
 const optionsStore = useOptionsStore()
@@ -134,6 +136,9 @@ function isVotable(participant: User, option: Option) {
 			<StickyDiv
 				:id="`option-item-${option.id}`"
 				class="option-item"
+				:class="{
+					confirmed: option.confirmed && pollStore.status.isExpired,
+				}"
 				:sticky-top="pollStore.viewMode === 'table-view'"
 				:activate-bottom-shadow="!downPage">
 				<OptionItem :option="option" />
@@ -143,6 +148,9 @@ function isVotable(participant: User, option: Option) {
 				v-if="pollStore.permissions.seeResults"
 				:id="`counter-${option.id}`"
 				:key="`counter-${option.id}`"
+				:class="{
+					confirmed: option.confirmed && pollStore.status.isExpired,
+				}"
 				:show-maybe="pollStore.configuration.allowMaybe"
 				:option="option" />
 
@@ -160,6 +168,7 @@ function isVotable(participant: User, option: Option) {
 					v-else
 					:key="`vote-${participant.id}-${option.id}`"
 					:user="participant"
+					:current-user="isCurrentUser(participant)"
 					:option="option" />
 			</div>
 		</template>
@@ -266,9 +275,9 @@ function isVotable(participant: User, option: Option) {
 			grid-row: 2;
 			border-inline-start: 1px solid var(--color-border);
 
-			.option-item-container {
-				background-color: var(--color-main-background);
-			}
+			// .option-item-container {
+			// 	background-color: var(--color-main-background);
+			// }
 		}
 
 		.counter {
@@ -310,6 +319,7 @@ function isVotable(participant: User, option: Option) {
 			minmax(4rem, max-content);
 		max-width: var(--cap-width);
 		width: fit-content;
+		align-items: center;
 
 		.participant {
 			display: none;
@@ -326,6 +336,8 @@ function isVotable(participant: User, option: Option) {
 
 		.vote-cell {
 			grid-column: 3;
+			width: 60px;
+			height: 60px;
 		}
 
 		@media only screen and (max-width: 340px) {
diff --git a/src/stores/poll.ts b/src/stores/poll.ts
index cbcd62120d..1ca33004b2 100644
--- a/src/stores/poll.ts
+++ b/src/stores/poll.ts
@@ -26,7 +26,7 @@ import {
 	ViewMode,
 } from '../Types/index.ts'
 
-import { useVotesStore, Answer } from './votes.ts'
+import { useVotesStore } from './votes.ts'
 import { useOptionsStore } from './options.ts'
 import { usePollsStore } from './polls.ts'
 import { useSessionStore } from './session.ts'
@@ -257,14 +257,6 @@ export const usePollStore = defineStore('poll', {
 			return 'table-view'
 		},
 
-		answerSequence(state): Answer[] {
-			const noString = state.configuration.useNo ? 'no' : ''
-			if (state.configuration.allowMaybe) {
-				return [noString, 'yes', 'maybe']
-			}
-			return [noString, 'yes']
-		},
-
 		getProposalsOptions(): {
 			value: AllowProposals
 			label: string
diff --git a/src/stores/votes.ts b/src/stores/votes.ts
index 477396a9c3..4635f6ca13 100644
--- a/src/stores/votes.ts
+++ b/src/stores/votes.ts
@@ -13,7 +13,6 @@ import { useSessionStore } from './session.ts'
 import { AxiosError } from '@nextcloud/axios'
 
 export type Answer = 'yes' | 'no' | 'maybe' | ''
-
 export type AnswerSymbol = '✔' | '❌' | '❔' | ''
 
 const answerSortOrder: { [key in Answer]: number } = {
diff --git a/src/views/Vote.vue b/src/views/Vote.vue
index 10cb3787e5..98b915606d 100644
--- a/src/views/Vote.vue
+++ b/src/views/Vote.vue
@@ -257,7 +257,8 @@ const appClass = computed(() => [
 	overflow: auto;
 	overscroll-behavior-inline: contain;
 	position: relative;
-	top: -8px;
+	top: var(--shadow-height-inverted);
+	padding-top: var(--shadow-height);
 
 	.markdown-description {
 		margin: auto;